diff --git a/core/privilege-helper.hpp b/core/privilege-helper.hpp
index 984532f..7ddbafc 100644
--- a/core/privilege-helper.hpp
+++ b/core/privilege-helper.hpp
@@ -37,7 +37,8 @@
 public:
 
   /** \brief represents a serious seteuid/gid failure
-   *  \detail This should only be caught by main in as part of a graceful program termination.
+   *
+   *  This should only be caught by main as part of a graceful program termination.
    *  \note This is not an std::exception and BOOST_THROW_EXCEPTION should not be used.
    */
   class Error
diff --git a/daemon/face/local-face.hpp b/daemon/face/local-face.hpp
index e2bf479..f13cf9b 100644
--- a/daemon/face/local-face.hpp
+++ b/daemon/face/local-face.hpp
@@ -61,6 +61,7 @@
    *
    *  \param feature The feature. Cannot be LOCAL_CONTROL_FEATURE_ANY
    *                                     or LOCAL_CONTROL_FEATURE_MAX
+   *  \param enabled true/false enable/disable the feature
    */
   void
   setLocalControlHeaderFeature(LocalControlFeature feature, bool enabled = true);
diff --git a/daemon/face/multicast-udp-transport.hpp b/daemon/face/multicast-udp-transport.hpp
index 7966b5b..14371f7 100644
--- a/daemon/face/multicast-udp-transport.hpp
+++ b/daemon/face/multicast-udp-transport.hpp
@@ -39,8 +39,10 @@
 public:
   /**
    * \brief Creates a UDP-based transport for multicast communication
+   * \param localEndpoint local endpoint
+   * \param multicastGroup multicast group
    * \param recvSocket socket used to receive packets
-   * \param sendSocket socket used to send to the multicast address
+   * \param sendSocket socket used to send to the multicast group
    */
   MulticastUdpTransport(const protocol::endpoint& localEndpoint,
                         const protocol::endpoint& multicastGroup,
diff --git a/daemon/face/udp-channel.hpp b/daemon/face/udp-channel.hpp
index 0825ad4..aea854c 100644
--- a/daemon/face/udp-channel.hpp
+++ b/daemon/face/udp-channel.hpp
@@ -58,7 +58,7 @@
    * \brief Enable listening on the local endpoint, accept connections,
    *        and create faces when remote host makes a connection
    * \param onFaceCreated  Callback to notify successful creation of the face
-   * \param onAcceptFailed Callback to notify when channel fails
+   * \param onReceiveFailed Callback to notify when channel fails
    *
    * Once a face is created, if it doesn't send/receive anything for
    * a period of time equal to timeout, it will be destroyed
diff --git a/daemon/face/udp-factory.hpp b/daemon/face/udp-factory.hpp
index 1c8f90f..134c5ee 100644
--- a/daemon/face/udp-factory.hpp
+++ b/daemon/face/udp-factory.hpp
@@ -111,6 +111,8 @@
    * If an unicast face is already active on the same local NIC and port, the
    * creation fails and an exception is thrown
    *
+   * \param localEndpoint local endpoint
+   * \param multicastEndpoint multicast endpoint
    * \param networkInterfaceName name of the network interface on which the face will be bound
    *        (Used only on multihomed linux machine with more than one MulticastUdpFace for
    *        the same multicast group. If specified, will requires CAP_NET_RAW capability)
diff --git a/daemon/fw/best-route-strategy2.cpp b/daemon/fw/best-route-strategy2.cpp
index e0e31dc..f582358 100644
--- a/daemon/fw/best-route-strategy2.cpp
+++ b/daemon/fw/best-route-strategy2.cpp
@@ -40,6 +40,8 @@
 }
 
 /** \brief determines whether a NextHop is eligible
+ *  \param pitEntry PIT entry
+ *  \param nexthop next hop
  *  \param currentDownstream incoming FaceId of current Interest
  *  \param wantUnused if true, NextHop must not have unexpired OutRecord
  *  \param now time::steady_clock::now(), ignored if !wantUnused
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index ebfaa05..1997427 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -79,18 +79,21 @@
 
 public: // forwarding entrypoints and tables
   /** \brief start incoming Interest processing
+   *  \param face face on which Interest is received
    *  \param interest the incoming Interest, must be created with make_shared
    */
   void
   startProcessInterest(Face& face, const Interest& interest);
 
   /** \brief start incoming Data processing
+   *  \param face face on which Data is received
    *  \param data the incoming Data, must be created with make_shared
    */
   void
   startProcessData(Face& face, const Data& data);
 
   /** \brief start incoming Nack processing
+   *  \param face face on which Nack is received
    *  \param nack the incoming Nack, must be created with make_shared
    */
   void
diff --git a/daemon/fw/strategy-info.hpp b/daemon/fw/strategy-info.hpp
index b701fc5..fecd8e1 100644
--- a/daemon/fw/strategy-info.hpp
+++ b/daemon/fw/strategy-info.hpp
@@ -36,15 +36,16 @@
 class StrategyInfo
 {
 public:
-  /** \fn static constexpr int getTypeId()
-   *  \return an integer that uniquely identifies this StrategyInfo type
+#ifdef DOXYGEN
+  /** \return an integer that uniquely identifies this StrategyInfo type
    *  \sa http://redmine.named-data.net/projects/nfd/wiki/StrategyInfoType
    */
-  // static constexpr int
-  // getTypeId()
-  // {
-  //   return <type-identifier>;
-  // }
+  static constexpr int
+  getTypeId()
+  {
+    return <type-identifier>;
+  }
+#endif
 
   virtual
   ~StrategyInfo();
diff --git a/daemon/fw/strategy.hpp b/daemon/fw/strategy.hpp
index ebbb361..8ce9850 100644
--- a/daemon/fw/strategy.hpp
+++ b/daemon/fw/strategy.hpp
@@ -132,6 +132,8 @@
 
 protected: // actions
   /** \brief send Interest to outFace
+   *  \param pitEntry PIT entry
+   *  \param outFace face through which to send out the Interest
    *  \param wantNewNonce if true, a new Nonce will be generated,
    *                      rather than reusing a Nonce from one of the PIT in-records
    */
@@ -140,6 +142,7 @@
                bool wantNewNonce = false);
 
   /** \brief decide that a pending Interest cannot be forwarded
+   *  \param pitEntry PIT entry
    *
    *  This shall not be called if the pending Interest has been
    *  forwarded earlier, and does not need to be resent now.
@@ -148,6 +151,9 @@
   rejectPendingInterest(shared_ptr<pit::Entry> pitEntry);
 
   /** \brief send Nack to outFace
+   *  \param pitEntry PIT entry
+   *  \param outFace face through which to send out the Nack
+   *  \param header Nack header
    *
    *  The outFace must have a PIT in-record, otherwise this method has no effect.
    */
@@ -157,6 +163,9 @@
 
   /** \brief send Nack to every face that has an in-record,
    *         except those in \p exceptFaces
+   *  \param pitEntry PIT entry
+   *  \param header NACK header
+   *  \param exceptFaces list of faces that should be excluded from sending Nacks
    *  \note This is not an action, but a helper that invokes the sendNack action.
    */
   void
diff --git a/daemon/table/name-tree.cpp b/daemon/table/name-tree.cpp
index 3ef1893..0f730d1 100644
--- a/daemon/table/name-tree.cpp
+++ b/daemon/table/name-tree.cpp
@@ -68,7 +68,9 @@
   }
 };
 
+/// @cond NoDocumentation
 typedef boost::mpl::if_c<sizeof(size_t) >= 8, Hash64, Hash32>::type CityHash;
+/// @endcond
 
 // Interface of different hash functions
 size_t
diff --git a/daemon/table/strategy-choice.hpp b/daemon/table/strategy-choice.hpp
index fdff3ab..68ed395 100644
--- a/daemon/table/strategy-choice.hpp
+++ b/daemon/table/strategy-choice.hpp
@@ -49,6 +49,7 @@
 
 public: // available Strategy types
   /** \brief determines if a strategy is installed
+   *  \param strategyName name of the strategy
    *  \param isExact true to require exact match, false to permit unversioned strategyName
    *  \return true if strategy is installed
    */
@@ -64,6 +65,7 @@
 
 public: // Strategy Choice table
   /** \brief set strategy of prefix to be strategyName
+   *  \param prefix the name prefix for which \p strategyName should be used
    *  \param strategyName the strategy to be used
    *  \return true on success
    *
diff --git a/docs/doxygen.conf.in b/docs/doxygen.conf.in
index 99478a8..790673e 100644
--- a/docs/doxygen.conf.in
+++ b/docs/doxygen.conf.in
@@ -422,7 +422,7 @@
 # for Java sources.
 # The default value is: YES.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. When set to YES local methods,
 # which are defined in the implementation section but not in the interface are
@@ -485,7 +485,7 @@
 # and Mac users are advised to set this option to NO.
 # The default value is: system dependent.
 
-CASE_SENSE_NAMES       = YES
+CASE_SENSE_NAMES       = NO
 
 # If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
 # their full class and namespace scopes in the documentation. If set to YES the
@@ -733,7 +733,7 @@
 # spaces.
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = core/ daemon/
+INPUT                  = core/ daemon/ rib/ tools/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1782,18 +1782,6 @@
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
-# validating XML parser to check the syntax of the XML files.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_DTD                =
-
 # If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
 # listings (including syntax highlighting and cross-referencing information) to
 # the XML output. Note that enabling this will significantly increase the size
@@ -1928,13 +1916,20 @@
 # recursively expanded use the := operator instead of the = operator.
 # This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
-PREDEFINED             = NFD_LOG_INIT(x)= \
+PREDEFINED             = DOXYGEN=1 \
+                         NFD_LOG_INIT(x)= \
+                         NFD_LOG_INCLASS_DEFINE(a,b)= \
                          NFD_LOG_INCLASS_TEMPLATE_SPECIALIZATION_DEFINE(a,b,c)= \
                          NFD_LOG_INCLASS_2TEMPLATE_SPECIALIZATION_DEFINE(a,b,c,d)= \
                          BOOST_STATIC_ASSERT(x)= \
-                         BOOST_CONCEPT_ASSERT \
-                         BOOST_CONCEPT_REQUIRES \
-                         DECL_OVERRIDE=override
+                         BOOST_CONCEPT_ASSERT(x)= \
+                         BOOST_CONCEPT_REQUIRES(x)= \
+                         DECL_OVERRIDE=override \
+                         PUBLIC_WITH_TESTS_ELSE_PRIVATE=private \
+                         PUBLIC_WITH_TESTS_ELSE_PROTECTED=protected \
+                         PROTECTED_WITH_TESTS_ELSE_PRIVATE=private \
+                         VIRTUAL_WITH_TESTS \
+                         DECL_CLASS_FINAL=final
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
 # tag can be used to specify a list of macro names that should be expanded. The
diff --git a/rib/fib-updater.cpp b/rib/fib-updater.cpp
index cddb086..8478fe6 100644
--- a/rib/fib-updater.cpp
+++ b/rib/fib-updater.cpp
@@ -333,7 +333,7 @@
 }
 
 void
-FibUpdater::addInheritedRoutes(const RibEntry& entry, const Rib::Rib::RouteSet& routesToAdd)
+FibUpdater::addInheritedRoutes(const RibEntry& entry, const Rib::RouteSet& routesToAdd)
 {
   for (const Route& route : routesToAdd) {
     // Don't add an ancestor faceId if the namespace has an entry for that faceId
@@ -347,7 +347,7 @@
 }
 
 void
-FibUpdater::addInheritedRoutes(const Name& name, const Rib::Rib::RouteSet& routesToAdd,
+FibUpdater::addInheritedRoutes(const Name& name, const Rib::RouteSet& routesToAdd,
                                const Route& ignore)
 {
   for (const Route& route : routesToAdd) {