From 15cbdccb221aafb66189a44faea9bc2660f39745 Mon Sep 17 00:00:00 2001
From: tho <tho@wiback.org>
Date: Sat, 14 Mar 2009 15:39:30 +0000
Subject: [PATCH] some unimportant clean-ups ;)

---
 PPI/ActiveFeeder.test.cc                      |  2 +-
 PPI/AnnotationRouter.test.cc                  |  2 +-
 PPI/CloneSource.test.cc                       |  2 +-
 PPI/Connectors.test.cc                        |  2 +-
 PPI/DebugEvent.test.cc                        |  2 +-
 PPI/DebugModules.test.cc                      |  3 +--
 PPI/DiscardSink.test.cc                       |  2 +-
 PPI/Duplicators.test.cc                       |  2 +-
 PPI/EventManager.test.cc                      |  2 +-
 PPI/Events.test.cc                            |  2 +-
 PPI/IOEvent.test.cc                           |  2 +-
 PPI/IdleEvent.test.cc                         |  2 +-
 PPI/IntervalTimer.test.cc                     |  2 +-
 PPI/Joins.test.cc                             |  2 +-
 PPI/Module.test.cc                            |  2 +-
 PPI/ModuleManager.test.cc                     |  2 +-
 PPI/MonitorModule.test.cc                     |  2 +-
 PPI/PassiveQueue.test.cc                      |  2 +-
 PPI/Queueing.test.cc                          |  2 +-
 PPI/Route.test.cc                             |  2 +-
 PPI/Setup.test.cc                             |  2 +-
 PPI/SocketSink.test.cc                        |  2 +-
 PPI/SocketSource.test.cc                      |  2 +-
 PPI/ThrottleBarrier.test.cc                   |  2 +-
 Packets/80211Bundle/RadiotapPacket.test.cc    |  8 ++++---
 Packets/80211Bundle/WLANPacket.test.cc        |  7 +++---
 Packets/80221Bundle/MIHPacket.test.cc         |  8 +++----
 Packets/80221Bundle/TLVPacket.test.cc         |  3 ++-
 Packets/ArrayParser.test.cc                   |  3 ++-
 Packets/AuxParser.test.cc                     |  2 +-
 Packets/DefaultBundle/EthernetPacket.test.cc  |  3 ++-
 Packets/DefaultBundle/IPv4Packet.test.cc      |  3 ++-
 Packets/DefaultBundle/IPv6Extensions.test.cc  |  3 +--
 Packets/DefaultBundle/IPv6Packet.cc           |  1 -
 Packets/DefaultBundle/LlcSnapPacket.test.cc   |  3 ++-
 Packets/DefaultBundle/RTPPacket.test.cc       |  3 ++-
 Packets/DefaultBundle/UDPPacket.test.cc       |  3 ++-
 .../extra_tests/PacketLink.test.cc            |  2 +-
 Packets/IntParser.test.cc                     |  3 ++-
 Packets/ListBParser.test.cc                   |  2 +-
 Packets/ListNParser.test.cc                   |  2 +-
 Packets/ListParser.test.cc                    |  2 +-
 Packets/MPEGDVBBundle/DTCPPacket.test.cc      | 22 ++++++++++---------
 Packets/MPEGDVBBundle/GREPacket.test.cc       |  3 ++-
 Packets/MPEGDVBBundle/MPESection.test.cc      |  7 +++---
 Packets/MPEGDVBBundle/TransportPacket.test.cc |  3 ++-
 Packets/Packet.test.cc                        |  2 +-
 Packets/PacketData.test.cc                    |  2 +-
 Packets/PacketImpl.test.cc                    |  2 +-
 Packets/PacketInterpreter.test.cc             |  2 +-
 Packets/PacketParser.test.cc                  |  2 +-
 Packets/PacketRegistry.test.cc                |  3 ++-
 Packets/ParseHelpers.test.cc                  |  2 +-
 Packets/SafeIterator.test.cc                  |  2 +-
 Packets/VariantParser.test.cc                 |  2 +-
 Packets/VectorParser.test.cc                  |  3 ++-
 Scheduler/ClockService.test.cc                |  2 +-
 Scheduler/EventManager.test.cc                |  2 +-
 Scheduler/FdEvent.test.cc                     |  2 +-
 Scheduler/Poller.test.cc                      |  2 +-
 Scheduler/Scheduler.test.cc                   |  7 +++---
 Scheduler/SignalEvent.test.cc                 |  3 +--
 Scheduler/TimerEvent.test.cc                  |  2 +-
 Socket/ClientSocketHandle.test.cc             |  3 ++-
 Socket/FileHandle.test.cc                     |  3 ++-
 Socket/NetdeviceController.test.cc            |  3 ++-
 Socket/ProtocolClientSocketHandle.test.cc     |  3 ++-
 Socket/ProtocolServerSocketHandle.test.cc     |  3 ++-
 Socket/Protocols/BSDAddressingPolicy.test.cc  |  2 +-
 Socket/Protocols/BSDSocketAddress.test.cc     |  2 +-
 Socket/Protocols/DVB/DVBFrontendHandle.cc     |  2 +-
 Socket/Protocols/INet/INet4Address.test.cc    |  2 +-
 Socket/Protocols/INet/INet6Address.test.cc    |  2 +-
 Socket/Protocols/INet/INetAddressing.test.cc  |  3 ++-
 .../INet/MulticastSocketProtocol.test.cc      |  2 +-
 .../INet/RawINetSocketHandle.test.cc          |  2 +-
 Socket/Protocols/INet/TCPSocketHandle.test.cc |  5 +++--
 Socket/Protocols/INet/UDPSocketHandle.test.cc |  2 +-
 Socket/Protocols/Raw/LLAddressing.test.cc     |  3 ++-
 Socket/Protocols/Raw/MACAddress.test.cc       |  2 +-
 .../Protocols/Raw/PacketSocketHandle.test.cc  |  6 ++---
 .../Protocols/Raw/TunTapSocketHandle.test.cc  |  9 ++++----
 .../UN/UNDatagramSocketHandle.test.cc         |  2 +-
 Socket/Protocols/UN/UNSocketProtocol.test.cc  |  2 +-
 Socket/ServerSocketHandle.test.cc             |  3 ++-
 Socket/SocketHandle.cti                       |  3 +--
 Socket/SocketHandle.hh                        |  6 ++---
 Socket/SocketHandle.test.cc                   |  3 ++-
 Socket/SocketPolicy.test.cc                   | 13 ++++++-----
 Socket/SocketProtocol.test.cc                 |  6 ++---
 Utils/Buffer.test.cc                          |  2 +-
 Utils/Console/Config.test.cc                  |  2 +-
 Utils/Console/ConfigFile.test.cc              |  2 +-
 Utils/Console/Executor.test.cc                |  2 +-
 Utils/Console/Node.test.cc                    |  2 +-
 Utils/Console/OverloadedCommand.test.cc       |  2 +-
 Utils/Console/Parse.test.cc                   |  2 +-
 Utils/Console/ParsedCommand.test.cc           |  2 +-
 Utils/Console/ProgramOptions.test.cc          |  2 +-
 Utils/Console/STLSupport.test.cc              |  2 +-
 Utils/Console/ScopedDirectory.test.cc         |  2 +-
 Utils/Console/Server.test.cc                  |  2 +-
 Utils/Console/Traits.test.cc                  |  2 +-
 Utils/Console/Variables.test.cc               |  2 +-
 Utils/Daemon/Daemon.test.cc                   | 10 ++++-----
 Utils/DiscardStream.test.cc                   |  2 +-
 Utils/Exception.test.cc                       |  6 ++---
 Utils/IpChecksum.test.cc                      |  2 +-
 Utils/IteratorTraits.test.cc                  |  2 +-
 Utils/Logger/AreaRegistry.test.cc             |  2 +-
 Utils/Logger/Config.test.cc                   |  2 +-
 Utils/Logger/FileTarget.test.cc               |  2 +-
 Utils/Logger/Log.test.cc                      |  5 +++--
 Utils/Logger/Parameters.test.cc               |  2 +-
 Utils/Logger/StreamRegistry.test.cc           |  2 +-
 Utils/Logger/SyslogTarget.test.cc             |  4 ++--
 Utils/Logger/SyslogUDPTarget.test.cc          |  2 +-
 Utils/Logger/Target.test.cc                   |  2 +-
 Utils/String.test.cc                          |  2 +-
 Utils/Tags.test.cc                            |  2 +-
 Utils/Termlib/Telnet.test.cc                  |  2 +-
 Utils/Termlib/Terminfo.test.cc                |  2 +-
 Utils/TypeIdValue.test.cc                     |  2 +-
 Utils/TypeInfo.test.cc                        |  3 ++-
 Utils/hexdump.test.cc                         |  2 +-
 Utils/intrusive_refcount.test.cc              |  3 ++-
 Utils/membind.test.cc                         |  5 +++--
 Utils/mpl.test.cc                             |  2 +-
 Utils/parameter.test.cc                       |  2 +-
 Utils/pool_alloc_mixin.test.cc                |  2 +-
 Utils/preprocessor.test.cc                    |  2 +-
 Utils/safe_bool.test.cc                       |  2 +-
 Utils/singleton.test.cc                       |  2 +-
 Utils/type_traits.test.cc                     |  2 +-
 134 files changed, 212 insertions(+), 182 deletions(-)

diff --git a/PPI/ActiveFeeder.test.cc b/PPI/ActiveFeeder.test.cc
index 8fade6ade..f54e426b8 100644
--- a/PPI/ActiveFeeder.test.cc
+++ b/PPI/ActiveFeeder.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ActiveFeeder.test unit tests */
+    \brief ActiveFeeder unit tests */
 
 //#include "ActiveFeeder.test.hh"
 //#include "ActiveFeeder.test.ih"
diff --git a/PPI/AnnotationRouter.test.cc b/PPI/AnnotationRouter.test.cc
index ca0c0ab76..778786457 100644
--- a/PPI/AnnotationRouter.test.cc
+++ b/PPI/AnnotationRouter.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief AnnotationRouter.test unit tests */
+    \brief AnnotationRouter unit tests */
 
 //#include "AnnotationRouter.test.hh"
 //#include "AnnotationRouter.test.ih"
diff --git a/PPI/CloneSource.test.cc b/PPI/CloneSource.test.cc
index 105ad0df2..d2f459c1d 100644
--- a/PPI/CloneSource.test.cc
+++ b/PPI/CloneSource.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief CloneSource.test unit tests */
+    \brief CloneSource unit tests */
 
 //#include "CloneSource.test.hh"
 //#include "CloneSource.test.ih"
diff --git a/PPI/Connectors.test.cc b/PPI/Connectors.test.cc
index a793d261d..20b7e3e40 100644
--- a/PPI/Connectors.test.cc
+++ b/PPI/Connectors.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Connectors.test unit tests */
+    \brief Connectors unit tests */
 
 //#include "Connectors.test.hh"
 //#include "Connectors.test.ih"
diff --git a/PPI/DebugEvent.test.cc b/PPI/DebugEvent.test.cc
index 840d52b79..e721ca943 100644
--- a/PPI/DebugEvent.test.cc
+++ b/PPI/DebugEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DebugEvent.test unit tests */
+    \brief DebugEvent unit tests */
 
 //#include "DebugEvent.test.hh"
 //#include "DebugEvent.test.ih"
diff --git a/PPI/DebugModules.test.cc b/PPI/DebugModules.test.cc
index 854d7fd3f..fa198bd07 100644
--- a/PPI/DebugModules.test.cc
+++ b/PPI/DebugModules.test.cc
@@ -21,12 +21,11 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DebubgModules.test unit tests */
+    \brief DebubgModules unit tests */
 
 //#include "DebubgModules.test.hh"
 //#include "DebubgModules.test.ih"
 
-
 // Custom includes
 #include <algorithm>
 #include <sstream>
diff --git a/PPI/DiscardSink.test.cc b/PPI/DiscardSink.test.cc
index c6e1907ed..b57c6db18 100644
--- a/PPI/DiscardSink.test.cc
+++ b/PPI/DiscardSink.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DiscardSink.test unit tests */
+    \brief DiscardSink unit tests */
 
 //#include "DiscardSink.test.hh"
 //#include "DiscardSink.test.ih"
diff --git a/PPI/Duplicators.test.cc b/PPI/Duplicators.test.cc
index 4cfd740e7..40f40d9c6 100644
--- a/PPI/Duplicators.test.cc
+++ b/PPI/Duplicators.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Duplicators.test unit tests */
+    \brief Duplicators unit tests */
 
 //#include "Duplicators.test.hh"
 //#include "Duplicators.test.ih"
diff --git a/PPI/EventManager.test.cc b/PPI/EventManager.test.cc
index ee1c5848b..ed750a976 100644
--- a/PPI/EventManager.test.cc
+++ b/PPI/EventManager.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief EventManager.test unit tests */
+    \brief EventManager unit tests */
 
 //#include "EventManager.test.hh"
 //#include "EventManager.test.ih"
diff --git a/PPI/Events.test.cc b/PPI/Events.test.cc
index 6d0c30ea5..c80448a60 100644
--- a/PPI/Events.test.cc
+++ b/PPI/Events.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Events.test unit tests */
+    \brief Events unit tests */
 
 //#include "Events.test.hh"
 //#include "Events.test.ih"
diff --git a/PPI/IOEvent.test.cc b/PPI/IOEvent.test.cc
index 32ee26682..226f28102 100644
--- a/PPI/IOEvent.test.cc
+++ b/PPI/IOEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IOEvent.test unit tests */
+    \brief IOEvent unit tests */
 
 //#include "IOEvent.test.hh"
 //#include "IOEvent.test.ih"
diff --git a/PPI/IdleEvent.test.cc b/PPI/IdleEvent.test.cc
index f9eafd0f2..c5f235214 100644
--- a/PPI/IdleEvent.test.cc
+++ b/PPI/IdleEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IdleEvent.test unit tests */
+    \brief IdleEvent unit tests */
 
 //#include "IdleEvent.test.hh"
 //#include "IdleEvent.test.ih"
diff --git a/PPI/IntervalTimer.test.cc b/PPI/IntervalTimer.test.cc
index e7e9882ab..b32cc31fa 100644
--- a/PPI/IntervalTimer.test.cc
+++ b/PPI/IntervalTimer.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IntervalTimer.test unit tests */
+    \brief IntervalTimer unit tests */
 
 //#include "IntervalTimer.test.hh"
 //#include "IntervalTimer.test.ih"
diff --git a/PPI/Joins.test.cc b/PPI/Joins.test.cc
index c0fca8e5a..7e14488bf 100644
--- a/PPI/Joins.test.cc
+++ b/PPI/Joins.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Joins.test unit tests */
+    \brief Joins unit tests */
 
 //#include "Joins.test.hh"
 //#include "Joins.test.ih"
diff --git a/PPI/Module.test.cc b/PPI/Module.test.cc
index cca1208a7..ca678443d 100644
--- a/PPI/Module.test.cc
+++ b/PPI/Module.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Module.test unit tests */
+    \brief Module unit tests */
 
 //#include "Module.test.hh"
 //#include "Module.test.ih"
diff --git a/PPI/ModuleManager.test.cc b/PPI/ModuleManager.test.cc
index 59b0b6b9b..c6f137311 100644
--- a/PPI/ModuleManager.test.cc
+++ b/PPI/ModuleManager.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ModuleManager.test unit tests */
+    \brief ModuleManager unit tests */
 
 //#include "ModuleManager.test.hh"
 //#include "ModuleManager.test.ih"
diff --git a/PPI/MonitorModule.test.cc b/PPI/MonitorModule.test.cc
index 9fd3ee7b5..c86cd8447 100644
--- a/PPI/MonitorModule.test.cc
+++ b/PPI/MonitorModule.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief MonitorModule.test unit tests */
+    \brief MonitorModule unit tests */
 
 //#include "MonitorModule.test.hh"
 //#include "MonitorModule.test.ih"
diff --git a/PPI/PassiveQueue.test.cc b/PPI/PassiveQueue.test.cc
index 2b8600708..172db85b5 100644
--- a/PPI/PassiveQueue.test.cc
+++ b/PPI/PassiveQueue.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PassiveQueue.test unit tests */
+    \brief PassiveQueue unit tests */
 
 //#include "PassiveQueue.test.hh"
 //#include "PassiveQueue.test.ih"
diff --git a/PPI/Queueing.test.cc b/PPI/Queueing.test.cc
index 9f3e63a79..5f18e15de 100644
--- a/PPI/Queueing.test.cc
+++ b/PPI/Queueing.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Queueing.test unit tests */
+    \brief Queueing unit tests */
 
 //#include "Queueing.test.hh"
 //#include "Queueing.test.ih"
diff --git a/PPI/Route.test.cc b/PPI/Route.test.cc
index efa3f12ad..24892bf8f 100644
--- a/PPI/Route.test.cc
+++ b/PPI/Route.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Route.test unit tests */
+    \brief Route unit tests */
 
 //#include "Route.test.hh"
 //#include "Route.test.ih"
diff --git a/PPI/Setup.test.cc b/PPI/Setup.test.cc
index e6a4fb703..6a2477a0a 100644
--- a/PPI/Setup.test.cc
+++ b/PPI/Setup.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Setup.test unit tests */
+    \brief Setup unit tests */
 
 //#include "Setup.test.hh"
 //#include "Setup.test.ih"
diff --git a/PPI/SocketSink.test.cc b/PPI/SocketSink.test.cc
index fa2f06256..3cd3651cb 100644
--- a/PPI/SocketSink.test.cc
+++ b/PPI/SocketSink.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SocketSink.test unit tests */
+    \brief SocketSink unit tests */
 
 //#include "SocketSink.test.hh"
 //#include "SocketSink.test.ih"
diff --git a/PPI/SocketSource.test.cc b/PPI/SocketSource.test.cc
index a1f37118f..f922db89b 100644
--- a/PPI/SocketSource.test.cc
+++ b/PPI/SocketSource.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SocketSource.test unit tests */
+    \brief SocketSource unit tests */
 
 //#include "SocketSource.test.hh"
 //#include "SocketSource.test.ih"
diff --git a/PPI/ThrottleBarrier.test.cc b/PPI/ThrottleBarrier.test.cc
index efcdbaea8..4c7abef3b 100644
--- a/PPI/ThrottleBarrier.test.cc
+++ b/PPI/ThrottleBarrier.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ThrottleBarrier.test unit tests */
+    \brief ThrottleBarrier unit tests */
 
 //#include "ThrottleBarrier.test.hh"
 //#include "ThrottleBarrier.test.ih"
diff --git a/Packets/80211Bundle/RadiotapPacket.test.cc b/Packets/80211Bundle/RadiotapPacket.test.cc
index 33ee3fae8..3a0cb0bd1 100644
--- a/Packets/80211Bundle/RadiotapPacket.test.cc
+++ b/Packets/80211Bundle/RadiotapPacket.test.cc
@@ -20,15 +20,17 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+/** \file
+    \brief RadiotapPacket unit tests */
 
 // Custom includes
+#include "RadiotapPacket.hh"
 #include "../../Packets/Packets.hh"
+
 #include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include "RadiotapPacket.hh"
-
 
+///////////////////////////////cc.p////////////////////////////////////////
 BOOST_AUTO_UNIT_TEST(RadiotapPacket_packet)
 {
     /* used madwifi 0.9.4 */
diff --git a/Packets/80211Bundle/WLANPacket.test.cc b/Packets/80211Bundle/WLANPacket.test.cc
index e91cdc8f0..f1f943706 100644
--- a/Packets/80211Bundle/WLANPacket.test.cc
+++ b/Packets/80211Bundle/WLANPacket.test.cc
@@ -21,15 +21,16 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief WLANPacket.test unit tests */
+    \brief WLANPacket unit tests */
 
 // Custom includes
-
+#include "WLANPacket.hh"
 #include "../../Packets/Packets.hh"
+
 #include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include "WLANPacket.hh"
 
+///////////////////////////////cc.p////////////////////////////////////////
 /* test parser with a data frame */
 BOOST_AUTO_UNIT_TEST(WLANPacket_dataFrame_packet)
 {
diff --git a/Packets/80221Bundle/MIHPacket.test.cc b/Packets/80221Bundle/MIHPacket.test.cc
index 4fcbdbc3d..3b021ee33 100644
--- a/Packets/80221Bundle/MIHPacket.test.cc
+++ b/Packets/80221Bundle/MIHPacket.test.cc
@@ -26,15 +26,15 @@
 //#include "MIHPacket.test.hh"
 //#include "MIHPacket.test.ih"
 
-#include "../../Utils/auto_unit_test.hh"
-#include <boost/test/test_tools.hpp>
-
+// Custom includes
 #include "MIHPacket.hh"
 
-using namespace senf;
+#include "../../Utils/auto_unit_test.hh"
+#include <boost/test/test_tools.hpp>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
+using namespace senf;
 
 BOOST_AUTO_UNIT_TEST(MIHPacket_create_string)
 {
diff --git a/Packets/80221Bundle/TLVPacket.test.cc b/Packets/80221Bundle/TLVPacket.test.cc
index 2ba18648f..8dc8df2c7 100644
--- a/Packets/80221Bundle/TLVPacket.test.cc
+++ b/Packets/80221Bundle/TLVPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief TLVPacket unit tests */
 
 //#include "TLVPacket.test.hh"
 //#include "TLVPacket.test.ih"
diff --git a/Packets/ArrayParser.test.cc b/Packets/ArrayParser.test.cc
index 2ae6a1121..fe5c517cc 100644
--- a/Packets/ArrayParser.test.cc
+++ b/Packets/ArrayParser.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ArrayParser unit tests */
 
 //#include "ArrayParser.test.hh"
 //#include "ArrayParser.test.ih"
diff --git a/Packets/AuxParser.test.cc b/Packets/AuxParser.test.cc
index af26822c6..ff7aaa2b9 100644
--- a/Packets/AuxParser.test.cc
+++ b/Packets/AuxParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief AuxParser.test unit tests */
+    \brief AuxParser unit tests */
 
 //#include "AuxParser.test.hh"
 //#include "AuxParser.test.ih"
diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index 29f85cce7..f3dca0083 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief EthernetPacket unit tests */
 
 //#include "EthernetPacket.test.hh"
 //#include "EthernetPacket.test.ih"
diff --git a/Packets/DefaultBundle/IPv4Packet.test.cc b/Packets/DefaultBundle/IPv4Packet.test.cc
index 7ddbe861a..a93e63151 100644
--- a/Packets/DefaultBundle/IPv4Packet.test.cc
+++ b/Packets/DefaultBundle/IPv4Packet.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief IPv4Packet unit tests */
 
 //#include "IPv4Packet.test.hh"
 //#include "IPv4Packet.test.ih"
diff --git a/Packets/DefaultBundle/IPv6Extensions.test.cc b/Packets/DefaultBundle/IPv6Extensions.test.cc
index a82a73a54..31c3fe858 100644
--- a/Packets/DefaultBundle/IPv6Extensions.test.cc
+++ b/Packets/DefaultBundle/IPv6Extensions.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IPv6Extensions.test unit tests */
+    \brief IPv6Extensions unit tests */
 
 //#include "IPv6Extensions.test.hh"
 //#include "IPv6Extensions.test.ih"
@@ -30,7 +30,6 @@
 #include "IPv6Extensions.hh"
 #include "IPv6Packet.hh"
 #include "UDPPacket.hh"
-#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 #include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
diff --git a/Packets/DefaultBundle/IPv6Packet.cc b/Packets/DefaultBundle/IPv6Packet.cc
index ca4fc8f65..a0f9083e2 100644
--- a/Packets/DefaultBundle/IPv6Packet.cc
+++ b/Packets/DefaultBundle/IPv6Packet.cc
@@ -30,7 +30,6 @@
 #include <iomanip>
 #include <boost/io/ios_state.hpp>
 #include "EthernetPacket.hh"
-#include "../../Socket/Protocols/INet/INetAddressing.hh"
 
 //#include "IPv6Packet.mpp"
 #define prefix_
diff --git a/Packets/DefaultBundle/LlcSnapPacket.test.cc b/Packets/DefaultBundle/LlcSnapPacket.test.cc
index e3e51a68c..37890c907 100644
--- a/Packets/DefaultBundle/LlcSnapPacket.test.cc
+++ b/Packets/DefaultBundle/LlcSnapPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief LlcSnapPacket unit tests */
 
 //#include "LlcSnapPacket.test.hh"
 //#include "LlcSnapPacket.test.ih"
diff --git a/Packets/DefaultBundle/RTPPacket.test.cc b/Packets/DefaultBundle/RTPPacket.test.cc
index 58dd16ce4..04ee7aacd 100644
--- a/Packets/DefaultBundle/RTPPacket.test.cc
+++ b/Packets/DefaultBundle/RTPPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief RTPPacket unit tests */
 
 // Custom includes
 #include "RTPPacket.hh"
diff --git a/Packets/DefaultBundle/UDPPacket.test.cc b/Packets/DefaultBundle/UDPPacket.test.cc
index 18722a379..cec4ec1fd 100644
--- a/Packets/DefaultBundle/UDPPacket.test.cc
+++ b/Packets/DefaultBundle/UDPPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief UDPPacket unit tests */
 
 //#include "UDPPacket.test.hh"
 //#include "UDPPacket.test.ih"
diff --git a/Packets/DefaultBundle/extra_tests/PacketLink.test.cc b/Packets/DefaultBundle/extra_tests/PacketLink.test.cc
index e84cd9d3b..d5bc38083 100644
--- a/Packets/DefaultBundle/extra_tests/PacketLink.test.cc
+++ b/Packets/DefaultBundle/extra_tests/PacketLink.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketLink.test unit tests */
+    \brief PacketLink unit tests */
 
 //#include "PacketLink.test.hh"
 //#include "PacketLink.test.ih"
diff --git a/Packets/IntParser.test.cc b/Packets/IntParser.test.cc
index 2ef9ff255..1cf05ab0e 100644
--- a/Packets/IntParser.test.cc
+++ b/Packets/IntParser.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief IntParser unit tests */
 
 //#include "IntParser.test.hh"
 //#include "IntParser.test.ih"
diff --git a/Packets/ListBParser.test.cc b/Packets/ListBParser.test.cc
index 585f1761f..d1fc12507 100644
--- a/Packets/ListBParser.test.cc
+++ b/Packets/ListBParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ListBParser.test unit tests */
+    \brief ListBParser unit tests */
 
 //#include "ListBParser.test.hh"
 //#include "ListBParser.test.ih"
diff --git a/Packets/ListNParser.test.cc b/Packets/ListNParser.test.cc
index 412c35b5c..4d356f1e1 100644
--- a/Packets/ListNParser.test.cc
+++ b/Packets/ListNParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ListNParser.test unit tests */
+    \brief ListNParser unit tests */
 
 //#include "ListNParser.test.hh"
 //#include "ListNParser.test.ih"
diff --git a/Packets/ListParser.test.cc b/Packets/ListParser.test.cc
index 438f5c4ab..8f82c669b 100644
--- a/Packets/ListParser.test.cc
+++ b/Packets/ListParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ListParser.test unit tests */
+    \brief ListParser unit tests */
 
 //#include "ListParser.test.hh"
 //#include "ListParser.test.ih"
diff --git a/Packets/MPEGDVBBundle/DTCPPacket.test.cc b/Packets/MPEGDVBBundle/DTCPPacket.test.cc
index 7e03d144a..c8edbc37b 100644
--- a/Packets/MPEGDVBBundle/DTCPPacket.test.cc
+++ b/Packets/MPEGDVBBundle/DTCPPacket.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DTCPPacket.test unit tests */
+    \brief DTCPPacket unit tests */
 
 //#include "DTCPPacket.test.hh"
 //#include "DTCPPacket.test.ih"
@@ -38,15 +38,17 @@
 
 BOOST_AUTO_UNIT_TEST(dtcpPacket)
 {
-    unsigned char data[] = { 0x11,                 // versionNumber = 1, command = JOIN
-                             5,                    // interval
-                             0x0A, 0x0B,           // sequence number
-                             0x14,                 // receiveCapable = true, ipVersion = 4
-                             23,                   // tunnelProtocol
-                             2,                    // fbipCount
-                             0x00,
-                             101, 102, 103, 104,   // fbip1
-                             201, 202, 203, 204 }; // fbip2
+    unsigned char data[] = { 
+            0x11,                 // versionNumber = 1, command = JOIN
+            5,                    // interval
+            0x0A, 0x0B,           // sequence number
+            0x14,                 // receiveCapable = true, ipVersion = 4
+            23,                   // tunnelProtocol
+            2,                    // fbipCount
+            0x00,
+            101, 102, 103, 104,   // fbip1
+            201, 202, 203, 204    // fbip2
+    };
 
     senf::DTCPHelloPacket hello (senf::DTCPHelloPacket::create(
                                      boost::make_iterator_range(data, data+sizeof(data))));
diff --git a/Packets/MPEGDVBBundle/GREPacket.test.cc b/Packets/MPEGDVBBundle/GREPacket.test.cc
index c27c7d4f4..c3481fa87 100644
--- a/Packets/MPEGDVBBundle/GREPacket.test.cc
+++ b/Packets/MPEGDVBBundle/GREPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief GREPacket unit tests */
 
 //#include "GREPacket.test.hh"
 //#include "GREPacket.test.ih"
diff --git a/Packets/MPEGDVBBundle/MPESection.test.cc b/Packets/MPEGDVBBundle/MPESection.test.cc
index 6d8969a3e..66bca28bb 100644
--- a/Packets/MPEGDVBBundle/MPESection.test.cc
+++ b/Packets/MPEGDVBBundle/MPESection.test.cc
@@ -20,18 +20,19 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief MPESection unit tests */
 
 //#include "MPESection.test.hh"
 //#include "MPESection.test.ih"
 
 // Custom includes
 #include "MPESection.hh"
-
-#include "../../Utils/auto_unit_test.hh"
 #include "../../Packets/DefaultBundle/LlcSnapPacket.hh"
 #include "../../Packets/DefaultBundle/EthernetPacket.hh"
 #include "../../Packets/DefaultBundle/IPv4Packet.hh"
+
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/TransportPacket.test.cc b/Packets/MPEGDVBBundle/TransportPacket.test.cc
index caa2b02e2..50b2377ec 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TransportPacket.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief TransportPacket unit tests */
 
 //#include "TransportPacket.test.hh"
 //#include "TransportPacket.test.ih"
diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index 521dfcba3..18b8fe9ed 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Packet.test unit tests */
+    \brief Packet unit tests */
 
 //#include "Packet.test.hh"
 //#include "Packet.test.ih"
diff --git a/Packets/PacketData.test.cc b/Packets/PacketData.test.cc
index 3cd5d91e2..76806f627 100644
--- a/Packets/PacketData.test.cc
+++ b/Packets/PacketData.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketData.test unit tests */
+    \brief PacketData unit tests */
 
 //#include "PacketData.test.hh"
 //#include "PacketData.test.ih"
diff --git a/Packets/PacketImpl.test.cc b/Packets/PacketImpl.test.cc
index fe31d9526..649bd0f92 100644
--- a/Packets/PacketImpl.test.cc
+++ b/Packets/PacketImpl.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketImpl.test unit tests */
+    \brief PacketImpl unit tests */
 
 //#include "PacketImpl.test.hh"
 //#include "PacketImpl.test.ih"
diff --git a/Packets/PacketInterpreter.test.cc b/Packets/PacketInterpreter.test.cc
index 679940aba..8e8d8c29b 100644
--- a/Packets/PacketInterpreter.test.cc
+++ b/Packets/PacketInterpreter.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketInterpreter.test unit tests */
+    \brief PacketInterpreter unit tests */
 
 //#include "PacketInterpreter.test.hh"
 //#include "PacketInterpreter.test.ih"
diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc
index 7adc52a48..0a120b9f8 100644
--- a/Packets/PacketParser.test.cc
+++ b/Packets/PacketParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketParser.test unit tests */
+    \brief PacketParser unit tests */
 
 //#include "PacketParser.test.hh"
 //#include "PacketParser.test.ih"
diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index 852182711..a30c8fbc0 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief PacketRegistry unit tests */
 
 //#include "PacketRegistry.test.hh"
 //#include "PacketRegistry.test.ih"
diff --git a/Packets/ParseHelpers.test.cc b/Packets/ParseHelpers.test.cc
index e4aa5bd09..b5a5f222c 100644
--- a/Packets/ParseHelpers.test.cc
+++ b/Packets/ParseHelpers.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ParseHelpers.test unit tests */
+    \brief ParseHelpers unit tests */
 
 //#include "ParseHelpers.test.hh"
 //#include "ParseHelpers.test.ih"
diff --git a/Packets/SafeIterator.test.cc b/Packets/SafeIterator.test.cc
index 32916bb0f..171f834e4 100644
--- a/Packets/SafeIterator.test.cc
+++ b/Packets/SafeIterator.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SafeIterator.test unit tests */
+    \brief SafeIterator unit tests */
 
 //#include "SafeIterator.test.hh"
 //#include "SafeIterator.test.ih"
diff --git a/Packets/VariantParser.test.cc b/Packets/VariantParser.test.cc
index 1bf32545a..364349e63 100644
--- a/Packets/VariantParser.test.cc
+++ b/Packets/VariantParser.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief VariantParser.test unit tests */
+    \brief VariantParser unit tests */
 
 //#include "VariantParser.test.hh"
 //#include "VariantParser.test.ih"
diff --git a/Packets/VectorParser.test.cc b/Packets/VectorParser.test.cc
index f720df05a..aa554b2e5 100644
--- a/Packets/VectorParser.test.cc
+++ b/Packets/VectorParser.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief VectorParser unit tests */
 
 //#include "VectorParser.test.hh"
 //#include "VectorParser.test.ih"
diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index a67761cc6..21b9288f9 100644
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ClockService.test unit tests */
+    \brief ClockService unit tests */
 
 //#include "ClockService.test.hh"
 //#include "ClockService.test.ih"
diff --git a/Scheduler/EventManager.test.cc b/Scheduler/EventManager.test.cc
index 18e2cabcd..0c63ca1e9 100644
--- a/Scheduler/EventManager.test.cc
+++ b/Scheduler/EventManager.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief EventManager.test unit tests */
+    \brief EventManager unit tests */
 
 //#include "EventManager.test.hh"
 //#include "EventManager.test.ih"
diff --git a/Scheduler/FdEvent.test.cc b/Scheduler/FdEvent.test.cc
index 21f3addd7..865c45a4d 100644
--- a/Scheduler/FdEvent.test.cc
+++ b/Scheduler/FdEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief FdEvent.test unit tests */
+    \brief FdEvent unit tests */
 
 //#include "FdEvent.test.hh"
 //#include "FdEvent.test.ih"
diff --git a/Scheduler/Poller.test.cc b/Scheduler/Poller.test.cc
index 35cb27000..e40290c9e 100644
--- a/Scheduler/Poller.test.cc
+++ b/Scheduler/Poller.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Poller.test unit tests */
+    \brief Poller unit tests */
 
 //#include "Poller.test.hh"
 //#include "Poller.test.ih"
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index f328d32ea..0a135182e 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -20,10 +20,11 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief Scheduler unit tests */
 
-//#include "scheduler.test.hh"
-//#include "scheduler.test.ih"
+//#include "Scheduler.test.hh"
+//#include "Scheduler.test.ih"
 
 // Custom includes
 #include <sys/types.h>
diff --git a/Scheduler/SignalEvent.test.cc b/Scheduler/SignalEvent.test.cc
index 62376a1da..d42f7204b 100644
--- a/Scheduler/SignalEvent.test.cc
+++ b/Scheduler/SignalEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SignalEvent.test unit tests */
+    \brief SignalEvent unit tests */
 
 //#include "SignalEvent.test.hh"
 //#include "SignalEvent.test.ih"
@@ -42,7 +42,6 @@ namespace {
     {
         called = true;
     }
-
 }
 
 BOOST_AUTO_UNIT_TEST(signalDispatcher)
diff --git a/Scheduler/TimerEvent.test.cc b/Scheduler/TimerEvent.test.cc
index e4f2b9805..e7b614127 100644
--- a/Scheduler/TimerEvent.test.cc
+++ b/Scheduler/TimerEvent.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TimerEvent.test unit tests */
+    \brief TimerEvent unit tests */
 
 //#include "TimerEvent.test.hh"
 //#include "TimerEvent.test.ih"
diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index 0d6e994f7..7ffbc6b9e 100644
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ClientSocketHandle unit tests */
 
 //#include "ClientSocketHandle.test.hh"
 //#include "ClientSocketHandle.test.ih"
diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc
index 8e68d9a75..60ba3ba60 100644
--- a/Socket/FileHandle.test.cc
+++ b/Socket/FileHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief FileHandle unit tests */
 
 //#include "FileHandle.test.hh"
 //#include "FileHandle.test.ih"
diff --git a/Socket/NetdeviceController.test.cc b/Socket/NetdeviceController.test.cc
index a55102ea6..8b3725016 100644
--- a/Socket/NetdeviceController.test.cc
+++ b/Socket/NetdeviceController.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief NetdeviceController unit tests */
 
 //#include "NetdeviceController.test.hh"
 //#include "NetdeviceController.test.ih"
diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index 861f2997a..131474219 100644
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ProtocolClientSocketHandle unit tests */
 
 //#include "ProtocolClientSocketHandle.test.hh"
 //#include "ProtocolClientSocketHandle.test.ih"
diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index 5ebde9a7b..9a3913ff6 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ProtocolServerSocketHandle unit tests */
 
 //#include "ProtocolServerSocketHandle.test.hh"
 //#include "ProtocolServerSocketHandle.test.ih"
diff --git a/Socket/Protocols/BSDAddressingPolicy.test.cc b/Socket/Protocols/BSDAddressingPolicy.test.cc
index 0f7ef7910..f793efa91 100644
--- a/Socket/Protocols/BSDAddressingPolicy.test.cc
+++ b/Socket/Protocols/BSDAddressingPolicy.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief BSDAddressingPolicy.test unit tests */
+    \brief BSDAddressingPolicy unit tests */
 
 //#include "BSDAddressingPolicy.test.hh"
 //#include "BSDAddressingPolicy.test.ih"
diff --git a/Socket/Protocols/BSDSocketAddress.test.cc b/Socket/Protocols/BSDSocketAddress.test.cc
index 774b945b5..cb53808b2 100644
--- a/Socket/Protocols/BSDSocketAddress.test.cc
+++ b/Socket/Protocols/BSDSocketAddress.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief BSDSocketAddress.test unit tests */
+    \brief BSDSocketAddress unit tests */
 
 //#include "BSDSocketAddress.test.hh"
 //#include "BSDSocketAddress.test.ih"
diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/Socket/Protocols/DVB/DVBFrontendHandle.cc
index 491cf4944..bb63f70cb 100644
--- a/Socket/Protocols/DVB/DVBFrontendHandle.cc
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.cc
@@ -30,7 +30,7 @@
 // Custom includes
 #include <boost/format.hpp>
 #include <sys/socket.h>
-#include "senf/Utils/Exception.hh"
+#include "../../../Utils/Exception.hh"
 #include <sys/ioctl.h>
 
 
diff --git a/Socket/Protocols/INet/INet4Address.test.cc b/Socket/Protocols/INet/INet4Address.test.cc
index c83701867..3c7526208 100644
--- a/Socket/Protocols/INet/INet4Address.test.cc
+++ b/Socket/Protocols/INet/INet4Address.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief INet4Address.test unit tests */
+    \brief INet4Address unit tests */
 
 //#include "INet4Address.test.hh"
 //#include "INet4Address.test.ih"
diff --git a/Socket/Protocols/INet/INet6Address.test.cc b/Socket/Protocols/INet/INet6Address.test.cc
index 50bf3506d..f56ce6ed5 100644
--- a/Socket/Protocols/INet/INet6Address.test.cc
+++ b/Socket/Protocols/INet/INet6Address.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief INet6Address.test unit tests */
+    \brief INet6Address unit tests */
 
 //#include "INet6Address.test.hh"
 //#include "INet6Address.test.ih"
diff --git a/Socket/Protocols/INet/INetAddressing.test.cc b/Socket/Protocols/INet/INetAddressing.test.cc
index a6f2dbdce..0dd2d952a 100644
--- a/Socket/Protocols/INet/INetAddressing.test.cc
+++ b/Socket/Protocols/INet/INetAddressing.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief INetAddressing unit tests */
 
 //#include "INetAddressing.test.hh"
 //#include "INetAddressing.test.ih"
diff --git a/Socket/Protocols/INet/MulticastSocketProtocol.test.cc b/Socket/Protocols/INet/MulticastSocketProtocol.test.cc
index 2212645f7..8493c8646 100644
--- a/Socket/Protocols/INet/MulticastSocketProtocol.test.cc
+++ b/Socket/Protocols/INet/MulticastSocketProtocol.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief MulticastSocketProtocol.test unit tests */
+    \brief MulticastSocketProtocol unit tests */
 
 //#include "MulticastSocketProtocol.test.hh"
 //#include "MulticastSocketProtocol.test.ih"
diff --git a/Socket/Protocols/INet/RawINetSocketHandle.test.cc b/Socket/Protocols/INet/RawINetSocketHandle.test.cc
index d8949e386..1ea5cd83e 100644
--- a/Socket/Protocols/INet/RawINetSocketHandle.test.cc
+++ b/Socket/Protocols/INet/RawINetSocketHandle.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief RawINetSocketHandle.test unit tests */
+    \brief RawINetSocketHandle unit tests */
 
 #include <sys/types.h>
 #include <sys/ioctl.h>
diff --git a/Socket/Protocols/INet/TCPSocketHandle.test.cc b/Socket/Protocols/INet/TCPSocketHandle.test.cc
index b4e8e613f..b9952c180 100644
--- a/Socket/Protocols/INet/TCPSocketHandle.test.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief TCPSocketHandle unit tests */
 
 //#include "TCPSocketHandle.test.hh"
 //#include "TCPSocketHandle.test.ih"
@@ -32,8 +33,8 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include "TCPSocketHandle.hh"
 #include <iostream>
+#include "TCPSocketHandle.hh"
 
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
diff --git a/Socket/Protocols/INet/UDPSocketHandle.test.cc b/Socket/Protocols/INet/UDPSocketHandle.test.cc
index ac4c7df84..ee75c4b7a 100644
--- a/Socket/Protocols/INet/UDPSocketHandle.test.cc
+++ b/Socket/Protocols/INet/UDPSocketHandle.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UDPSocketHandle.test unit tests */
+    \brief UDPSocketHandle unit tests */
 
 //#include "UDPSocketHandle.test.hh"
 //#include "UDPSocketHandle.test.ih"
diff --git a/Socket/Protocols/Raw/LLAddressing.test.cc b/Socket/Protocols/Raw/LLAddressing.test.cc
index 19446c10a..5f91dc1c4 100644
--- a/Socket/Protocols/Raw/LLAddressing.test.cc
+++ b/Socket/Protocols/Raw/LLAddressing.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief LLAddressing unit tests */
 
 //#include "LLAddressing.test.hh"
 //#include "LLAddressing.test.ih"
diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/Socket/Protocols/Raw/MACAddress.test.cc
index c4e36af44..87d0686b6 100644
--- a/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/Socket/Protocols/Raw/MACAddress.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief MACAddress.test unit tests */
+    \brief MACAddress unit tests */
 
 //#include "MACAddress.test.hh"
 //#include "MACAddress.test.ih"
diff --git a/Socket/Protocols/Raw/PacketSocketHandle.test.cc b/Socket/Protocols/Raw/PacketSocketHandle.test.cc
index e3ab32248..e83a93ddc 100644
--- a/Socket/Protocols/Raw/PacketSocketHandle.test.cc
+++ b/Socket/Protocols/Raw/PacketSocketHandle.test.cc
@@ -20,16 +20,16 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief PacketSocketHandle unit tests */
 
 //#include "PacketSocketHandle.test.hh"
 //#include "PacketSocketHandle.test.ih"
 
-#include "PacketSocketHandle.hh"
-
 // Custom includes
 #include <iostream>
 #include <unistd.h>
+#include "PacketSocketHandle.hh"
 
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.test.cc b/Socket/Protocols/Raw/TunTapSocketHandle.test.cc
index 4613922ab..fc0c98eb8 100644
--- a/Socket/Protocols/Raw/TunTapSocketHandle.test.cc
+++ b/Socket/Protocols/Raw/TunTapSocketHandle.test.cc
@@ -20,19 +20,20 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief TunTapSocketHandle unit tests */
 
 //#include "TunTapSocketHandle.test.hh"
 //#include "TunTapSocketHandle.test.ih"
 
-#include "TunTapSocketHandle.hh"
-#include "PacketSocketHandle.hh"
-
 // Custom includes
 #include <iostream>
 #include <unistd.h>
 #include <stdlib.h>
 
+#include "TunTapSocketHandle.hh"
+#include "PacketSocketHandle.hh"
+
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
index da7eb0ee2..2297336aa 100644
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UNDatagramSocketHandle.test unit tests */
+    \brief UNDatagramSocketHandle unit tests */
 
 //#include "UNDatagramSocketHandle.test.hh"
 //#include "UNDatagramSocketHandle.test.ih"
diff --git a/Socket/Protocols/UN/UNSocketProtocol.test.cc b/Socket/Protocols/UN/UNSocketProtocol.test.cc
index 7b3ce2924..2a7d4e4f1 100644
--- a/Socket/Protocols/UN/UNSocketProtocol.test.cc
+++ b/Socket/Protocols/UN/UNSocketProtocol.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UNSocketProtocol.test unit tests */
+    \brief UNSocketProtocol unit tests */
 
 //#include "UNSocketProtocol.test.hh"
 //#include "UNSocketProtocol.test.ih"
diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 3eb0a62d3..54963ea0c 100644
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ServerSocketHandle unit tests */
 
 //#include "ServerSocketHandle.test.hh"
 //#include "ServerSocketHandle.test.ih"
diff --git a/Socket/SocketHandle.cti b/Socket/SocketHandle.cti
index 23997a832..acdf0dc76 100644
--- a/Socket/SocketHandle.cti
+++ b/Socket/SocketHandle.cti
@@ -27,9 +27,8 @@
 #include "SocketHandle.ih"
 
 // Custom includes
-#include "../Utils/senfassert.hh"
 #include <typeinfo>
-#include <boost/lexical_cast.hpp>
+#include "../Utils/senfassert.hh"
 #include "../Utils/TypeInfo.hh"
 
 #define prefix_ inline
diff --git a/Socket/SocketHandle.hh b/Socket/SocketHandle.hh
index a119d2b4f..36cac8c4b 100644
--- a/Socket/SocketHandle.hh
+++ b/Socket/SocketHandle.hh
@@ -27,15 +27,15 @@
 #ifndef HH_SENF_Socket_SocketHandle_
 #define HH_SENF_Socket_SocketHandle_ 1
 
+//#include "SocketHandle.mpp"
+#include "SocketHandle.ih"
+
 // Custom includes
 #include <memory> // std::auto_ptr
 #include "FileHandle.hh"
 #include "SocketPolicy.hh"
 
-//#include "SocketHandle.mpp"
-#include "SocketHandle.ih"
 ///////////////////////////////hh.p////////////////////////////////////////
-#include "SocketHandle.ih"
 
 namespace senf {
 
diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index bb3835d15..0b354aec7 100644
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief SocketHandle unit tests */
 
 //#include "SocketHandle.test.hh"
 //#include "SocketHandle.test.ih"
diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index 72ba433a6..2e70df938 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -20,20 +20,21 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief SocketPolicy unit tests */
 
-//#include "SocketPolicy.test.hh"
+#include "SocketPolicy.test.hh"
 //#include "SocketPolicy.test.ih"
 
 // Custom includes
+#include <boost/mpl/assert.hpp>
+#include <boost/concept_check.hpp>
+#include <boost/utility.hpp> // enable_if
+
 #include "SocketPolicy.hh"
-#include "SocketPolicy.test.hh"
 
 #include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/concept_check.hpp>
-#include <boost/utility.hpp> // enable_if
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index a6e855b08..888f981dd 100644
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -20,15 +20,15 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief SocketProtocol unit tests */
 
-//#include "SocketProtocol.test.hh"
+#include "SocketProtocol.test.hh"
 //#include "SocketProtocol.test.ih"
 
 // Custom includes
 #include "SocketProtocol.hh"
 #include "SocketPolicy.hh"
-#include "SocketProtocol.test.hh"
 
 #include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
diff --git a/Utils/Buffer.test.cc b/Utils/Buffer.test.cc
index d796d7405..72a314c77 100644
--- a/Utils/Buffer.test.cc
+++ b/Utils/Buffer.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Buffer.test unit tests */
+    \brief Buffer unit tests */
 
 //#include "Buffer.test.hh"
 //#include "Buffer.test.ih"
diff --git a/Utils/Console/Config.test.cc b/Utils/Console/Config.test.cc
index f13457c9e..6dd7ab2fb 100644
--- a/Utils/Console/Config.test.cc
+++ b/Utils/Console/Config.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Config.test unit tests */
+    \brief Config unit tests */
 
 //#include "Config.test.hh"
 //#include "Config.test.ih"
diff --git a/Utils/Console/ConfigFile.test.cc b/Utils/Console/ConfigFile.test.cc
index 0d0a34a6b..74960a62b 100644
--- a/Utils/Console/ConfigFile.test.cc
+++ b/Utils/Console/ConfigFile.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ConfigFile.test unit tests */
+    \brief ConfigFile unit tests */
 
 //#include "ConfigFile.test.hh"
 //#include "ConfigFile.test.ih"
diff --git a/Utils/Console/Executor.test.cc b/Utils/Console/Executor.test.cc
index e2ff88a68..833aa4559 100644
--- a/Utils/Console/Executor.test.cc
+++ b/Utils/Console/Executor.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Executor.test unit tests */
+    \brief Executor unit tests */
 
 //#include "Executor.test.hh"
 //#include "Executor.test.ih"
diff --git a/Utils/Console/Node.test.cc b/Utils/Console/Node.test.cc
index 810ce2532..1b2a3c715 100644
--- a/Utils/Console/Node.test.cc
+++ b/Utils/Console/Node.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Node.test unit tests */
+    \brief Node unit tests */
 
 //#include "Node.test.hh"
 //#include "Node.test.ih"
diff --git a/Utils/Console/OverloadedCommand.test.cc b/Utils/Console/OverloadedCommand.test.cc
index 5372055c2..af27d87cd 100644
--- a/Utils/Console/OverloadedCommand.test.cc
+++ b/Utils/Console/OverloadedCommand.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief OverloadedCommand.test unit tests */
+    \brief OverloadedCommand unit tests */
 
 //#include "OverloadedCommand.test.hh"
 //#include "OverloadedCommand.test.ih"
diff --git a/Utils/Console/Parse.test.cc b/Utils/Console/Parse.test.cc
index 962e2e2b1..5d625e336 100644
--- a/Utils/Console/Parse.test.cc
+++ b/Utils/Console/Parse.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Parse.test unit tests */
+    \brief Parse unit tests */
 
 //#include "Parse.test.hh"
 //#include "Parse.test.ih"
diff --git a/Utils/Console/ParsedCommand.test.cc b/Utils/Console/ParsedCommand.test.cc
index efce1ef1f..e2413e77c 100644
--- a/Utils/Console/ParsedCommand.test.cc
+++ b/Utils/Console/ParsedCommand.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ParsedCommand.test unit tests */
+    \brief ParsedCommand unit tests */
 
 //#include "ParsedCommand.test.hh"
 //#include "ParsedCommand.test.ih"
diff --git a/Utils/Console/ProgramOptions.test.cc b/Utils/Console/ProgramOptions.test.cc
index e8f976385..5d18e9ea0 100644
--- a/Utils/Console/ProgramOptions.test.cc
+++ b/Utils/Console/ProgramOptions.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ProgramOptions.test unit tests */
+    \brief ProgramOptions unit tests */
 
 //#include "ProgramOptions.test.hh"
 //#include "ProgramOptions.test.ih"
diff --git a/Utils/Console/STLSupport.test.cc b/Utils/Console/STLSupport.test.cc
index a4e0cf386..4916987b3 100644
--- a/Utils/Console/STLSupport.test.cc
+++ b/Utils/Console/STLSupport.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief STLSupport.test unit tests */
+    \brief STLSupport unit tests */
 
 //#include "STLSupport.test.hh"
 //#include "STLSupport.test.ih"
diff --git a/Utils/Console/ScopedDirectory.test.cc b/Utils/Console/ScopedDirectory.test.cc
index 60b665e3a..f675893b0 100644
--- a/Utils/Console/ScopedDirectory.test.cc
+++ b/Utils/Console/ScopedDirectory.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief ScopedDirectory.test unit tests */
+    \brief ScopedDirectory unit tests */
 
 //#include "ScopedDirectory.test.hh"
 //#include "ScopedDirectory.test.ih"
diff --git a/Utils/Console/Server.test.cc b/Utils/Console/Server.test.cc
index 84599f0ba..e81aa3de0 100644
--- a/Utils/Console/Server.test.cc
+++ b/Utils/Console/Server.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Server.test unit tests */
+    \brief Server unit tests */
 
 //#include "Server.test.hh"
 //#include "Server.test.ih"
diff --git a/Utils/Console/Traits.test.cc b/Utils/Console/Traits.test.cc
index 17ba54534..03dc80ede 100644
--- a/Utils/Console/Traits.test.cc
+++ b/Utils/Console/Traits.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Traits.test unit tests */
+    \brief Traits unit tests */
 
 //#include "Traits.test.hh"
 //#include "Traits.test.ih"
diff --git a/Utils/Console/Variables.test.cc b/Utils/Console/Variables.test.cc
index 66b0d70d1..cff60d1b2 100644
--- a/Utils/Console/Variables.test.cc
+++ b/Utils/Console/Variables.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Variables.test unit tests */
+    \brief Variables unit tests */
 
 //#include "Variables.test.hh"
 //#include "Variables.test.ih"
diff --git a/Utils/Daemon/Daemon.test.cc b/Utils/Daemon/Daemon.test.cc
index 803198815..b62d7ba15 100644
--- a/Utils/Daemon/Daemon.test.cc
+++ b/Utils/Daemon/Daemon.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Daemon.test unit tests */
+    \brief Daemon unit tests */
 
 //#include "Daemon.test.hh"
 //#include "Daemon.test.ih"
@@ -34,11 +34,11 @@
 #include <fstream>
 #include <boost/filesystem/operations.hpp>
 #include "Daemon.hh"
-#include "../Utils/Exception.hh"
-#include "../Utils/Backtrace.hh"
-#include "../Scheduler/Scheduler.hh"
+#include "../Exception.hh"
+#include "../Backtrace.hh"
+#include "../../Scheduler/Scheduler.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include "../auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/DiscardStream.test.cc b/Utils/DiscardStream.test.cc
index 82144576f..03c62b09b 100644
--- a/Utils/DiscardStream.test.cc
+++ b/Utils/DiscardStream.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DiscardStream.test unit tests */
+    \brief DiscardStream unit tests */
 
 //#include "DiscardStream.test.hh"
 //#include "DiscardStream.test.ih"
diff --git a/Utils/Exception.test.cc b/Utils/Exception.test.cc
index 58a2f2bf2..0f0db829c 100644
--- a/Utils/Exception.test.cc
+++ b/Utils/Exception.test.cc
@@ -21,18 +21,18 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Exception.test unit tests */
+    \brief Exception unit tests */
 
 //#include "Exception.test.hh"
 //#include "Exception.test.ih"
 
 // Custom includes
 #include "Exception.hh"
+#include <boost/format.hpp>
+#include <errno.h>
 
 #include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include <boost/format.hpp>
-#include <errno.h>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
diff --git a/Utils/IpChecksum.test.cc b/Utils/IpChecksum.test.cc
index 3dada0882..ecdc127f1 100644
--- a/Utils/IpChecksum.test.cc
+++ b/Utils/IpChecksum.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IpChecksum.test unit tests */
+    \brief IpChecksum unit tests */
 
 //#include "IpChecksum.test.hh"
 //#include "IpChecksum.test.ih"
diff --git a/Utils/IteratorTraits.test.cc b/Utils/IteratorTraits.test.cc
index 4a830d6c1..50ce1d838 100644
--- a/Utils/IteratorTraits.test.cc
+++ b/Utils/IteratorTraits.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief IteratorTraits.test unit tests */
+    \brief IteratorTraits unit tests */
 
 //#include "IteratorTraits.test.hh"
 //#include "IteratorTraits.test.ih"
diff --git a/Utils/Logger/AreaRegistry.test.cc b/Utils/Logger/AreaRegistry.test.cc
index 854825112..a21dd8917 100644
--- a/Utils/Logger/AreaRegistry.test.cc
+++ b/Utils/Logger/AreaRegistry.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief AreaRegistry.test unit tests */
+    \brief AreaRegistry unit tests */
 
 //#include "AreaRegistry.test.hh"
 //#include "AreaRegistry.test.ih"
diff --git a/Utils/Logger/Config.test.cc b/Utils/Logger/Config.test.cc
index 0e7f3cdbe..cecda34ba 100644
--- a/Utils/Logger/Config.test.cc
+++ b/Utils/Logger/Config.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Config.test unit tests */
+    \brief Config unit tests */
 
 //#include "Config.test.hh"
 //#include "Config.test.ih"
diff --git a/Utils/Logger/FileTarget.test.cc b/Utils/Logger/FileTarget.test.cc
index 859469991..65e26d00c 100644
--- a/Utils/Logger/FileTarget.test.cc
+++ b/Utils/Logger/FileTarget.test.cc
@@ -32,7 +32,7 @@
 #include "FileTarget.hh"
 #include "Logger.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include "../auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/Log.test.cc b/Utils/Logger/Log.test.cc
index 0fbbfb9e3..64e6df59b 100644
--- a/Utils/Logger/Log.test.cc
+++ b/Utils/Logger/Log.test.cc
@@ -21,15 +21,16 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Log.test unit tests */
+    \brief Log unit tests */
 
 //#include "Log.test.hh"
 //#include "Log.test.ih"
 
 // Custom includes
+#include "main.test.hh"
+
 #include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include "main.test.hh"
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
diff --git a/Utils/Logger/Parameters.test.cc b/Utils/Logger/Parameters.test.cc
index 4479744fe..0d4dbf980 100644
--- a/Utils/Logger/Parameters.test.cc
+++ b/Utils/Logger/Parameters.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Parameters.test unit tests */
+    \brief Parameters unit tests */
 
 //#include "Parameters.test.hh"
 //#include "Parameters.test.ih"
diff --git a/Utils/Logger/StreamRegistry.test.cc b/Utils/Logger/StreamRegistry.test.cc
index 654ac6674..a5bd138a0 100644
--- a/Utils/Logger/StreamRegistry.test.cc
+++ b/Utils/Logger/StreamRegistry.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief StreamRegistry.test unit tests */
+    \brief StreamRegistry unit tests */
 
 //#include "StreamRegistry.test.hh"
 //#include "StreamRegistry.test.ih"
diff --git a/Utils/Logger/SyslogTarget.test.cc b/Utils/Logger/SyslogTarget.test.cc
index d0f2547a9..82d89dc97 100644
--- a/Utils/Logger/SyslogTarget.test.cc
+++ b/Utils/Logger/SyslogTarget.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SyslogTarget.test unit tests */
+    \brief SyslogTarget unit tests */
 
 //#include "SyslogTarget.test.hh"
 //#include "SyslogTarget.test.ih"
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Logger.hh"
 
-#include "../Utils/auto_unit_test.hh"
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/SyslogUDPTarget.test.cc b/Utils/Logger/SyslogUDPTarget.test.cc
index 9dfeeb1ae..eff65c198 100644
--- a/Utils/Logger/SyslogUDPTarget.test.cc
+++ b/Utils/Logger/SyslogUDPTarget.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief SyslogUDPTarget.test unit tests */
+    \brief SyslogUDPTarget unit tests */
 
 //#include "SyslogUDPTarget.test.hh"
 //#include "SyslogUDPTarget.test.ih"
diff --git a/Utils/Logger/Target.test.cc b/Utils/Logger/Target.test.cc
index 090af84c8..a4f5cf369 100644
--- a/Utils/Logger/Target.test.cc
+++ b/Utils/Logger/Target.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Target.test unit tests */
+    \brief Target unit tests */
 
 //#include "Target.test.hh"
 //#include "Target.test.ih"
diff --git a/Utils/String.test.cc b/Utils/String.test.cc
index 7d0bf0b6f..1f6a17ce0 100644
--- a/Utils/String.test.cc
+++ b/Utils/String.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief String.test unit tests */
+    \brief String unit tests */
 
 //#include "String.test.hh"
 //#include "String.test.ih"
diff --git a/Utils/Tags.test.cc b/Utils/Tags.test.cc
index e0e554564..445c7ec44 100644
--- a/Utils/Tags.test.cc
+++ b/Utils/Tags.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Tags.test unit tests */
+    \brief Tags unit tests */
 
 //#include "Tags.test.hh"
 //#include "Tags.test.ih"
diff --git a/Utils/Termlib/Telnet.test.cc b/Utils/Termlib/Telnet.test.cc
index 3a807cedf..2d14d0c45 100644
--- a/Utils/Termlib/Telnet.test.cc
+++ b/Utils/Termlib/Telnet.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Telnet.test unit tests */
+    \brief Telnet unit tests */
 
 //#include "Telnet.test.hh"
 //#include "Telnet.test.ih"
diff --git a/Utils/Termlib/Terminfo.test.cc b/Utils/Termlib/Terminfo.test.cc
index 37b7c2cdc..f382898f2 100644
--- a/Utils/Termlib/Terminfo.test.cc
+++ b/Utils/Termlib/Terminfo.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief Terminfo.test unit tests */
+    \brief Terminfo unit tests */
 
 //#include "Terminfo.test.hh"
 //#include "Terminfo.test.ih"
diff --git a/Utils/TypeIdValue.test.cc b/Utils/TypeIdValue.test.cc
index 678ace39d..022041ad4 100644
--- a/Utils/TypeIdValue.test.cc
+++ b/Utils/TypeIdValue.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TypeIdValue.test unit tests */
+    \brief TypeIdValue unit tests */
 
 //#include "TypeIdValue.test.hh"
 //#include "TypeIdValue.test.ih"
diff --git a/Utils/TypeInfo.test.cc b/Utils/TypeInfo.test.cc
index b7a15dab1..f77c530bf 100644
--- a/Utils/TypeInfo.test.cc
+++ b/Utils/TypeInfo.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief TypeInfo unit tests */
 
 //#include "TypeInfo.test.hh"
 //#include "TypeInfo.test.ih"
diff --git a/Utils/hexdump.test.cc b/Utils/hexdump.test.cc
index 8a17a4039..028c73b19 100644
--- a/Utils/hexdump.test.cc
+++ b/Utils/hexdump.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief hexdump.test unit tests */
+    \brief hexdump unit tests */
 
 //#include "hexdump.test.hh"
 //#include "hexdump.test.ih"
diff --git a/Utils/intrusive_refcount.test.cc b/Utils/intrusive_refcount.test.cc
index 212073b76..a947f1d31 100644
--- a/Utils/intrusive_refcount.test.cc
+++ b/Utils/intrusive_refcount.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief intrusive_refcount unit tests */
 
 //#include "intrusive_refcount.test.hh"
 //#include "intrusive_refcount.test.ih"
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc
index 6b3bec8f3..d3517cd99 100644
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief membind unit tests */
 
 //#include "membind.test.hh"
 //#include "membind.test.ih"
@@ -28,7 +29,7 @@
 // Custom includes
 #include <sstream>
 #include <string>
-#include "../Utils/membind.hh"
+#include "membind.hh"
 
 #include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
diff --git a/Utils/mpl.test.cc b/Utils/mpl.test.cc
index 41a33233b..25d6f0cd9 100644
--- a/Utils/mpl.test.cc
+++ b/Utils/mpl.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief mpl.test unit tests */
+    \brief mpl unit tests */
 
 //#include "mpl.test.hh"
 //#include "mpl.test.ih"
diff --git a/Utils/parameter.test.cc b/Utils/parameter.test.cc
index 1f2f0ac9b..e09c615e6 100644
--- a/Utils/parameter.test.cc
+++ b/Utils/parameter.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief parameter.test unit tests */
+    \brief parameter unit tests */
 
 //#include "parameter.test.hh"
 //#include "parameter.test.ih"
diff --git a/Utils/pool_alloc_mixin.test.cc b/Utils/pool_alloc_mixin.test.cc
index 60957cf56..a5ab332e8 100644
--- a/Utils/pool_alloc_mixin.test.cc
+++ b/Utils/pool_alloc_mixin.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief pool_alloc_mixin.test unit tests */
+    \brief pool_alloc_mixin unit tests */
 
 //#include "pool_alloc_mixin.test.hh"
 //#include "pool_alloc_mixin.test.ih"
diff --git a/Utils/preprocessor.test.cc b/Utils/preprocessor.test.cc
index 11b61f834..f127d8272 100644
--- a/Utils/preprocessor.test.cc
+++ b/Utils/preprocessor.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief preprocessor.test unit tests */
+    \brief preprocessor unit tests */
 
 //#include "preprocessor.test.hh"
 //#include "preprocessor.test.ih"
diff --git a/Utils/safe_bool.test.cc b/Utils/safe_bool.test.cc
index 45d297079..75dd10060 100644
--- a/Utils/safe_bool.test.cc
+++ b/Utils/safe_bool.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief safe_bool.test unit tests */
+    \brief safe_bool unit tests */
 
 //#include "safe_bool.test.hh"
 //#include "safe_bool.test.ih"
diff --git a/Utils/singleton.test.cc b/Utils/singleton.test.cc
index 781d4340c..348605a53 100644
--- a/Utils/singleton.test.cc
+++ b/Utils/singleton.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief singleton.test unit tests */
+    \brief singleton unit tests */
 
 //#include "singleton.test.hh"
 //#include "singleton.test.ih"
diff --git a/Utils/type_traits.test.cc b/Utils/type_traits.test.cc
index 34e3c5a94..fc3d8286d 100644
--- a/Utils/type_traits.test.cc
+++ b/Utils/type_traits.test.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief type_traits.test unit tests */
+    \brief type_traits unit tests */
 
 //#include "type_traits.test.hh"
 //#include "type_traits.test.ih"
-- 
GitLab