From: tho <tho@270642c3-0616-0410-b53a-bc976706d245>
Date: Tue, 16 Feb 2010 17:00:56 +0000 (+0000)
Subject: Socket/Protocols/Raw: LLAddressingPolicy inherit from BSDAddressingPolicy
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=0fb5ed1adf2f67dbf47fdfed3f3c8be989cf3618;p=senf.git

Socket/Protocols/Raw: LLAddressingPolicy inherit from BSDAddressingPolicy
Socket: include cleanups

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1578 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/senf/Scheduler/TimerEvent.hh b/senf/Scheduler/TimerEvent.hh
index 87b47a2..c4d10ff 100644
--- a/senf/Scheduler/TimerEvent.hh
+++ b/senf/Scheduler/TimerEvent.hh
@@ -30,7 +30,6 @@
 #include <signal.h>
 #include <boost/intrusive/iset_hook.hpp>
 #include "ClockService.hh"
-#include "FdManager.hh"
 #include "FIFORunner.hh"
 #include <senf/Utils/Logger/SenfLog.hh>
 
diff --git a/senf/Socket/CommunicationPolicy.cc b/senf/Socket/CommunicationPolicy.cc
index 295afd4..f6efbcc 100644
--- a/senf/Socket/CommunicationPolicy.cc
+++ b/senf/Socket/CommunicationPolicy.cc
@@ -32,7 +32,6 @@
 #include <sys/socket.h>
 #include <errno.h>
 #include <senf/Utils/Exception.hh>
-#include "ServerSocketHandle.hh"
 
 //#include "CommunicationPolicy.mpp"
 #define prefix_
diff --git a/senf/Socket/NetdeviceController.test.cc b/senf/Socket/NetdeviceController.test.cc
index d99c70b..c3546bf 100644
--- a/senf/Socket/NetdeviceController.test.cc
+++ b/senf/Socket/NetdeviceController.test.cc
@@ -28,8 +28,8 @@
 
 // Custom includes
 #include "NetdeviceController.hh"
-#include <senf/Socket/Protocols/Raw/MACAddress.hh>
 #include <net/if.h>
+#include <senf/Utils/Exception.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/BSDAddressingPolicy.hh b/senf/Socket/Protocols/BSDAddressingPolicy.hh
index fd8585e..36b970d 100644
--- a/senf/Socket/Protocols/BSDAddressingPolicy.hh
+++ b/senf/Socket/Protocols/BSDAddressingPolicy.hh
@@ -33,7 +33,6 @@
 // Custom includes
 #include <senf/Socket/SocketHandle.hh>
 #include <senf/Socket/FileHandle.hh>
-#include <senf/Socket/SocketPolicy.hh>
 #include <senf/Socket/CommunicationPolicy.hh>
 #include "BSDSocketAddress.hh"
 
diff --git a/senf/Socket/Protocols/BSDSocketProtocol.cc b/senf/Socket/Protocols/BSDSocketProtocol.cc
index 850f60d..5600334 100644
--- a/senf/Socket/Protocols/BSDSocketProtocol.cc
+++ b/senf/Socket/Protocols/BSDSocketProtocol.cc
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
-#include <senf/Socket/SocketHandle.hh>
 
 //#include "BSDSocketProtocol.mpp"
 #define prefix_
diff --git a/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
index 25d783e..ad43e92 100644
--- a/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
+++ b/senf/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
@@ -24,7 +24,7 @@
 #define CONNECTEDHH_SENF_Socket_Protocols_INet_RawINetSocketHandle_
 
 // Custom includes
-#include "INetSocketProtocol.hh"
+#include "INetAddressing.hh"
 #include "RawINetSocketProtocol.hh"
 #include <senf/Socket/Protocols/BSDSocketProtocol.hh>
 #include <senf/Socket/Protocols/DatagramSocketProtocol.hh>
@@ -61,10 +61,12 @@ namespace senf {
         \par Address Type:
             INet4SocketAddress
 
-        ConnectedRawV4SocketProtocol provides an internet protocol raw socket based on IPv4 addressing.
-        This socket will put data written to it onto the IPv4 layer: if you call writeto don't inlude the header!
+        ConnectedRawV4SocketProtocol provides an Internet protocol raw socket based on IPv4 addressing.
+        This socket will put data written to it onto the IPv4 layer: if you call writeto don't include 
+        the header!
         On the other hand `read` will return the packet data including the IP header. 
-        This behaviour is strange and differs from the behaviour of IPv6 RAW sockets and should be changed in the future. 
+        This behaviour is strange and differs from the behaviour of IPv6 RAW sockets and should be 
+        changed in the future. 
 
         This class is utilized as the protocol class of the ProtocolClientSocketHandle
         via the Socket Handle typedefs above.
diff --git a/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
index ab839b7..5d938fe 100644
--- a/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
+++ b/senf/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
@@ -31,7 +31,7 @@
 #define HH_SENF_Socket_Protocols_INet_ConnectedUDPSocketHandle_ 1
 
 // Custom includes
-#include "INetSocketProtocol.hh"
+#include "INetAddressing.hh"
 #include "UDPSocketProtocol.hh"
 #include <senf/Socket/Protocols/BSDSocketProtocol.hh>
 #include <senf/Socket/Protocols/DatagramSocketProtocol.hh>
diff --git a/senf/Socket/Protocols/INet/INet4Address.cc b/senf/Socket/Protocols/INet/INet4Address.cc
index 374d3ca..dcb6611 100644
--- a/senf/Socket/Protocols/INet/INet4Address.cc
+++ b/senf/Socket/Protocols/INet/INet4Address.cc
@@ -34,6 +34,7 @@
 #if defined(_REENTRANT) && !defined(__GLIBC__)
 #include <boost/thread/mutex.hpp>
 #endif
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "INet4Address.mpp"
 #define prefix_
diff --git a/senf/Socket/Protocols/INet/INet4Address.hh b/senf/Socket/Protocols/INet/INet4Address.hh
index 596147f..c0655c1 100644
--- a/senf/Socket/Protocols/INet/INet4Address.hh
+++ b/senf/Socket/Protocols/INet/INet4Address.hh
@@ -34,7 +34,6 @@
 #include <boost/operators.hpp>
 #include <senf/Utils/safe_bool.hh>
 #include <senf/Utils/Tags.hh>
-#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "INet4Address.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/senf/Socket/Protocols/INet/INet4Address.test.cc b/senf/Socket/Protocols/INet/INet4Address.test.cc
index 1e7a45f..8365f5e 100644
--- a/senf/Socket/Protocols/INet/INet4Address.test.cc
+++ b/senf/Socket/Protocols/INet/INet4Address.test.cc
@@ -31,6 +31,7 @@
 #include <sstream>
 #include "INet4Address.hh"
 #include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/INet/INet6Address.cc b/senf/Socket/Protocols/INet/INet6Address.cc
index 3a6f6b6..f2c0204 100644
--- a/senf/Socket/Protocols/INet/INet6Address.cc
+++ b/senf/Socket/Protocols/INet/INet6Address.cc
@@ -33,6 +33,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <boost/lexical_cast.hpp>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "INet6Address.mpp"
 #define prefix_
diff --git a/senf/Socket/Protocols/INet/INet6Address.hh b/senf/Socket/Protocols/INet/INet6Address.hh
index 131a46f..65a32be 100644
--- a/senf/Socket/Protocols/INet/INet6Address.hh
+++ b/senf/Socket/Protocols/INet/INet6Address.hh
@@ -36,7 +36,6 @@
 #include <senf/Utils/safe_bool.hh>
 #include <senf/Utils/Tags.hh>
 #include "INet4Address.hh"
-#include <senf/Socket/Protocols/AddressExceptions.hh>
 #include <senf/Socket/Protocols/Raw/MACAddress.hh>
 #include <senf/Socket/Protocols/Raw/EUI64.hh>
 
diff --git a/senf/Socket/Protocols/INet/INet6Address.test.cc b/senf/Socket/Protocols/INet/INet6Address.test.cc
index 0ab8bbb..491facc 100644
--- a/senf/Socket/Protocols/INet/INet6Address.test.cc
+++ b/senf/Socket/Protocols/INet/INet6Address.test.cc
@@ -29,6 +29,7 @@
 // Custom includes
 #include "INet6Address.hh"
 #include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/INet/INetAddressing.cc b/senf/Socket/Protocols/INet/INetAddressing.cc
index 7ec3a71..23f372e 100644
--- a/senf/Socket/Protocols/INet/INetAddressing.cc
+++ b/senf/Socket/Protocols/INet/INetAddressing.cc
@@ -35,6 +35,7 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/regex.hpp>
 #include <senf/Utils/senfassert.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "INetAddressing.mpp"
 #define prefix_
diff --git a/senf/Socket/Protocols/INet/INetAddressing.hh b/senf/Socket/Protocols/INet/INetAddressing.hh
index 47735a9..afa942a 100644
--- a/senf/Socket/Protocols/INet/INetAddressing.hh
+++ b/senf/Socket/Protocols/INet/INetAddressing.hh
@@ -29,11 +29,7 @@
 
 // Custom includes
 #include <string>
-#include <exception>
 #include <netinet/in.h>
-#include <senf/Socket/SocketPolicy.hh>
-#include <senf/Socket/ClientSocketHandle.hh>
-#include <senf/Socket/CommunicationPolicy.hh>
 #include <senf/Socket/Protocols/BSDAddressingPolicy.hh>
 #include <senf/Socket/Protocols/BSDSocketAddress.hh>
 #include "INet4Address.hh"
diff --git a/senf/Socket/Protocols/INet/INetAddressing.test.cc b/senf/Socket/Protocols/INet/INetAddressing.test.cc
index 3803207..be19a32 100644
--- a/senf/Socket/Protocols/INet/INetAddressing.test.cc
+++ b/senf/Socket/Protocols/INet/INetAddressing.test.cc
@@ -29,6 +29,7 @@
 // Custom includes
 #include "INetAddressing.hh"
 #include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/INet/INetSocketProtocol.hh b/senf/Socket/Protocols/INet/INetSocketProtocol.hh
index d6adb10..863db0f 100644
--- a/senf/Socket/Protocols/INet/INetSocketProtocol.hh
+++ b/senf/Socket/Protocols/INet/INetSocketProtocol.hh
@@ -35,9 +35,6 @@
 
 // Custom includes
 #include <senf/Socket/SocketProtocol.hh>
-#include "INetAddressing.hh"
-#include <senf/Socket/ClientSocketHandle.hh>
-#include <senf/Socket/CommunicationPolicy.hh>
 
 //#include "INetSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.hh b/senf/Socket/Protocols/INet/RawINetSocketHandle.hh
index 8a644c8..02f71ef 100644
--- a/senf/Socket/Protocols/INet/RawINetSocketHandle.hh
+++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.hh
@@ -25,7 +25,7 @@
 
 
 // Custom includes
-#include "INetSocketProtocol.hh"
+#include "INetAddressing.hh"
 #include "RawINetSocketProtocol.hh"
 #include "MulticastSocketProtocol.hh"
 #include <senf/Socket/Protocols/BSDSocketProtocol.hh>
diff --git a/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc b/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc
index ed01573..cb68dfd 100644
--- a/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc
+++ b/senf/Socket/Protocols/INet/RawINetSocketProtocol.cc
@@ -24,14 +24,10 @@
 #include "RawINetSocketProtocol.hh"
 
 // Custom includes
-#include <sys/socket.h>
-#include <netinet/in.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
-#include <net/if.h> // for if_nametoindex
-#include <senf/Socket/SocketHandle.hh>
 
-//#include "UDPSocketProtocol.mpp"
+//#include "RawINetSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
@@ -52,7 +48,7 @@ prefix_ bool senf::RawINetSocketProtocol::eof()
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "UDPSocketProtocol.mpp"
+//#include "RawINetSocketProtocol.mpp"
 
 
 // Local Variables:
diff --git a/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh b/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh
index 3955184..3c3c437 100644
--- a/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh
+++ b/senf/Socket/Protocols/INet/RawINetSocketProtocol.hh
@@ -24,13 +24,7 @@
 #define HH_SENF_Socket_Protocols_INet_RawINetSocketProtocol_
 
 // Custom includes
-#include "INetAddressing.hh"
 #include "INetSocketProtocol.hh"
-#include <senf/Socket/Protocols/BSDSocketProtocol.hh>
-#include <senf/Socket/FramingPolicy.hh>
-#include <senf/Socket/CommunicationPolicy.hh>
-#include <senf/Socket/ReadWritePolicy.hh>
-#include <senf/Socket/ProtocolClientSocketHandle.hh>
 
 namespace senf {
 
diff --git a/senf/Socket/Protocols/INet/TCPSocketHandle.hh b/senf/Socket/Protocols/INet/TCPSocketHandle.hh
index cdb09e9..39a5d5a 100644
--- a/senf/Socket/Protocols/INet/TCPSocketHandle.hh
+++ b/senf/Socket/Protocols/INet/TCPSocketHandle.hh
@@ -33,6 +33,7 @@
 // Custom includes
 #include "INetSocketProtocol.hh"
 #include "TCPSocketProtocol.hh"
+#include "INetAddressing.hh"
 #include <senf/Socket/Protocols/BSDSocketProtocol.hh>
 #include <senf/Socket/FramingPolicy.hh>
 #include <senf/Socket/CommunicationPolicy.hh>
diff --git a/senf/Socket/Protocols/INet/TCPSocketProtocol.cc b/senf/Socket/Protocols/INet/TCPSocketProtocol.cc
index eaeb83c..beba0aa 100644
--- a/senf/Socket/Protocols/INet/TCPSocketProtocol.cc
+++ b/senf/Socket/Protocols/INet/TCPSocketProtocol.cc
@@ -33,7 +33,6 @@
 #include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
-#include <senf/Socket/SocketHandle.hh>
 
 //#include "TCPSocketProtocol.mpp"
 #define prefix_
diff --git a/senf/Socket/Protocols/INet/TCPSocketProtocol.hh b/senf/Socket/Protocols/INet/TCPSocketProtocol.hh
index dc9b0e8..6ba240f 100644
--- a/senf/Socket/Protocols/INet/TCPSocketProtocol.hh
+++ b/senf/Socket/Protocols/INet/TCPSocketProtocol.hh
@@ -28,7 +28,6 @@
 #define HH_SENF_Socket_Protocols_INet_TCPSocketProtocol_ 1
 
 // Custom includes
-#include <senf/Socket/SocketProtocol.hh>
 #include "INetSocketProtocol.hh"
 
 //#include "TCPSocketProtocol.mpp"
diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.hh b/senf/Socket/Protocols/INet/UDPSocketHandle.hh
index 839f52c..6673ec9 100644
--- a/senf/Socket/Protocols/INet/UDPSocketHandle.hh
+++ b/senf/Socket/Protocols/INet/UDPSocketHandle.hh
@@ -31,7 +31,7 @@
 #define HH_SENF_Socket_Protocols_INet_UDPSocketHandle_ 1
 
 // Custom includes
-#include "INetSocketProtocol.hh"
+#include "INetAddressing.hh"
 #include "UDPSocketProtocol.hh"
 #include "MulticastSocketProtocol.hh"
 #include <senf/Socket/Protocols/BSDSocketProtocol.hh>
diff --git a/senf/Socket/Protocols/INet/UDPSocketProtocol.cc b/senf/Socket/Protocols/INet/UDPSocketProtocol.cc
index 9a285ba..2985242 100644
--- a/senf/Socket/Protocols/INet/UDPSocketProtocol.cc
+++ b/senf/Socket/Protocols/INet/UDPSocketProtocol.cc
@@ -21,20 +21,15 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TCPSocketProtocol non-inline non-template implementation
+    \brief UDPSocketProtocol non-inline non-template implementation
  */
 
 #include "UDPSocketProtocol.hh"
 //#include "UDPSocketProtocol.ih"
 
 // Custom includes
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
-#include <net/if.h> // for if_nametoindex
-#include <senf/Socket/SocketHandle.hh>
 
 //#include "UDPSocketProtocol.mpp"
 #define prefix_
diff --git a/senf/Socket/Protocols/INet/UDPSocketProtocol.hh b/senf/Socket/Protocols/INet/UDPSocketProtocol.hh
index 8429396..c043be4 100644
--- a/senf/Socket/Protocols/INet/UDPSocketProtocol.hh
+++ b/senf/Socket/Protocols/INet/UDPSocketProtocol.hh
@@ -28,8 +28,6 @@
 #define HH_SENF_Socket_Protocols_INet_UDPSocketProtocol_ 1
 
 // Custom includes
-#include <senf/Socket/SocketProtocol.hh>
-#include "INetAddressing.hh"
 #include "INetSocketProtocol.hh"
 
 //#include "UDPSocketProtocol.mpp"
diff --git a/senf/Socket/Protocols/Raw/EUI64.test.cc b/senf/Socket/Protocols/Raw/EUI64.test.cc
index 08429a3..bf7fac6 100644
--- a/senf/Socket/Protocols/Raw/EUI64.test.cc
+++ b/senf/Socket/Protocols/Raw/EUI64.test.cc
@@ -28,6 +28,7 @@
 
 // Custom includes
 #include "EUI64.hh"
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/Raw/LLAddressing.hh b/senf/Socket/Protocols/Raw/LLAddressing.hh
index 6cda49f..a3fc336 100644
--- a/senf/Socket/Protocols/Raw/LLAddressing.hh
+++ b/senf/Socket/Protocols/Raw/LLAddressing.hh
@@ -30,8 +30,6 @@
 // Custom includes
 #include <sys/socket.h>
 #include <netpacket/packet.h>
-#include <senf/Socket/SocketPolicy.hh>
-#include <senf/Socket/FileHandle.hh>
 #include <senf/Socket/Protocols/BSDAddressingPolicy.hh>
 #include <senf/Socket/Protocols/BSDSocketAddress.hh>
 #include "MACAddress.hh"
@@ -145,7 +143,7 @@ namespace senf {
         or peer() members.
      */
     struct LLAddressingPolicy
-        : public AddressingPolicyBase,
+        : public BSDAddressingPolicy,
           private BSDAddressingPolicyMixin<LLSocketAddress>
     {
         typedef LLSocketAddress Address;
diff --git a/senf/Socket/Protocols/Raw/LLAddressing.test.cc b/senf/Socket/Protocols/Raw/LLAddressing.test.cc
index f547d9a..c01ef6e 100644
--- a/senf/Socket/Protocols/Raw/LLAddressing.test.cc
+++ b/senf/Socket/Protocols/Raw/LLAddressing.test.cc
@@ -27,8 +27,9 @@
 //#include "LLAddressing.test.ih"
 
 // Custom includes
-#include <senf/Utils/String.hh>
 #include "LLAddressing.hh"
+#include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/Raw/MACAddress.cc b/senf/Socket/Protocols/Raw/MACAddress.cc
index 08d3601..8021839 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.cc
@@ -31,6 +31,7 @@
 #include <string>
 #include <sstream>
 #include <boost/io/ios_state.hpp>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 #include "ParseString.hh"
 #include "EUI64.hh"
 
diff --git a/senf/Socket/Protocols/Raw/MACAddress.hh b/senf/Socket/Protocols/Raw/MACAddress.hh
index 6b3287d..12b105f 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.hh
+++ b/senf/Socket/Protocols/Raw/MACAddress.hh
@@ -34,7 +34,6 @@
 #include <boost/type_traits.hpp>
 #include <senf/Utils/safe_bool.hh>
 #include <senf/Utils/Tags.hh>
-#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 //#include "MACAddress.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/senf/Socket/Protocols/Raw/MACAddress.test.cc b/senf/Socket/Protocols/Raw/MACAddress.test.cc
index e4ca627..6272527 100644
--- a/senf/Socket/Protocols/Raw/MACAddress.test.cc
+++ b/senf/Socket/Protocols/Raw/MACAddress.test.cc
@@ -31,6 +31,7 @@
 #include "MACAddress.hh"
 #include <senf/Utils/String.hh>
 #include "EUI64.hh"
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
diff --git a/senf/Socket/Protocols/Raw/ParseString.ct b/senf/Socket/Protocols/Raw/ParseString.ct
index dec04ee..5aa40cf 100644
--- a/senf/Socket/Protocols/Raw/ParseString.ct
+++ b/senf/Socket/Protocols/Raw/ParseString.ct
@@ -30,6 +30,7 @@
 #include <boost/range.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 #include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
diff --git a/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh b/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh
index 136dcd7..fe56223 100644
--- a/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh
+++ b/senf/Socket/Protocols/Raw/TunTapSocketHandle.hh
@@ -35,7 +35,6 @@
 #include <senf/Socket/CommunicationPolicy.hh>
 #include <senf/Socket/ReadWritePolicy.hh>
 #include <senf/Socket/Protocols/BSDSocketProtocol.hh>
-#include "LLAddressing.hh"
 
 //#include "TunTapSocketHandle.mpp"
 //#include "TunTapSocketHandle.ih"
diff --git a/senf/Socket/Protocols/UN/UNSocketProtocol.cc b/senf/Socket/Protocols/UN/UNSocketProtocol.cc
index ff0f217..55ae0c5 100644
--- a/senf/Socket/Protocols/UN/UNSocketProtocol.cc
+++ b/senf/Socket/Protocols/UN/UNSocketProtocol.cc
@@ -31,6 +31,7 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
+#include "UNAddressing.hh"
 #include <senf/Utils/Logger/SenfLog.hh>
 #include <senf/Utils/Exception.hh>
 
diff --git a/senf/Socket/Protocols/UN/UNSocketProtocol.hh b/senf/Socket/Protocols/UN/UNSocketProtocol.hh
index da0cf6e..64e797d 100644
--- a/senf/Socket/Protocols/UN/UNSocketProtocol.hh
+++ b/senf/Socket/Protocols/UN/UNSocketProtocol.hh
@@ -28,9 +28,6 @@
 
 // Custom includes
 #include <senf/Socket/SocketProtocol.hh>
-#include "UNAddressing.hh"
-#include <senf/Socket/ClientSocketHandle.hh>
-#include <senf/Socket/CommunicationPolicy.hh>
 
 //#include "UNSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
diff --git a/senf/Socket/ServerSocketHandle.hh b/senf/Socket/ServerSocketHandle.hh
index 235b590..ccb6bae 100644
--- a/senf/Socket/ServerSocketHandle.hh
+++ b/senf/Socket/ServerSocketHandle.hh
@@ -28,11 +28,8 @@
 #define HH_SENF_Socket_ServerSocketHandle_ 1
 
 // Custom includes
-#include <boost/static_assert.hpp>
 #include <boost/call_traits.hpp>
 #include "SocketHandle.hh"
-#include "CommunicationPolicy.hh"
-#include "AddressingPolicy.hh"
 
 //#include "ServerSocketHandle.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////