diff --git a/model/ccnx-bestroute-strategy.cc b/model/ccnx-bestroute-strategy.cc
index e2b973e..e688cec 100644
--- a/model/ccnx-bestroute-strategy.cc
+++ b/model/ccnx-bestroute-strategy.cc
@@ -15,7 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- * Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
+ * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ *         Ilya Moiseenko <iliamo@cs.ucla.edu>
  */
 
 #include "ccnx-bestroute-strategy.h"
diff --git a/model/ccnx-name-components.h b/model/ccnx-name-components.h
index 7f629dc..c4bc8a8 100644
--- a/model/ccnx-name-components.h
+++ b/model/ccnx-name-components.h
@@ -195,10 +195,6 @@
 }
 
     
-/**
-* \class ns3::ComponentsValue
-* \brief hold objects of type ns3:CcnxNameComponents
-*/
 ATTRIBUTE_HELPER_HEADER (CcnxNameComponents);
 } // namespace ns3
 
diff --git a/model/ccnx-pit-entry.h b/model/ccnx-pit-entry.h
index 40f33d1..9bf2768 100644
--- a/model/ccnx-pit-entry.h
+++ b/model/ccnx-pit-entry.h
@@ -43,10 +43,12 @@
 class CcnxFace;
 class CcnxNameComponents;
 
+/// @cond include_hidden
 namespace __ccnx_private
 {
 class i_retx {};
 }
+/// @endcond
 
 /**
  * \ingroup ccnx
diff --git a/model/ccnx-pit.h b/model/ccnx-pit.h
index 0638fa9..e80f697 100644
--- a/model/ccnx-pit.h
+++ b/model/ccnx-pit.h
@@ -47,6 +47,7 @@
 class CcnxContentObjectHeader;
 class CcnxInterestHeader;
 
+/// @cond include_hidden
 /**
  * \ingroup ccnx
  * \private
@@ -57,6 +58,7 @@
 // class i_prefix{}; ///< tag for prefix hash
 class i_timestamp {}; ///< tag for timestamp-ordered records (for cleanup optimization)  
 };
+/// @endcond
 
 /**
  * \ingroup ccnx
diff --git a/model/ccnx.h b/model/ccnx.h
index 1008753..e72ddec 100644
--- a/model/ccnx.h
+++ b/model/ccnx.h
@@ -36,6 +36,7 @@
 class CcnxInterestHeader;
 class CcnxPit;
 
+/// @cond include_hidden
 /**
  * \internal
  * \brief Private namespace for CCNx content store implementation
@@ -49,6 +50,7 @@
 class i_ordered {}; ///< tag for Boost.MultiIndex container (ordered by prefix)
 class i_mru {};
 }
+/// @endcond
 
 // default data size
 // #define NDN_DEFAULT_DATA_SIZE   1024