diff --git a/PPI/ActiveFeeder.test.cc b/PPI/ActiveFeeder.test.cc
index ac413c02ea224aa6a52ce921de514444ad9a866e..efe99d71b614ce7e03817353760c28346e26ce79 100644
--- a/PPI/ActiveFeeder.test.cc
+++ b/PPI/ActiveFeeder.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/CloneSource.test.cc b/PPI/CloneSource.test.cc
index 544461ede8e7a98be721e7203999a1cca4e3a679..1b47375dec75aaca0d186779393afc657d743724 100644
--- a/PPI/CloneSource.test.cc
+++ b/PPI/CloneSource.test.cc
@@ -32,7 +32,7 @@
 #include "Setup.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Connectors.test.cc b/PPI/Connectors.test.cc
index 9277a34e9c952a770f32b0a01e82f6bc2f2ac84c..25d7b19cba3d179daec108e5bbbc7a2ad4a6ebb9 100644
--- a/PPI/Connectors.test.cc
+++ b/PPI/Connectors.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/DebugEvent.test.cc b/PPI/DebugEvent.test.cc
index 5eed5d9530f0dd7b7d9534dad09da1650d86f00f..b9b9444b64597f359802091d9a274ff8a7588032 100644
--- a/PPI/DebugEvent.test.cc
+++ b/PPI/DebugEvent.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "DebugEvent.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/DebugModules.test.cc b/PPI/DebugModules.test.cc
index a5e518389122fb4d8b7b6ec7f0ef4de0ed0ed871..646b8071b2844131b6b77ed6061abc46242a6eaa 100644
--- a/PPI/DebugModules.test.cc
+++ b/PPI/DebugModules.test.cc
@@ -37,7 +37,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/DiscardSink.test.cc b/PPI/DiscardSink.test.cc
index 9e7bb3f6d6ff8fbf539518f599bfafe6c4ac410d..7135a0bf213fefb8ebbbd59596632b3897f2da6c 100644
--- a/PPI/DiscardSink.test.cc
+++ b/PPI/DiscardSink.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/EventManager.test.cc b/PPI/EventManager.test.cc
index 5a4b771d38af863a8299734cc6018a8a12453b2d..ae34cf4c030409c206389299a33f627b04d1aa8f 100644
--- a/PPI/EventManager.test.cc
+++ b/PPI/EventManager.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "EventManager.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Events.test.cc b/PPI/Events.test.cc
index 1c687cd196960f3905713e450f5c2e64a2fa1907..23bf7465ca53e4d3ba0e6afe4a484eca35e4e7a2 100644
--- a/PPI/Events.test.cc
+++ b/PPI/Events.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Events.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/IOEvent.test.cc b/PPI/IOEvent.test.cc
index 5c010fcc955dd0593b3cab1b32937484943893ce..884c4806044713bdf88de1a0775b95c3df45cc00 100644
--- a/PPI/IOEvent.test.cc
+++ b/PPI/IOEvent.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "IOEvent.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/IdleEvent.test.cc b/PPI/IdleEvent.test.cc
index bd9688ac7cedb7b950eadc9f0923eb6ac0906dd6..2d6649438c61f2a5b8bb644ebfe29fd57e9f4f8e 100644
--- a/PPI/IdleEvent.test.cc
+++ b/PPI/IdleEvent.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "IdleEvent.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/IntervalTimer.test.cc b/PPI/IntervalTimer.test.cc
index 9b49d27314f220f1707f0d5b6311bc70d28e4792..f2e92e6a9a67af5c4d2b365dbe2bdd315efe208e 100644
--- a/PPI/IntervalTimer.test.cc
+++ b/PPI/IntervalTimer.test.cc
@@ -31,7 +31,7 @@
 #include "Module.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Joins.test.cc b/PPI/Joins.test.cc
index fbe9e05bb88a13f724396c3a52777265c7e9e5e8..635e222bc532cfb4e3d3d3ef9afbc451fcfe1c14 100644
--- a/PPI/Joins.test.cc
+++ b/PPI/Joins.test.cc
@@ -32,7 +32,7 @@
 #include "Setup.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Module.test.cc b/PPI/Module.test.cc
index 47795da47aca1889750aaa482128e41dad84a88c..2cf6334d239add643107f94f3edc912403fb7c5a 100644
--- a/PPI/Module.test.cc
+++ b/PPI/Module.test.cc
@@ -30,7 +30,7 @@
 #include "Setup.hh"
 #include "Module.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/type_traits.hpp>
 
diff --git a/PPI/ModuleManager.test.cc b/PPI/ModuleManager.test.cc
index 0693b0cabef27d558229be460d60b0e3e8546df9..ec8ac9070d8276225abd03226057063005570a26 100644
--- a/PPI/ModuleManager.test.cc
+++ b/PPI/ModuleManager.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "ModuleManager.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/PassiveQueue.test.cc b/PPI/PassiveQueue.test.cc
index d1b255067ec5eda628112e182da3e3b2f3a5d56f..2fe3b9c14f42a49d48b7012d1b783374d7208ade 100644
--- a/PPI/PassiveQueue.test.cc
+++ b/PPI/PassiveQueue.test.cc
@@ -32,7 +32,7 @@
 #include "Setup.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Queueing.test.cc b/PPI/Queueing.test.cc
index 7e05f4e60f880ddb9e12ce1426141ade4115f9a4..1b9c960e29a7c04034a317b39488a5bb62234a2d 100644
--- a/PPI/Queueing.test.cc
+++ b/PPI/Queueing.test.cc
@@ -34,7 +34,7 @@
 #include "../Packets/Packets.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Route.test.cc b/PPI/Route.test.cc
index 08e5125758e1377e07e2c614596240d03ca98be8..3b6f12cc70abf892f18e972458aa9f567c77fc2a 100644
--- a/PPI/Route.test.cc
+++ b/PPI/Route.test.cc
@@ -33,7 +33,7 @@
 #include "Module.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/Setup.test.cc b/PPI/Setup.test.cc
index 7f0359a4b7a13303e4472d473d2bdafb865cd149..08155999e3959c0db1b767513d30a9c259710aa4 100644
--- a/PPI/Setup.test.cc
+++ b/PPI/Setup.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/SocketSink.test.cc b/PPI/SocketSink.test.cc
index d8c637c12fcc37ccfdd9ea2a9a1d1247ed16aa64..42e84c51620405ed0ff4b8f730253375c1be1f88 100644
--- a/PPI/SocketSink.test.cc
+++ b/PPI/SocketSink.test.cc
@@ -34,7 +34,7 @@
 #include "SocketSink.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/SocketSource.test.cc b/PPI/SocketSource.test.cc
index 21406260d37658c43bf53c6cdc76128e8f45a568..47cc426fe91ac0a8b927adfda09b6faf6dcf136e 100644
--- a/PPI/SocketSource.test.cc
+++ b/PPI/SocketSource.test.cc
@@ -34,7 +34,7 @@
 #include "DebugModules.hh"
 #include "Setup.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/ThrottleBarrier.test.cc b/PPI/ThrottleBarrier.test.cc
index 75ac4c3aca019b7954128f6bf6ca81bb92d2f2fa..7029463a171ae85ae299f0285a9ac38a5989c42e 100644
--- a/PPI/ThrottleBarrier.test.cc
+++ b/PPI/ThrottleBarrier.test.cc
@@ -31,7 +31,7 @@
 #include "DebugModules.hh"
 #include "../Packets/Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/PPI/main.test.cc b/PPI/main.test.cc
index 91e601da22f5802d9132796553153d6b355e2ced..1d6a963c892ed141b31195b7ac6753802cc59037 100644
--- a/PPI/main.test.cc
+++ b/PPI/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index 397f6f5f1ad9942231aeb5a6ff82e11108306cf0..06e2acbde60e3fa14a423ebad8197f1d681ffbee 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -29,7 +29,7 @@
 #include "EthernetPacket.hh"
 #include "IpV4Packet.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV4Packet.test.cc b/Packets/DefaultBundle/IpV4Packet.test.cc
index eee06a11a8ac1ab8f56de7e647607d1c52050bc1..68fc7b09c892cdb59a544a41432763a944d66302 100644
--- a/Packets/DefaultBundle/IpV4Packet.test.cc
+++ b/Packets/DefaultBundle/IpV4Packet.test.cc
@@ -29,7 +29,7 @@
 #include "IpV4Packet.hh"
 #include "UDPPacket.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV6Extensions.test.cc b/Packets/DefaultBundle/IpV6Extensions.test.cc
index bf79564bd0f7bb46d6be2d6290e6cda8f60048ad..f74e893a62a59928ba9e55a33af5ddcf1e85c36c 100644
--- a/Packets/DefaultBundle/IpV6Extensions.test.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.test.cc
@@ -30,7 +30,7 @@
 #include "UDPPacket.hh"
 #include "../../Socket/Protocols/INet/INetAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/IpV6Packet.test.cc b/Packets/DefaultBundle/IpV6Packet.test.cc
index d19e0500c89eb29a333cf427e496e1a1e15176cf..8838cc53d2fbb6ac33daef56df5bcb5f841511b0 100644
--- a/Packets/DefaultBundle/IpV6Packet.test.cc
+++ b/Packets/DefaultBundle/IpV6Packet.test.cc
@@ -29,7 +29,7 @@
 #include "../../Socket/Protocols/INet/INetAddressing.hh"
 #include "../../Packets/DataPacket.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/UDPPacket.test.cc b/Packets/DefaultBundle/UDPPacket.test.cc
index d9d84c300b69997e83700cb4fb647af6633899d9..744c439d306aabb9d9e2681c28d4b8cbe4b1e856 100644
--- a/Packets/DefaultBundle/UDPPacket.test.cc
+++ b/Packets/DefaultBundle/UDPPacket.test.cc
@@ -29,7 +29,7 @@
 #include "UDPPacket.hh"
 #include "IpV4Packet.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/DefaultBundle/main.test.cc b/Packets/DefaultBundle/main.test.cc
index 7607fdcbc6d6b2c665ad27a47e24f3c03d492903..62f13a9c05deb69cd9d104e9520612e85e6748fd 100644
--- a/Packets/DefaultBundle/main.test.cc
+++ b/Packets/DefaultBundle/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/TLVPacket.test.cc b/Packets/MPEGDVBBundle/TLVPacket.test.cc
index eee6c809d58f293e1246ac505f45896aa8c7bda5..0e3889d5a52bfca740554f0215beac8fb4f52435 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TLVPacket.test.cc
@@ -29,7 +29,7 @@
 #include "TLVPacket.hh"
 #include <senf/Packets.hh>
 
-#include <boost/test/auto_unit_test.hpp>
+#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 e2e09effff82c5e8d82b2abf1e3bd8cfb545f250..6c4e5d2ae65dcfc85fdb42ff4de2a7169a0b1528 100644
--- a/Packets/MPEGDVBBundle/TransportPacket.test.cc
+++ b/Packets/MPEGDVBBundle/TransportPacket.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "TransportPacket.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/MPEGDVBBundle/main.test.cc b/Packets/MPEGDVBBundle/main.test.cc
index c784c25f47156d4aa82b4cc5e8990a2820335808..f7e93d970ff08ffbcbe2e984e0d442b6fe6c9b88 100644
--- a/Packets/MPEGDVBBundle/main.test.cc
+++ b/Packets/MPEGDVBBundle/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index baa89f0ac194ea4f608a6050ec9d7776ce0fd545..8da1546ca54543c64eb12d33a24db6ff03612f55 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -28,7 +28,7 @@
 #include <sstream>
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketData.test.cc b/Packets/PacketData.test.cc
index 91c5447248241803cd4a3405884270d5ab67e3c0..adab115dcfaa607dfe49e3c1bc0a397a66f70472 100644
--- a/Packets/PacketData.test.cc
+++ b/Packets/PacketData.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketImpl.test.cc b/Packets/PacketImpl.test.cc
index 8f6fe56f3002cd5a9daef176efc5018e23a52514..a38d6a5f2741e578e869cabf78f54cdfc83435ae 100644
--- a/Packets/PacketImpl.test.cc
+++ b/Packets/PacketImpl.test.cc
@@ -28,7 +28,7 @@
 #include "Packets.hh"
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketInterpreter.test.cc b/Packets/PacketInterpreter.test.cc
index 242869975b17f2bb8541b15c51d4a2c5dc976261..a83bb789d7b48dd579975cf0fd97479b1273a172 100644
--- a/Packets/PacketInterpreter.test.cc
+++ b/Packets/PacketInterpreter.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc
index 8be052493ca97b9bd746c023519a2a0ac927d1bf..cfa0990c3c491367a9ddbea164f9d86aa71e5cd6 100644
--- a/Packets/PacketParser.test.cc
+++ b/Packets/PacketParser.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index 07523d93b5e76f559184d002eadc7072e5fe3295..37b6750eb0c1d482ba9f328611d282d083bd1d41 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -29,7 +29,7 @@
 #include <string>
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc
index 350d7d5a96e7645a0b70b20e26cc26f9d35ee456..2d21600153a2c2e8002df786d52871212f8bb63c 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseHelpers.test.cc b/Packets/ParseHelpers.test.cc
index 3d42cff6dca767fb99d43bd245f5a1580eaf1bc3..1fa89cbc68202f89394ea63d2d60f5ac7570651c 100644
--- a/Packets/ParseHelpers.test.cc
+++ b/Packets/ParseHelpers.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseInt.test.cc b/Packets/ParseInt.test.cc
index e240e377fb4f1a1d497e27500b158e20d936604a..0f6f09593dff03ea4f5a21b9b7b9a321f03773c2 100644
--- a/Packets/ParseInt.test.cc
+++ b/Packets/ParseInt.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseList.test.cc b/Packets/ParseList.test.cc
index 1145af6c63db66de9f79f9e84fd6e83ed385fb7c..e2830cc60bbe8af8b452adb7779dd54c05d85233 100644
--- a/Packets/ParseList.test.cc
+++ b/Packets/ParseList.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseListB.test.cc b/Packets/ParseListB.test.cc
index 764ab645f319ed158512ac3e3407fe2a9009f9b3..a3d5fc1d20d43e5927cd973b114d55a566f95f25 100644
--- a/Packets/ParseListB.test.cc
+++ b/Packets/ParseListB.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseListN.test.cc b/Packets/ParseListN.test.cc
index 3800a0d9084da2c6e8b0b44000c8f88fb07b1587..1e8c56f79cf3ff47524ad446c192b8ed4d047159 100644
--- a/Packets/ParseListN.test.cc
+++ b/Packets/ParseListN.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseVariant.test.cc b/Packets/ParseVariant.test.cc
index d3bd24f9c12c9ff92e2f976ee9052761b0d33672..e795e49a920dd19b87c45367b0486315997abf5a 100644
--- a/Packets/ParseVariant.test.cc
+++ b/Packets/ParseVariant.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc
index 64e68e6e0366aaea75edf9974a63b5635ed3fbee..daa30d1ef6cd977644d8af8bc91aa4ae429c9494 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "Packets.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/assign.hpp>
 
diff --git a/Packets/main.test.cc b/Packets/main.test.cc
index c2972fdadfa038c91d5e3312a5a9a1c51f2797d4..ec5fc376c0c75d9212fb520a106158c73e5d3eff 100644
--- a/Packets/main.test.cc
+++ b/Packets/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include "Packets.hh"
 
diff --git a/Scheduler/ClockService.test.cc b/Scheduler/ClockService.test.cc
index fbbe5ab11a8ce13d0a370e46f7368e34c8b6e20b..1231e5d8f3eaade49f5d7bd310003078e6b49126 100644
--- a/Scheduler/ClockService.test.cc
+++ b/Scheduler/ClockService.test.cc
@@ -30,7 +30,7 @@
 #include "ClockService.hh"
 #include <errno.h>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/ReadHelper.test.cc b/Scheduler/ReadHelper.test.cc
index 79b0715815cce2ca39bfbc46cfe8a93aaec7b4c5..466b4fb2e6f114e43dd7ffa9e207ea1572bc8146 100644
--- a/Scheduler/ReadHelper.test.cc
+++ b/Scheduler/ReadHelper.test.cc
@@ -10,7 +10,7 @@
 // Custom includes
 #include "ReadHelper.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 5116a9c0f4ed7908272f309e03c4282ded1145eb..f3f498edf96df3cb91172ab2b803c9749a0deaa9 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -39,7 +39,7 @@
 
 #include "Scheduler.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/WriteHelper.test.cc b/Scheduler/WriteHelper.test.cc
index ab4f479c29f8ae5789901ff570f90415b1191c52..b6b45277a8d7f95583ae0de0116a336f576cd68c 100644
--- a/Scheduler/WriteHelper.test.cc
+++ b/Scheduler/WriteHelper.test.cc
@@ -10,7 +10,7 @@
 // Custom includes
 #include "WriteHelper.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Scheduler/main.test.cc b/Scheduler/main.test.cc
index b759387fbca292242de194b77da0f6ad98b714b1..385b73026af3fd7d516bf6250703e8387151a435 100644
--- a/Scheduler/main.test.cc
+++ b/Scheduler/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index 37494d79a3d96b520db6aa50df3f75c3d84958e9..01ddad2a13ba67c8a2128f180d0d80c6aa198bd7 100644
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -31,7 +31,7 @@
 #include "ClientSocketHandle.hh"
 #include "AddressingPolicy.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc
index f4dac9dfb3a2e10182821c3979a2359234484dd3..014d07233158063b3e09a62b9758d7314bae114f 100644
--- a/Socket/FileHandle.test.cc
+++ b/Socket/FileHandle.test.cc
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include "FileHandle.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index ad37183b3cb5a5d201bd5a675d554ba4adab3d06..11e93a8fd7b2035bc82e8e272b2416334c7d8880 100644
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -29,7 +29,7 @@
 #include "ProtocolClientSocketHandle.hh"
 #include "SocketProtocol.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index 424372979a5fb96c8e6ffb6f08e3d9308fcee4e9..4cda809ea41ac1b2bc6bcd36179fa7c0a8047d2f 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -29,7 +29,7 @@
 #include "ProtocolServerSocketHandle.hh"
 #include "SocketProtocol.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/DVB/main.test.cc b/Socket/Protocols/DVB/main.test.cc
index 91e601da22f5802d9132796553153d6b355e2ced..8c0780c0c0b21545af8a14b3bb72fca18868be11 100644
--- a/Socket/Protocols/DVB/main.test.cc
+++ b/Socket/Protocols/DVB/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/INet4Address.test.cc b/Socket/Protocols/INet/INet4Address.test.cc
index aaf58f8e934f4faae7501d513f30b28929893f16..3dc83ae163b590e9d710833cd23e4e0e759c6e2b 100644
--- a/Socket/Protocols/INet/INet4Address.test.cc
+++ b/Socket/Protocols/INet/INet4Address.test.cc
@@ -32,7 +32,7 @@
 #include <sstream>
 #include "INet4Address.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/INet6Address.test.cc b/Socket/Protocols/INet/INet6Address.test.cc
index 2fae5a0165d127d26dbfc0aa1bd2a0bf10ab04ce..658b4658ff3c619d01a5859f2793190cf74cdfcd 100644
--- a/Socket/Protocols/INet/INet6Address.test.cc
+++ b/Socket/Protocols/INet/INet6Address.test.cc
@@ -30,7 +30,7 @@
 #include <boost/lexical_cast.hpp>
 #include "INet6Address.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/INetAddressing.test.cc b/Socket/Protocols/INet/INetAddressing.test.cc
index c4d392f6161915b9c9d4ba3f8592cac50d362bc1..52f94aacd5c8f71f20abb7d7c5ded8179232f812 100644
--- a/Socket/Protocols/INet/INetAddressing.test.cc
+++ b/Socket/Protocols/INet/INetAddressing.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "INetAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/TCPSocketHandle.test.cc b/Socket/Protocols/INet/TCPSocketHandle.test.cc
index 6a120ee282f16c00c405fe61d72aa2f6f8cfa90f..3b4d0494f6a816ca10d24a1d38715bd9be6ece8c 100644
--- a/Socket/Protocols/INet/TCPSocketHandle.test.cc
+++ b/Socket/Protocols/INet/TCPSocketHandle.test.cc
@@ -35,7 +35,7 @@
 #include "TCPSocketHandle.hh"
 #include <iostream>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/UDPSocketHandle.test.cc b/Socket/Protocols/INet/UDPSocketHandle.test.cc
index 939763b0d84ab776287bd8ce2e619519e48b40e8..b309e4355ca25a777832e0fca783a0441244a651 100644
--- a/Socket/Protocols/INet/UDPSocketHandle.test.cc
+++ b/Socket/Protocols/INet/UDPSocketHandle.test.cc
@@ -36,7 +36,7 @@
 #include "UDPSocketHandle.hh"
 #include <iostream>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/INet/main.test.cc b/Socket/Protocols/INet/main.test.cc
index 91e601da22f5802d9132796553153d6b355e2ced..8c0780c0c0b21545af8a14b3bb72fca18868be11 100644
--- a/Socket/Protocols/INet/main.test.cc
+++ b/Socket/Protocols/INet/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/LLAddressing.test.cc b/Socket/Protocols/Raw/LLAddressing.test.cc
index 1d9f570de69e2a4a94c67490ac535fb93dbe7468..87b02d2af59518bc1c83cf1a821bbdbbd48a6f7e 100644
--- a/Socket/Protocols/Raw/LLAddressing.test.cc
+++ b/Socket/Protocols/Raw/LLAddressing.test.cc
@@ -29,7 +29,7 @@
 #include <boost/lexical_cast.hpp>
 #include "LLAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/MACAddress.test.cc b/Socket/Protocols/Raw/MACAddress.test.cc
index 86dfa3e2484664c70d82823fbb6d77a7262c1e29..f33f1b93080551d23c6b586e883a925afef80fa8 100644
--- a/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/Socket/Protocols/Raw/MACAddress.test.cc
@@ -29,7 +29,7 @@
 #include <boost/lexical_cast.hpp>
 #include "MACAddress.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/PacketSocketHandle.test.cc b/Socket/Protocols/Raw/PacketSocketHandle.test.cc
index 79dbde023f34c63e4f5d90d38e92144afa28d37f..6241013fc7225e165f17f4614962fb4cdb6fb584 100644
--- a/Socket/Protocols/Raw/PacketSocketHandle.test.cc
+++ b/Socket/Protocols/Raw/PacketSocketHandle.test.cc
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <unistd.h>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/Raw/main.test.cc b/Socket/Protocols/Raw/main.test.cc
index 91e601da22f5802d9132796553153d6b355e2ced..8c0780c0c0b21545af8a14b3bb72fca18868be11 100644
--- a/Socket/Protocols/Raw/main.test.cc
+++ b/Socket/Protocols/Raw/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/UN/UNAddress.test.cc b/Socket/Protocols/UN/UNAddress.test.cc
index 715afda3985511d8dfe3391f6385b12a2eb1f60d..af64685c01fe325fc3d54875c18af70c4fb77f00 100644
--- a/Socket/Protocols/UN/UNAddress.test.cc
+++ b/Socket/Protocols/UN/UNAddress.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNAddress.hh"
 #include <boost/filesystem/path.hpp>
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #include <iostream>
diff --git a/Socket/Protocols/UN/UNAddressing.test.cc b/Socket/Protocols/UN/UNAddressing.test.cc
index ebab854acfdf33c6429a1060ff556219180c503c..7bd8e7fdabf281a215c33a30164511d9a5026c0f 100644
--- a/Socket/Protocols/UN/UNAddressing.test.cc
+++ b/Socket/Protocols/UN/UNAddressing.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNAddressing.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #include <sys/socket.h>
diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
index 83827e3d693ea078195524f8db03c0c4f51e4752..69e743e1a775929f9a0a8c333b99cce25c53c6a4 100644
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNDatagramSocketHandle.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/UN/UNProtocol.test.cc b/Socket/Protocols/UN/UNProtocol.test.cc
index 3d7e8dc8046ca9238c7bfa4fa605038352614468..a2ceb76bcfc6b6a4d1126b1b4e020e1955e4fedf 100644
--- a/Socket/Protocols/UN/UNProtocol.test.cc
+++ b/Socket/Protocols/UN/UNProtocol.test.cc
@@ -27,7 +27,7 @@
 // Custom includes
 #include "UNProtocol.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/UN/main.test.cc b/Socket/Protocols/UN/main.test.cc
index 91e601da22f5802d9132796553153d6b355e2ced..8c0780c0c0b21545af8a14b3bb72fca18868be11 100644
--- a/Socket/Protocols/UN/main.test.cc
+++ b/Socket/Protocols/UN/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/Protocols/main.test.cc b/Socket/Protocols/main.test.cc
index 91e601da22f5802d9132796553153d6b355e2ced..be0cdde8fa11e1e8dbeddd9838a9df8bea582088 100644
--- a/Socket/Protocols/main.test.cc
+++ b/Socket/Protocols/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 649585610c9760c6de159b981fbe0be2c4bc3771..5f9230e0f52dba23c4374fcd45f482d05cf1a7f2 100644
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -31,7 +31,7 @@
 #include "SocketProtocol.test.hh"
 #include "AddressingPolicy.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index f2e31a71879dbfdd91eec6515ac675efa0c9f251..10336be7cf8e352af7d25198d1cad37efa95b6af 100644
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -30,7 +30,7 @@
 #include "SocketProtocol.test.hh"
 #include "AddressingPolicy.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index 84a830cbd856fcb4477865706dcc0f2c64519949..4729bcadaa407738bbed8f3429cb7c4df3294cca 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -29,7 +29,7 @@
 #include "SocketPolicy.hh"
 #include "SocketPolicy.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/concept_check.hpp>
diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index 2168488f25296f84dc1ea9155714e7fe2ad027d1..ea1c412be21bd416577053912764314079563cd6 100644
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -30,7 +30,7 @@
 #include "SocketPolicy.hh"
 #include "SocketProtocol.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Socket/main.test.cc b/Socket/main.test.cc
index b759387fbca292242de194b77da0f6ad98b714b1..385b73026af3fd7d516bf6250703e8387151a435 100644
--- a/Socket/main.test.cc
+++ b/Socket/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Buffer.test.cc b/Utils/Buffer.test.cc
index a5d9d4ed8a96954c7286579a88f7acb2e50316b9..ff205cf15480715a5f963921a494616200471ee2 100644
--- a/Utils/Buffer.test.cc
+++ b/Utils/Buffer.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Buffer.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Exception.test.cc b/Utils/Exception.test.cc
index 7421921aa1e2c6199e227dca679e351412999146..314cc41eafb4e9c278b867ec6a2b133784aacf54 100644
--- a/Utils/Exception.test.cc
+++ b/Utils/Exception.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "Exception.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/IpChecksum.test.cc b/Utils/IpChecksum.test.cc
index 24319d04d2b5f85674bc68ea0b564628e6047150..54642b269547f36d304278cff535f8abbfd81d01 100644
--- a/Utils/IpChecksum.test.cc
+++ b/Utils/IpChecksum.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "IpChecksum.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/IteratorTraits.test.cc b/Utils/IteratorTraits.test.cc
index d874e2294c091a95f24b89ce8b28f6b2aec6ddbc..4a27dccfaa9c622900c3b1d415faee86318fbf8c 100644
--- a/Utils/IteratorTraits.test.cc
+++ b/Utils/IteratorTraits.test.cc
@@ -31,7 +31,7 @@
 #include <vector>
 #include <string>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/AreaRegistry.test.cc b/Utils/Logger/AreaRegistry.test.cc
index a299cf3b56f42ce942ac514386b1a9ddf1396cef..f451098006a820a0df087f8a24fcd2ce7c026278 100644
--- a/Utils/Logger/AreaRegistry.test.cc
+++ b/Utils/Logger/AreaRegistry.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/Config.test.cc b/Utils/Logger/Config.test.cc
index 5371e66454d895f80d8614ea8d485daf6b4eb83b..6a2be182a7fe540d4ade9fd52f96f609c6746a84 100644
--- a/Utils/Logger/Config.test.cc
+++ b/Utils/Logger/Config.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/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 a79397a6c2b639aabc14d0848127f60022d949f4..0d38bc23c116237030c1c0ec11a5b1dd77c9d4aa 100644
--- a/Utils/Logger/Log.test.cc
+++ b/Utils/Logger/Log.test.cc
@@ -27,7 +27,7 @@
 //#include "Log.test.ih"
 
 // Custom includes
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 #include "main.test.hh"
 
diff --git a/Utils/Logger/Parameters.test.cc b/Utils/Logger/Parameters.test.cc
index ed2d8c6de042451c99e254bdc786ff6f5b5134e1..a22c1cec103979d9174c617c3f7ca9c7981cca61 100644
--- a/Utils/Logger/Parameters.test.cc
+++ b/Utils/Logger/Parameters.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/StreamRegistry.test.cc b/Utils/Logger/StreamRegistry.test.cc
index 21901a06741e956a3e7eaa2243c69f8c1c17a096..a5c68240332909eb84eeb030196bde6f46ee3065 100644
--- a/Utils/Logger/StreamRegistry.test.cc
+++ b/Utils/Logger/StreamRegistry.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/Target.test.cc b/Utils/Logger/Target.test.cc
index b41ead9f6320ded2a167680955813b2abe86135d..270852cf97481ab8ba56468b64189c49d0dd8d42 100644
--- a/Utils/Logger/Target.test.cc
+++ b/Utils/Logger/Target.test.cc
@@ -30,7 +30,7 @@
 #include <sstream>
 #include "main.test.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/Logger/main.test.cc b/Utils/Logger/main.test.cc
index 2e4e3879eead70c6eb0905b6d78f4e3646d0186e..d3f3be2fdce94c2b38ee28c0a7105b2ed04a8b54 100644
--- a/Utils/Logger/main.test.cc
+++ b/Utils/Logger/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/SafeBool.test.cc b/Utils/SafeBool.test.cc
index 39a95bef5f901de625fab39ecb07905736986302..88dd748dbf84bb340e9628b190847dad057d8a9e 100644
--- a/Utils/SafeBool.test.cc
+++ b/Utils/SafeBool.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "SafeBool.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/TypeIdValue.test.cc b/Utils/TypeIdValue.test.cc
index 12b9251c924382af0cff04b232676d64d279e855..39cf7d4c03f1091ec6c0077dbdcc3895fc90ee3b 100644
--- a/Utils/TypeIdValue.test.cc
+++ b/Utils/TypeIdValue.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "TypeIdValue.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/TypeInfo.test.cc b/Utils/TypeInfo.test.cc
index a8e7312e2e22bc474fca5420e213af1e7f19b6be..ac6c5f99efea0c37c28943e10e4236456e540764 100644
--- a/Utils/TypeInfo.test.cc
+++ b/Utils/TypeInfo.test.cc
@@ -28,7 +28,7 @@
 // Custom includes
 #include "TypeInfo.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/auto_unit_test.hh b/Utils/auto_unit_test.hh
new file mode 100644
index 0000000000000000000000000000000000000000..beb770f20b3c84111710ed6afecc34654f275872
--- /dev/null
+++ b/Utils/auto_unit_test.hh
@@ -0,0 +1,58 @@
+// $Id$
+//
+// Copyright (C) 2007 
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer NETwork research (NET)
+//     Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+/** \file
+    \brief auto_unit_test public header */
+
+#ifndef HH_auto_unit_test_
+#define HH_auto_unit_test_ 1
+
+// Custom includes
+#include <boost/version.hpp>
+
+//#include "auto_unit_test.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+#if BOOST_VERSION >= 103400
+
+#   define BOOST_AUTO_UNIT_TEST BOOST_AUTO_TEST_CASE
+
+#endif
+
+#include <boost/test/auto_unit_test.hpp>
+
+///////////////////////////////hh.e////////////////////////////////////////
+//#include "auto_unit_test.cci"
+//#include "auto_unit_test.ct"
+//#include "auto_unit_test.cti"
+#endif
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/Utils/hexdump.test.cc b/Utils/hexdump.test.cc
index ac64f5fc0622f9ee1152691b06230b7b8f5fc1a1..caf5a3512a4b2b5b0189714df7a8c99bb1438dc8 100644
--- a/Utils/hexdump.test.cc
+++ b/Utils/hexdump.test.cc
@@ -30,7 +30,7 @@
 #include "hexdump.hh"
 #include <sstream>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/intrusive_refcount.test.cc b/Utils/intrusive_refcount.test.cc
index ca05e18437d378341c30235dd141edf830f39162..07ad3940e271679444e0a71b7ba228de8685e299 100644
--- a/Utils/intrusive_refcount.test.cc
+++ b/Utils/intrusive_refcount.test.cc
@@ -29,7 +29,7 @@
 #include "intrusive_refcount.hh"
 #include <boost/intrusive_ptr.hpp>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/main.test.cc b/Utils/main.test.cc
index b759387fbca292242de194b77da0f6ad98b714b1..385b73026af3fd7d516bf6250703e8387151a435 100644
--- a/Utils/main.test.cc
+++ b/Utils/main.test.cc
@@ -27,7 +27,7 @@
 
 // Custom includes
 #define BOOST_AUTO_TEST_MAIN
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc
index 3cfbb87d904481e8271c5a72a7b09449e44c019a..98ddb17a373e1792183df5e4d734c223c9f88857 100644
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -30,7 +30,7 @@
 #include <string>
 #include "../Utils/membind.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/mpl.test.cc b/Utils/mpl.test.cc
index 5e69658123c33e9e8ec980a97a3d935b92bc4261..9e80f68a3e82bd880f05c8d5983a1a204e912abe 100644
--- a/Utils/mpl.test.cc
+++ b/Utils/mpl.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "mpl.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/pool_alloc_mixin.test.cc b/Utils/pool_alloc_mixin.test.cc
index 2fb61071c539f415a55f81368f1c360ba0c13ccb..e91ac4ab9da56661909332faa2c1a7af1122b784 100644
--- a/Utils/pool_alloc_mixin.test.cc
+++ b/Utils/pool_alloc_mixin.test.cc
@@ -30,7 +30,7 @@
 #include "pool_alloc_mixin.hh"
 #include <boost/scoped_ptr.hpp>
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
diff --git a/Utils/singleton.test.cc b/Utils/singleton.test.cc
index fb134af0022083add603139bb5ba264b939fa153..24560c27dc062ccb67ac745becb292db2fb649d5 100644
--- a/Utils/singleton.test.cc
+++ b/Utils/singleton.test.cc
@@ -29,7 +29,7 @@
 // Custom includes
 #include "singleton.hh"
 
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
 
 #define prefix_