diff --git a/Packets/80211Bundle/RadiotapPacket.hh b/Packets/80211Bundle/RadiotapPacket.hh
index 178556b201d65f80c2c5ed088fa1390f85ead3bc..ebea56717b765a028127f955395526bdc58721d4 100644
--- a/Packets/80211Bundle/RadiotapPacket.hh
+++ b/Packets/80211Bundle/RadiotapPacket.hh
@@ -187,7 +187,7 @@ namespace senf
 
         \par Fields:
             \ref RadiotapPacketParser
-	    \image html RadiotapPacket.png
+            \image html RadiotapPacket.png
         
         \see http://www.radiotap.org/
         
diff --git a/Packets/80211Bundle/WLANPacket.hh b/Packets/80211Bundle/WLANPacket.hh
index b91df6b79e9ac81a4ba8fa123c421d2f74db3e4c..bbed6ea19ea41ecf3a73b547ce1080e6371d5819 100644
--- a/Packets/80211Bundle/WLANPacket.hh
+++ b/Packets/80211Bundle/WLANPacket.hh
@@ -41,7 +41,7 @@ namespace senf
     #   include SENF_FIXED_PARSER()
 
         SENF_PARSER_PRIVATE_BITFIELD ( subtype, 4,  unsigned                ); //<pkgdraw: hide
-	//skip type and version
+        //skip type and version
         SENF_PARSER_SKIP_BITS        (          4                           ); //<pkgdraw: hide
         //jump to fist address field
         SENF_PARSER_SKIP             ( 3                                    ); //<pkgdraw: hide
@@ -75,7 +75,7 @@ namespace senf
     #   include SENF_PARSER()
 
         SENF_PARSER_PRIVATE_BITFIELD ( subtype,  4,  unsigned            ); //<pkgdraw: hide
-	//skip type and version
+        //skip type and version
         SENF_PARSER_SKIP_BITS        (           4                       ); //<pkgdraw: hide
         //jump to fist address field
         SENF_PARSER_SKIP             ( 3, 3                              ); //<pkgdraw: hide
@@ -208,7 +208,7 @@ namespace senf
 
         \par Fields:
             \ref WLANPacketParser
-	    \image html WLANPacket.png
+            \image html WLANPacket.png
 
         \ingroup protocolbundle_80211
      */
diff --git a/Packets/DefaultBundle/ICMPv6TypePacket.hh b/Packets/DefaultBundle/ICMPv6TypePacket.hh
index 47834a11be12b707e0e78250f2e5377ba9cc6149..25af18e340d445d6287d2bd3320439aa800ef19f 100644
--- a/Packets/DefaultBundle/ICMPv6TypePacket.hh
+++ b/Packets/DefaultBundle/ICMPv6TypePacket.hh
@@ -330,7 +330,7 @@ namespace senf {
     /** \brief MLDv2 Listener query
 
         \par Packet type (typedef):
-	    \ref MLDv2ListenerQuery
+            \ref MLDv2ListenerQuery
 
         \par Fields:
             \ref MLDv2ListenerQueryParser
@@ -389,7 +389,7 @@ namespace senf {
     /** \brief MLDv2 Listener report
 
         \par Packet type (typedef):
-	    \ref MLDv2ListenerReport
+            \ref MLDv2ListenerReport
 
         \par Fields:
             \ref MLDv2ListenerReportParser
diff --git a/Packets/DefaultBundle/IPv6Extensions.hh b/Packets/DefaultBundle/IPv6Extensions.hh
index 5e08e4aea60393054461ade9a9e5f49750c54a19..aa2d3314300c50349aba325f5e05d39d1dfab5e3 100644
--- a/Packets/DefaultBundle/IPv6Extensions.hh
+++ b/Packets/DefaultBundle/IPv6Extensions.hh
@@ -150,11 +150,11 @@ The Type 0 Routing header has the following format: (RFC 2460)
 */
 #       include SENF_PARSER()
         
-        SENF_PARSER_FIELD ( nextHeader, UInt8Parser	);
-        SENF_PARSER_FIELD ( headerLength, UInt8Parser	);
-        SENF_PARSER_FIELD ( routingType, UInt8Parser	); //set to Zero for minimal implementation
-        SENF_PARSER_FIELD_RO ( segmentsLeft, UInt8Parser   );
-        SENF_PARSER_FIELD ( reserved, UInt32Parser      ); //set to zero by RFC
+        SENF_PARSER_FIELD ( nextHeader, UInt8Parser      );
+        SENF_PARSER_FIELD ( headerLength, UInt8Parser    );
+        SENF_PARSER_FIELD ( routingType, UInt8Parser     ); //set to Zero for minimal implementation
+        SENF_PARSER_FIELD_RO ( segmentsLeft, UInt8Parser );
+        SENF_PARSER_FIELD ( reserved, UInt32Parser       ); //set to zero by RFC
         SENF_PARSER_VECTOR ( hopAddresses, segmentsLeft, INet6AddressParser );
         
         SENF_PARSER_FINALIZE ( IPv6PacketParserExtension_Routing );
@@ -229,8 +229,8 @@ The Type 0 Routing header has the following format: (RFC 2460)
 
     struct IPv6PacketParserExtension_HopByHop : public PacketParserBase {
 #       include SENF_PARSER()
-        SENF_PARSER_FIELD ( nextHeader, UInt8Parser	);
-        SENF_PARSER_FIELD ( headerLength, UInt8Parser	);
+        SENF_PARSER_FIELD ( nextHeader, UInt8Parser   );
+        SENF_PARSER_FIELD ( headerLength, UInt8Parser );
         
         SENF_PARSER_FINALIZE ( IPv6PacketParserExtension_HopByHop );
     };
@@ -296,8 +296,8 @@ The Type 0 Routing header has the following format: (RFC 2460)
 
     struct IPv6PacketParserExtension_Destination : public PacketParserBase {
 #       include SENF_PARSER()
-        SENF_PARSER_FIELD ( nextHeader, UInt8Parser	);
-        SENF_PARSER_FIELD ( headerLength, UInt8Parser	);
+        SENF_PARSER_FIELD ( nextHeader, UInt8Parser   );
+        SENF_PARSER_FIELD ( headerLength, UInt8Parser );
         
         SENF_PARSER_FINALIZE ( IPv6PacketParserExtension_Destination );
     };