diff --git a/PPI/ActiveFeeder.test.cc b/PPI/ActiveFeeder.test.cc
index 8fade6ade9c61fc7c053bc153fac334013b702d5..f54e426b8cf9c7c666f4668e02f63260164d150c 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 ca0c0ab760efd7df752f90b49188505e3e123b9d..778786457e11fc561822f1fbdbbdfdb70e32790b 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 105ad0df2ae0855f7bcdc1b8169ba9081d9a7f73..d2f459c1d08571a4d31c947917207864ae603d9a 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 a793d261d9052a1059be665b01b5eb1e238f3de1..20b7e3e405b21d715d3b8197b35e06fc44c188f9 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 840d52b791a5b7ff0b2258c5a62216c81359faba..e721ca943f0e02a2a78b7949577ab6614f05c27b 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 854d7fd3f1562f785bc7ac4fcb22220eb4eb6e90..fa198bd07e457447654f8e46b78894255fcdbd69 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 c6e1907edd77c3bed2e9bc04363ad636481f61f4..b57c6db18697ed0bca17b5b6bc13b893f4630e0a 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 4cfd740e7528c6dd8fdc8eedb9a9912a990e6fd0..40f40d9c632939664192d26806b41ea96bf5bef3 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 ee1c5848b7fa075a125a36b454cbba24b4456f28..ed750a976d703e4cc2f7bfcc1534045a9fd24362 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 6d0c30ea55e8f0401610ad2e744f541ec79a7b82..c80448a6086dca434828dac0bcf549623309ce47 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 32ee26682619ad3c6175d3239656a3e555aef067..226f281027a7c13797d23a4b1c3d1537a843a8db 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 f9eafd0f2d450033b3e8fbcf1e611ba89ae5a6c5..c5f235214436dad1e346f71bbcdef36f8907ab86 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 e7e9882ab7d9f3797e9b7080a65453097c27f7b0..b32cc31fa5da84a4739cf81d65ac466b8c64b303 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 c0fca8e5af085bfae434193ff4d15c1375b1e5b7..7e14488bf193d6e785977473feea0899bdb46f11 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 cca1208a73bfbe294a4c546a1c62b9ace66b1270..ca678443d48da2073151d34f9fd63d3bdb791421 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 59b0b6b9b13eb11426ec46012e4744e02c86821c..c6f1373116195fa8be1943374a8c0714501160f0 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 9fd3ee7b5e02b5e6786a5fa4f1fedd28bf0e10ec..c86cd8447d51cc814be8169f83c7e00e4d40e9ad 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 2b8600708ba360fab9105dab64abbc6883d8b9f0..172db85b5780c483d016ce9ac823ae084cb6de74 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 9f3e63a7982fdce0773ca4e9b095a0fc30ea7922..5f18e15de4a4f253755710e4d51eb16d248f1729 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 efa3f12adf584a1592fc4d4938056cf853ec65bc..24892bf8f7ba8270e02d4128d43f59931d5ff792 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 e6a4fb703ac3e8d5a776563f972cd3b57d4a4023..6a2477a0a552242be77c0acfc6f88647f4e116dd 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 fa2f0625623ad389bb147e3e93178329937e09d4..3cd3651cba0ef270de3e09d863379aa0f84e42e9 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 a1f37118fe6e94e06a268b570f82344100029dd7..f922db89baee98482d1cc7c1ce0d4331aac81c86 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 efcdbaea884bdc0da4c3acbce0eafb0f3601d608..4c7abef3bad7ddd2b18b796596054a16a4a9f34d 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 33ee3fae8feb9475728ff5faa61b77734a41e51c..3a0cb0bd18686d7de1aca416dfc72ed69fab109f 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 e91cdc8f082bd0923fff1d6719807647ba73af01..f1f943706b625c5acc39403740b1b5620ed57ef6 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 4fcbdbc3d726780ace82a06e6014505646451815..3b021ee33a120d966278c0d48fba14e0b815bb18 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 2ba18648f94927ed990db16d119632f24ee6da2e..8dc8df2c7b86af83115639d38544ec82f36e2005 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 2ae6a112175c759470eab8f7d4449743c42b59f9..fe5c517ccafcd4b31937528bce71b26bedaf619e 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 af26822c61780e913c049e79c2d50c6390ac972f..ff7aaa2b966868a3ee5f96fe142caf80ef803a03 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 29f85cce7364d7854a0a3d3c6c31368df9e02567..f3dca00835558172349035d5bfeee65c22fa0f4b 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 7ddbe861aa16d9f7921efacd8ce20314519b81ab..a93e631511f0f0241785ff059ec8a6edd5dea6f9 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 a82a73a54d482e16e9b055a68a54c17c39b6970c..31c3fe858633de523dbb02143eff37bad764fc58 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 ca4fc8f65a2a22ed6574b656027e6b5c8361bd47..a0f9083e2786b13c271f6181cecd7d632b0a29fa 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 e3e51a68c0a9fceaf27711086a77e36758929000..37890c907823cf5dae567cd071639c6c28c29589 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 58dd16ce4be5b3bd6c76e5f6e7aacbbca33e2c0d..04ee7aacdf17278cfaf553489f1eed550c1a6235 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 18722a379da18809809ca7a81ecad94aab5d67d8..cec4ec1fde10bba0a417460b04a8a16e5973183d 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 e84cd9d3b13d8beed222c24424ff258d1de3de4d..d5bc38083733696fdfb8d0aed918cfa3d9623ef5 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 2ef9ff255c5c5f07cb4409a0e129e1d564780900..1cf05ab0e828c7ec4ac4101a3d427417005197a2 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 585f1761fe0319be9d8d2e8187406dfbd48e1d04..d1fc12507f5c57f6c54b1a35f64f4c9d06e91e5b 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 412c35b5ceec72159f5b837b518f7eacb46f17a6..4d356f1e16e9dd44a76b6962749d1c280969cbfd 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 438f5c4abcb3067c1282ff3708a9cd5b41dc11f2..8f82c669b7aa0e19717e1a4e8b25780929c2adc7 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 7e03d144ad944ace1122bdd124ccd84188a0034e..c8edbc37bc41c636b334062cae2981188e6c608a 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 c27c7d4f4510ec3ecfe9b58741c973a726072be9..c3481fa876bdaa887db10aa9080b1f06eb959ced 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 6d8969a3e02033d64cc5a96d05b539762088f58d..66bca28bbb6fb7e65a1796dadf36e153877cceef 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 caa2b02e2a89b9b0e827521d1b88de381f1ed459..50b2377ec974f8005f0b2f4738bd945f6acfe338 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 521dfcba3966d0d5bace85e4db871111fe74256f..18b8fe9ed174a8ee2b3453fe00b93299ca011622 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 3cd5d91e2336cbf8824e9b75ad6ad65959569fef..76806f627bb8b8ac61e4404e39f7410d085d50de 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 fe31d95260238d3509750b09d75e734ad51d658a..649bd0f926747f50a6ec862d17130c27f9332824 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 679940aba9617bee7883a7ec75285bea1d05855e..8e8d8c29b94ac32ff8faa94cee0a924737877b3d 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 7adc52a481775454c8e63f8a3a02c9c9f896946b..0a120b9f8870bbd37e982477a20f08c684b11efa 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 852182711c072f35564dddaede04fc6380db7443..a30c8fbc0c36b4e578eb1076cae00e75d7c04657 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 e4aa5bd094dc20854d3404a5d77c4b8140f7ac76..b5a5f222c0118f45c652c0d468dc561908cdc9d9 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 32916bb0fb2916e1f46e3966168221dafef98145..171f834e4ae3acb3fcb5cd896c9c70334f25d4ba 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 1bf32545addd661e3449c3a6ce8f7963b437da25..364349e63aa199c7883debf0f6c34c19a98b4f3c 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 f720df05a938b07dfd5772b3754cd88756774c28..aa554b2e5328627f0d9599deade08deefb705d80 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 a67761cc69419fd623c67cc8385dda81e596cd7c..21b9288f9e38825af5cad83a8bf16c6218e65af8 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 18e2cabcd7139e1adc653254c728da7b69d8c21f..0c63ca1e9aa97652344d30e6b0354054faa982bf 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 21f3addd791ba7e5fc253828948c624b54678323..865c45a4dc7c2c7774abd85449bfc8fc48bf2057 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 35cb2700036b3ec795443999a2aca99049bd1c2a..e40290c9eaa1ab72d9b760f67d48d7f7b7531549 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 f328d32ea255db648c59d25d0c5fd4a8d33154b4..0a135182e2abfe34b4d070d822365eab52d4c629 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 62376a1daf27797c51cedc22ece8d149d3c1b564..d42f7204b90af812d86f483324d76fa4552584f9 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 e4f2b9805ca21146c7a1e1b93b1382352a21e7a6..e7b61412726d54161b010e6e1b75c8736f07ab90 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 0d6e994f7d6b7172f9779d1e12acd6e311532266..7ffbc6b9e926b54bba2cfd0a4ca7f3ff094bcff4 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 8e68d9a75c6516043b8b3ca0e2d7a70e625f446a..60ba3ba60eab29eee968cede0ff5cac933db3532 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 a55102ea66bf90dc006c255295888198fe6c83ef..8b3725016dcb72401129c8db54d32ba89d6e8003 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 861f2997a83dd26c7f0c7653e36562198b83c7c0..131474219ccce00439af2b75c3fbc69003945c4d 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 5ebde9a7b25591f7efe902e878a44a1751608a53..9a3913ff6df537e75844b8c7d1826cd9842b25d8 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 0f7ef79109fc4dc858f0b812a7d056fb2df37432..f793efa919fd8710aeb057547ebda4e28cc2fd82 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 774b945b50b11debd379166204f77282eca1cbaa..cb53808b298a21dd99c91aea930f309a50f04e3a 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 491cf49449af9d25fadb9e02775398eca5122372..bb63f70cb7531f8ef65cd9e6b738428b3e269250 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 c83701867c42c9cc3ed649cee8c75966faf850dc..3c75262084350eab7155d2fd746ecef40ebd9a58 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 50bf3506db7bfb2705f285e4eb7423191fdf6bdc..f56ce6ed598bdd3b7a7dfd5b645e24f81b4c7a87 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 a6f2dbdce8fa3e733a9cbfddabeaeedd3b120faa..0dd2d952a188eb0b6f81b4579e2b93d5753b6d28 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 2212645f77ce5edcc9cc4f799df850eaa7bf145f..8493c8646a6b693a13acb3d717e4afb1921a5518 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 d8949e3861617573f16efffb95f2cdcaa0014cbc..1ea5cd83e57576ab2a278b56a927559c1d102080 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 b4e8e613f11a8c06ab9d3c9edb830e708b4f538e..b9952c180828c85d0919e5313fb4f30f14d52b8f 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 ac4c7df846912ca60db7c5e18e5263cab4dc0cc2..ee75c4b7aa2d15ab205a1eb8d796135eca0a0afd 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 19446c10a4be45d7a815554f0b0a7bc25bd9334e..5f91dc1c403d3b2f6fe22b343bd6b5133b9a9bb8 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 c4e36af44ba6bcdf0e52532476acc4e0db1a3b96..87d0686b6786c74fa114045a3e45680760fcec85 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 e3ab32248f962fe32c29e85476e13a3d196c13e0..e83a93ddc136a1500c889301dc987b5c664cba8f 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 4613922ab40dd0c4e2c27516aef812e377108c69..fc0c98eb8ce12e55b108071b4717a7fed91025cf 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 da7eb0ee2ecc2cb0fe0ebcd00650aec592a0c6e7..2297336aa325d74a37e56067cf6300ce8d924c26 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 7b3ce2924942c4fd0c263cbd58022fd79c33788d..2a7d4e4f1149966972b7f00fa17c9ed1cd4503bb 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 3eb0a62d38b89ee595b32cdc075bbd7b0f1f52b5..54963ea0c457e75daf9771f4583ec88090823864 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 23997a832e88116d89788e6ceb51a65e232c6f32..acdf0dc76d0d13b95142e1d7d758b55fe1e90fc9 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 a119d2b4fef38dc5aec5d309b4fc3a8c76016d2f..36cac8c4badc008341cb01bdd9e3a64bbd3bb575 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 bb3835d15b4b5b71b31b664bc1c42411546d7f3f..0b354aec70139e083fdad0a356aad74a7ec5faaa 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 72ba433a6d65a7a574edaf99147d7596d6f6ebac..2e70df938868e37106d288f43778456695f10c5c 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 a6e855b08836b6076568118a3e84f1648e4f18db..888f981dd4c85d7bb1b4ce3208fa2a8b23dafa0e 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 d796d7405927f4fc0bc20d505bf9efdbbadb82a5..72a314c77b126edd4b81b02ffd68e0e153f6617e 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 f13457c9edf83974232ab668db4d58e275a59f84..6dd7ab2fb68bff657effd16c2fe86d62a706c63d 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 0d0a34a6bfc17169fa75900fe3061f7b8ab1ca83..74960a62b1e1597e4634f05eca524c1691a077b9 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 e2ff88a68b3b834d6791045972a862b1095524a3..833aa4559af89bc26fe6054a37a9aafa6d2a7981 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 810ce2532ef104ad9095600e281af00159908171..1b2a3c715df1efec87442bc997e1cbb8201ef3dd 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 5372055c2913bf616b1d9f225484c49ccf2aec91..af27d87cddf6e04f13fe770b053df53484ed4406 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 962e2e2b156f4e8820d4c20a878fc958dca0b210..5d625e336558f340ac2fc3d747d1e0eb83cfb5b6 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 efce1ef1fa31ccef451bae02bb70b0f0c8865890..e2413e77cbb2bd99559f8e28b2c18d382ea842f4 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 e8f976385bdcfa25552885f8bec963f570c40baf..5d18e9ea01d94c780e0f0560dd94c9af4ac7b6f4 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 a4e0cf386b72b44a2997af535faabc9c7a5e1993..4916987b3fd3055e7c4ad1e545f214952f484a8c 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 60b665e3a359cbb7b75ffb89a076a6bbb7dbec47..f675893b0167786f8cd0327f6e59b9fbe322a4ac 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 84599f0ba882a2367bd835a2b11d2cedb2268948..e81aa3de0debb3c321b6f91ef004f0124e060f37 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 17ba545340ea47f03ca9eca983c25b900c81ab44..03dc80ede1f39f6871944e3b3722f20587b1b568 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 66b0d70d127850a3a6293707ad87061b9f9b7ca0..cff60d1b2b87944a3678605e0a2b3db1a9f22b26 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 8031988152ff10e61db09221d1b486a7a3d08938..b62d7ba15bfacd06f284c451d8f96ac8b43842ca 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 82144576fd36762e32118b08f76f2171322f91f2..03c62b09b9ee448c5afd08877cc8eb217faa052c 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 58a2f2bf2fc2e5e1e9a7fd9a683111863fbde92a..0f0db829c1022ef40ac81b52cbd2e8751a970cbe 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 3dada0882bcd56a985259b8f0d08c5141876c005..ecdc127f126bb740cdfce8c8aa928932a8f820cf 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 4a830d6c1a5447f1f1b368e8ee0f53f1348b6984..50ce1d83823072e45c80027299080e5d419df8e2 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 854825112550a5e200f815ce6776239f3b6c56dc..a21dd8917ab48f95682ea8301a227950f5ce03de 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 0e7f3cdbe3e9438013b2440534d540db9faa4fcc..cecda34ba7ac7e6d581786e557167f6e0325fd18 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 85946999168a6fc5ad891435e3d633fc50b894e5..65e26d00c888835cfa2acaf8f0a213f540561b95 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 0fbbfb9e387db0a7c78494b22e49a1b704b96d21..64e6df59b3250e988f5b6af12cbba9c542ad509f 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 4479744fe441e70ad8f2a0bfedcd7cf431919d05..0d4dbf9806ec74f00d40a9e47745ada9e2dbf17f 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 654ac667452eddf9dafe646ab04633b1be25b0ed..a5bd138a015b106ad441c8eef517b37fdec16589 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 d0f2547a9235e4732b957deb8781e76f29919430..82d89dc975928b44921402892d488fbaec2c1899 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 9dfeeb1ae31afe3eb5b954043d3776fa0af92ecd..eff65c19833de3eb9c37a7de9c3f7ff33cf222d9 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 090af84c8e59dcff6957a1c455d2be97a84d9167..a4f5cf36996a400e352d55e3f6655a13a903cfb9 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 7d0bf0b6fa65532364a81f0b79a81b333c4409e2..1f6a17ce072a0bcd3d822d9be42f5b7c6e58203e 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 e0e5545642060c153b19afccff5f2d41f98b26ce..445c7ec44eb980b3b8f7835ecedc7e508be433b0 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 3a807cedfb30fb0ee032f6bfaa6f30f8d18003b1..2d14d0c45a27a7823f7fe65047796af23b00e920 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 37b7c2cdc9ef4023706223aa477aaf7550f2d652..f382898f22fdf919c26a5baacbdb62f4e83defcf 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 678ace39d06964bd84953b1184bc11aca950d19b..022041ad497495a8d2ddd37f6179fca610be9a72 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 b7a15dab1b250c516a4b0538f35bbf92cb56b118..f77c530bfbebf3de1deca693ce3eb7b675bb6342 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 8a17a4039a06fbca7179ab6134f0226b3b7bbf08..028c73b1936591a95b0b9af86b80471d18d7bd0e 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 212073b76fd09d4e5100622f2e7790b911f26fb5..a947f1d31cd9c4d92f4b9076d63140789b5910e0 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 6b3bec8f3a0ee690fdfd53e1870eed92748221fa..d3517cd99f1f5c495fc5c781ba7c37d04112f166 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 41a33233bf1ee12eda640a5fc5b0927a77d860d5..25d6f0cd9a287543d31524d307dd55337803c08f 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 1f2f0ac9bd779b8d80d1afa6c4bb19e818cac3f8..e09c615e6859d4e6fdc987d876252c743b7b233c 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 60957cf56b1c00f3fe967d836218dd24781b6cff..a5ab332e89a08cf6e9d077e890df03a1625a14c2 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 11b61f834a1816f4b8f12969cbca51837d04e788..f127d82725020acf6e7ad017af928f6909a2d42c 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 45d297079d190e033081f91c9d7a1f87d37d89a5..75dd100602a8474b394376cc79b33889dfaf3c46 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 781d4340ca2acfa633b8d40f32241e7dceace5f0..348605a5368b4a316ec1a040491e2604475b659a 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 34e3c5a9452af4516996dedbb5ce51fc3ad59a6a..fc3d8286de3d969c1cabccb9d9d939561b51ad5d 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"