diff --git a/Packets/PacketRegistry.cti b/Packets/PacketRegistry.cti
index 6de3a0c9ccdef413e3320e6281b1e4512d2316f9..5687850c5a081a18cdd328355a790d1b5461f325 100644
--- a/Packets/PacketRegistry.cti
+++ b/Packets/PacketRegistry.cti
@@ -118,7 +118,7 @@ senf::detail::PacketRegistryImpl<KeyType>::begin()
     const
 {
     return boost::make_transform_iterator(
-        registry_.begin(), __gnu_cxx::select1st<typename PacketMap::value_type>());
+        registry_.begin(), ::__gnu_cxx::select1st<typename PacketMap::value_type>());
 }
 
 template <class KeyType>
@@ -127,13 +127,13 @@ senf::detail::PacketRegistryImpl<KeyType>::end()
     const
 {
     return boost::make_transform_iterator(
-        registry_.end(), __gnu_cxx::select1st<typename PacketMap::value_type>());
+        registry_.end(), ::__gnu_cxx::select1st<typename PacketMap::value_type>());
 }
 
 ///////////////////////////////PacketRegistry..e///////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100
diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih
index 44198cea5bcf2c2dd81466266a47283bfcec1f61..32139e716fbfb3cb15a94515e6067bcb3ccad84e 100644
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -40,7 +40,7 @@ namespace senf {
 
         Value returned by a registry lookup
      */
-    struct PkReg_Entry 
+    struct PkReg_Entry
         : public intrusive_refcount
     {
         virtual ~PkReg_Entry();
@@ -50,7 +50,7 @@ namespace senf {
     };
 
 namespace detail {
-    
+
     /** \brief Internal: Registry entry implementation for a specific packet type
 
         \internal
@@ -64,7 +64,7 @@ namespace detail {
     };
 
     /** \brief Internal: Registry implementation base-class and registry of registries
-        
+
         \internal
      */
     class PacketRegistryImplBase
@@ -88,7 +88,7 @@ namespace detail {
         \internal
      */
     template <class KeyType>
-    class PacketRegistryImpl 
+    class PacketRegistryImpl
         : public PacketRegistryImplBase
     {
     public:
@@ -104,13 +104,13 @@ namespace detail {
         ///////////////////////////////////////////////////////////////////////////
         // Types
 
-        typedef boost::transform_iterator< __gnu_cxx::select1st<typename PacketMap::value_type>,
+        typedef boost::transform_iterator< ::__gnu_cxx::select1st<typename PacketMap::value_type>,
                                            typename PacketMap::const_iterator > iterator;
 
         ///////////////////////////////////////////////////////////////////////////
         ///\name Structors and default members
         ///@{
-        
+
         PacketRegistryImpl(std::string const & name);
 
         ///@}