diff --git a/Utils/Console/ConfigFile.cc b/Utils/Console/ConfigFile.cc
index 6674c4c45ba22b4705fe8e58deb207392ad496d1..dd22b58f44af250ceb997276c398430c520d1d46 100644
--- a/Utils/Console/ConfigFile.cc
+++ b/Utils/Console/ConfigFile.cc
@@ -34,6 +34,7 @@
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ConfigFileSource
+#ifndef DOXYGEN
 
 prefix_ void senf::console::detail::ConfigFileSource::v_parse(RestrictedExecutor & executor)
 {
@@ -47,6 +48,7 @@ prefix_ void senf::console::detail::ConfigFileSource::v_parse(RestrictedExecutor
             throw;
     }
 }
+#endif 
 
 ///////////////////////////////////////////////////////////////////////////
 
diff --git a/Utils/Console/ConfigFile.cci b/Utils/Console/ConfigFile.cci
index a655592dc3511d4b93ec0fb0de28100d5f9910a3..cff5ced7f9773dc8a161b498b82f535680125c69 100644
--- a/Utils/Console/ConfigFile.cci
+++ b/Utils/Console/ConfigFile.cci
@@ -32,6 +32,7 @@
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::detail::ConfigFileSource
+#ifndef DOXYGEN
 
 prefix_ senf::console::detail::ConfigFileSource::ptr
 senf::console::detail::ConfigFileSource::create(std::string const & filename)
@@ -49,6 +50,7 @@ senf::console::detail::ConfigFileSource::ignoreMissing()
 prefix_ senf::console::detail::ConfigFileSource::ConfigFileSource(std::string const & filename)
     : filename_ (filename), ignoreMissing_ (true)
 {}
+#endif 
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::ConfigFile
diff --git a/Utils/Console/Node.cc b/Utils/Console/Node.cc
index 69e1bfb243da359cd7ba2c2575297981d58e9c9b..335eb73a520621d92f087254ce3e3b5aa51b0343 100644
--- a/Utils/Console/Node.cc
+++ b/Utils/Console/Node.cc
@@ -201,6 +201,7 @@ prefix_ std::string senf::console::DirectoryNode::v_shorthelp()
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::detail::NodeTraverser
+#ifndef DOXYGEN
 
 prefix_ void senf::console::detail::NodeTraverser::operator()(std::string const & name)
 {
@@ -245,6 +246,7 @@ prefix_ senf::console::GenericNode & senf::console::detail::NodeTraverser::node(
     else
         return * dir_;
 }
+#endif
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::SimpleCommandNode
diff --git a/Utils/Console/Node.cci b/Utils/Console/Node.cci
index e0e3d7785e3d29c652bed1681b4fc7b39b078554..f1935b39801ed6326acb6ac4b96115dbc8ab626b 100644
--- a/Utils/Console/Node.cci
+++ b/Utils/Console/Node.cci
@@ -273,12 +273,14 @@ prefix_ senf::console::DirectoryNode::cptr senf::console::DirectoryNode::thisptr
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::detail::NodeTraverser
+#ifndef DOXYGEN
 
 prefix_ senf::console::detail::NodeTraverser::NodeTraverser(DirectoryNode & root,
                                                             DirectoryNode & dir,
                                                             bool autocomplete)
     : root_ (root), dir_ (dir.thisptr()), autocomplete_ (autocomplete), init_ (false)
 {}
+#endif
 
 ///////////////////////////////////////////////////////////////////////////
 // senf::console::CommandNode
diff --git a/Utils/Console/Node.hh b/Utils/Console/Node.hh
index b8702be8f0ccd7ec484f7e5e79ff994cc5d2bc4e..e96ea8e634024e2fda7af7c2520a68de339e063a 100644
--- a/Utils/Console/Node.hh
+++ b/Utils/Console/Node.hh
@@ -632,7 +632,7 @@ namespace console {
                                         ///< Execute the command
                                         /**< \param[in] output stream where result messages may be
                                                  written to
-                                             \param[in] arguments command arguments. This is a
+                                             \param[in] command command arguments. This is a
                                                  range of ranges of Token instances. */
 
         void execute(boost::any & rv, std::ostream & output, ParseCommandInfo const & command) 
@@ -641,7 +641,7 @@ namespace console {
                                         /**< \param[out] rv command return value
                                              \param[in] output stream where result messages may be
                                                  written to
-                                             \param[in] arguments command arguments. This is a
+                                             \param[in] command command arguments. This is a
                                                  range of ranges of Token instances. */
 
         void operator()(std::ostream & output, ParseCommandInfo const & command) const;
@@ -649,7 +649,7 @@ namespace console {
                                         /**< Same as execute()
                                              \param[in] output stream where result messages may be
                                                  written to
-                                             \param[in] arguments command arguments. This is a
+                                             \param[in] command command arguments. This is a
                                                  range of ranges of Token instances. */
         void operator()(boost::any & rv, std::ostream & output, ParseCommandInfo const & command)
             const;
@@ -667,7 +667,9 @@ namespace console {
             const = 0;
                                         ///< Called to execute the command
                                         /**< \param[out] rv return value holder
-                                             \param[in] arguments command arguments. This is a
+                                              \param[in] os stream where result messages may be
+                                                 written to
+                                             \param[in] command command arguments. This is a
                                                  range of ranges of Token instances. */
 
     private:
diff --git a/Utils/Console/OverloadedCommand.hh b/Utils/Console/OverloadedCommand.hh
index 4402742127428f1cae5c1eb72d9ee4a67b0847de..3be6b42ab875cf78a43a814f4b4f01864de0163f 100644
--- a/Utils/Console/OverloadedCommand.hh
+++ b/Utils/Console/OverloadedCommand.hh
@@ -90,7 +90,7 @@ namespace console {
                                              empty before this call.
                                              \pre \a index < numArguments()
                                              \param[in] index Argument index
-                                             \param[outp doc Argument documentation */
+                                             \param[out] doc Argument documentation */
 
         std::string doc() const;        ///< Get overload documentation
         
diff --git a/Utils/Termlib/Editor.hh b/Utils/Termlib/Editor.hh
index d7cadde9c1334ec630bd0e5c4e93990d509e6d52..7db6fafc17dcc05a0d76600fb18d224ac0bb630c 100644
--- a/Utils/Termlib/Editor.hh
+++ b/Utils/Termlib/Editor.hh
@@ -225,9 +225,9 @@ namespace term {
 
         LineEditor(AbstractTerminal & terminal, AcceptCallback cb);
                                         ///< Create a LineEditor
-                                        /**< \parm[in] terminal abstract terminal interface
-                                             \parm[in] cb callback to call for complete input
-                                             line */
+                                        /**< \param[in] terminal abstract terminal interface
+                                             \param[in] cb callback to call for complete input
+                                                 line */
         
         ///////////////////////////////////////////////////////////////////////////
 
diff --git a/Utils/hexdump.cc b/Utils/hexdump.cc
index 3cf9b73f5f783e98fb10f919860a779aebd8da8e..e332a6f43abcd96a579baf301b1525058ad6091a 100644
--- a/Utils/hexdump.cc
+++ b/Utils/hexdump.cc
@@ -32,6 +32,7 @@
 //#include "hexdump.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
+#ifndef DOXYGEN
 
 prefix_ void senf::detail::HexDumper::operator()(unsigned char ch)
 {
@@ -65,6 +66,7 @@ prefix_ senf::detail::HexDumper::~HexDumper()
     }
 }
 
+#endif 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 //#include "hexdump.mpp"
diff --git a/Utils/hexdump.cci b/Utils/hexdump.cci
index 7544966bf37ee7d36dd21d133e506ba75b851540..1b1d2cac4edaeee6f80894762f96e1eb5904883e 100644
--- a/Utils/hexdump.cci
+++ b/Utils/hexdump.cci
@@ -32,12 +32,13 @@
 
 ///////////////////////////////////////////////////////////////////////////
 //senf::detail::HexDumper
+#ifndef DOXYGEN
 
 prefix_ senf::detail::HexDumper::HexDumper(std::ostream & os, unsigned block_size)
     : os_ (os), ias_ (os_), block_size_ (block_size), offset_ (0)
 {}
 
-
+#endif 
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_