diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc
index 366b40a13596f3167b22ba758d8f3e39a873eefb..7e900c23f0c260d76792e28288b00535e8f8c8b5 100644
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -144,4 +144,5 @@ int main(int argc, char const * argv[])
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc
index 34ce055c48ac1fce55c226e55889ee2694c97b9c..2ab4bd687c4852ebeba34ed624cd7e3d81f4a4f1 100644
--- a/Examples/Sniffer/Sniffer.cc
+++ b/Examples/Sniffer/Sniffer.cc
@@ -171,4 +171,5 @@ int main(int argc, char const * argv[])
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Connectors.hh b/PPI/Connectors.hh
index 99e50ce7b052b37a14a00a7335354a59ce02f836..c915c062a43dda96ce79a5f62a24029aabad97d4 100644
--- a/PPI/Connectors.hh
+++ b/PPI/Connectors.hh
@@ -329,4 +329,5 @@ namespace connector {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Events.hh b/PPI/Events.hh
index ed35f1f32a7c150bc2873c3012333e8fe4864a20..154beba620804f0c13530aefa642ef4a660da07b 100644
--- a/PPI/Events.hh
+++ b/PPI/Events.hh
@@ -79,4 +79,5 @@ namespace ppi {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Module.hh b/PPI/Module.hh
index 6f998c0417e2657d4fda5cf098b120384f5640b6..30d52d9892a1d290811674bddc4e810b69cbb219 100644
--- a/PPI/Module.hh
+++ b/PPI/Module.hh
@@ -144,4 +144,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/PassiveQueue.hh b/PPI/PassiveQueue.hh
index 5bc0d2ab7659f0e4b77c5e4c73bdbef78c59ce1e..0d07b5016532d142a882b0c9b8871c44390b0280 100644
--- a/PPI/PassiveQueue.hh
+++ b/PPI/PassiveQueue.hh
@@ -74,4 +74,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Queueing.hh b/PPI/Queueing.hh
index 7ac162e9978e4b4da530ccbca34117a7079b223d..9e3acf8f0b0e93456d7421253bbc3645b6ee70dc 100644
--- a/PPI/Queueing.hh
+++ b/PPI/Queueing.hh
@@ -74,4 +74,5 @@ namespace ppi {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/Route.hh b/PPI/Route.hh
index 1982d87f8d698b39abbdd663e3ccb82c6a305504..79e478dfd53824f1ccb038048493b88df4241cf2 100644
--- a/PPI/Route.hh
+++ b/PPI/Route.hh
@@ -79,4 +79,5 @@ namespace ppi {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/SocketReader.hh b/PPI/SocketReader.hh
index 2b1245b01909cf7d69e79d94ee2a17e85dc96231..4d0c626072cdeb4c438ae44bd0785570e191d60d 100644
--- a/PPI/SocketReader.hh
+++ b/PPI/SocketReader.hh
@@ -113,4 +113,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/PPI/SocketWriter.hh b/PPI/SocketWriter.hh
index b954e9a59f9a89cd320085e7b02ba8542a30c227..7e134380f1ec5e17748b5fc211c823a7c9e15864 100644
--- a/PPI/SocketWriter.hh
+++ b/PPI/SocketWriter.hh
@@ -140,4 +140,5 @@ namespace module {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DataPacket.cc b/Packets/DataPacket.cc
index 5cf0c82a6186b251dfce815793a206527dd31893..7a29da09406f11ae06441d46fd112d93bc1a58c7 100644
--- a/Packets/DataPacket.cc
+++ b/Packets/DataPacket.cc
@@ -55,4 +55,5 @@ prefix_ void senf::DataPacket::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DataPacket.cti b/Packets/DataPacket.cti
index 06853c45c464201db62c5c155e4b37978b5a292f..593bccdc88de19daea5e11bc440d03bbd1d8b363 100644
--- a/Packets/DataPacket.cti
+++ b/Packets/DataPacket.cti
@@ -45,4 +45,5 @@ prefix_ senf::DataPacket::DataPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DataPacket.hh b/Packets/DataPacket.hh
index 1e2fc8a652506e1040bb870650d31b03089cea8f..fe1bc68619183153285390bac610880cc62b878b 100644
--- a/Packets/DataPacket.hh
+++ b/Packets/DataPacket.hh
@@ -80,4 +80,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.cc b/Packets/DefaultBundle/EthernetPacket.cc
index 996f9297adbcf49d4b3dc2fa18a841e7c732a152..aef7dca1c34daae0ee139dd929fb1570975007f0 100644
--- a/Packets/DefaultBundle/EthernetPacket.cc
+++ b/Packets/DefaultBundle/EthernetPacket.cc
@@ -113,4 +113,5 @@ prefix_ void senf::EthVLanPacket::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.cti b/Packets/DefaultBundle/EthernetPacket.cti
index 8bdd9387b03da90bfcb9f5e11f245cb75c86d332..3289e49865e5e541ad9178e39a6aa9cf5986d7ce 100644
--- a/Packets/DefaultBundle/EthernetPacket.cti
+++ b/Packets/DefaultBundle/EthernetPacket.cti
@@ -50,4 +50,5 @@ prefix_ senf::EthVLanPacket::EthVLanPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh
index 2fb814c16be88351b6b5d2983047a6681d63e9fd..e8487fc6d2a8366688b1c23e6099b720cea7ffb9 100644
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -154,4 +154,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/EthernetPacket.test.cc b/Packets/DefaultBundle/EthernetPacket.test.cc
index eb95b5a9e6079c98ba23b5b90467d013320f5be3..403471ac1a8416726db59b126a5cb29249abc124 100644
--- a/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/Packets/DefaultBundle/EthernetPacket.test.cc
@@ -96,4 +96,5 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_chain)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.cc b/Packets/DefaultBundle/IpV4Packet.cc
index eaa3a51a2715504f00b6a6315d5f0af2bf872294..569bcba5138b66d4c50882798a8d5fef44af2aa9 100644
--- a/Packets/DefaultBundle/IpV4Packet.cc
+++ b/Packets/DefaultBundle/IpV4Packet.cc
@@ -87,4 +87,5 @@ prefix_ void senf::IpV4Packet::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.cti b/Packets/DefaultBundle/IpV4Packet.cti
index 491332cb88aa583487c862756732cd3fcaa811db..a1661b49c6446c2c4650d6822b107f0a09686c29 100644
--- a/Packets/DefaultBundle/IpV4Packet.cti
+++ b/Packets/DefaultBundle/IpV4Packet.cti
@@ -45,4 +45,5 @@ prefix_ senf::IpV4Packet::IpV4Packet(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.hh b/Packets/DefaultBundle/IpV4Packet.hh
index c8566444567015585d8dd633de8a737521f77f43..06932a02522cd2dd9ad28bcf86608ca8e1282f1f 100644
--- a/Packets/DefaultBundle/IpV4Packet.hh
+++ b/Packets/DefaultBundle/IpV4Packet.hh
@@ -122,4 +122,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV4Packet.test.cc b/Packets/DefaultBundle/IpV4Packet.test.cc
index fb1f6286d1c19970235c59eea9c0cb998d49c0da..4f02fb9284c31404dfb7273a2df1d6d79592a09f 100644
--- a/Packets/DefaultBundle/IpV4Packet.test.cc
+++ b/Packets/DefaultBundle/IpV4Packet.test.cc
@@ -111,4 +111,5 @@ BOOST_AUTO_UNIT_TEST(ipV4Packet_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.cc b/Packets/DefaultBundle/IpV6Extensions.cc
index 5d823dca3f19ac3352d805f0c8ec375467b3e2fc..df38466a14b92cd054dabf40e1e089fd66642c7b 100644
--- a/Packets/DefaultBundle/IpV6Extensions.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.cc
@@ -66,4 +66,5 @@ prefix_ void senf::IpV6Extension_Fragment::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.ct b/Packets/DefaultBundle/IpV6Extensions.ct
index 4ff700e222a5ecfe8e2005255d9c3c07eb2be2b9..67520a79b9153bf6e8384e409172d48e6154d861 100644
--- a/Packets/DefaultBundle/IpV6Extensions.ct
+++ b/Packets/DefaultBundle/IpV6Extensions.ct
@@ -44,4 +44,5 @@ prefix_ senf::IpV6Extension_Fragment::IpV6Extension_Fragment(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.hh b/Packets/DefaultBundle/IpV6Extensions.hh
index 7bf1a566cce0db42a356726ffb1df4e5adcc3c4d..380a2bb3a5a1acd72409b2b112ba38e9ad9c3951 100644
--- a/Packets/DefaultBundle/IpV6Extensions.hh
+++ b/Packets/DefaultBundle/IpV6Extensions.hh
@@ -102,4 +102,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Extensions.test.cc b/Packets/DefaultBundle/IpV6Extensions.test.cc
index 86bd27ae1268601102c0e6f109fbb58eef91349a..02143519d579dfe281fe4ab09474c961fdf1666d 100644
--- a/Packets/DefaultBundle/IpV6Extensions.test.cc
+++ b/Packets/DefaultBundle/IpV6Extensions.test.cc
@@ -119,4 +119,5 @@ BOOST_AUTO_UNIT_TEST(ipv6Extension_Fragment_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.cc b/Packets/DefaultBundle/IpV6Packet.cc
index 318b84e46cb4a31a7eb8b87f0c3e2eb89e0b391b..b8c1fb5158cdb6a7ce86e2a513e6ad167cc22cf9 100644
--- a/Packets/DefaultBundle/IpV6Packet.cc
+++ b/Packets/DefaultBundle/IpV6Packet.cc
@@ -78,4 +78,5 @@ prefix_ void senf::IpV6Packet::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.cti b/Packets/DefaultBundle/IpV6Packet.cti
index a95ef4d0657d2d70e2f4fb0f403c40cdbf241076..ef7a29f743f2ec3bfef024ef66c5e3eeaa96f38c 100644
--- a/Packets/DefaultBundle/IpV6Packet.cti
+++ b/Packets/DefaultBundle/IpV6Packet.cti
@@ -44,4 +44,5 @@ prefix_ senf::IpV6Packet::IpV6Packet(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.hh b/Packets/DefaultBundle/IpV6Packet.hh
index d7809a365c7ec7f5a48fc04cd33eec0eddfb2833..26ab7933d65d2bf1780654752ec30e731269d81e 100644
--- a/Packets/DefaultBundle/IpV6Packet.hh
+++ b/Packets/DefaultBundle/IpV6Packet.hh
@@ -110,4 +110,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/IpV6Packet.test.cc b/Packets/DefaultBundle/IpV6Packet.test.cc
index ae64a744ef04a1d70ba75b0dd8beef3096656039..9385937bb7948a9683a092e3ea495320b3c393b3 100644
--- a/Packets/DefaultBundle/IpV6Packet.test.cc
+++ b/Packets/DefaultBundle/IpV6Packet.test.cc
@@ -99,4 +99,5 @@ BOOST_AUTO_UNIT_TEST(ipV6Packet_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.cc b/Packets/DefaultBundle/UDPPacket.cc
index 31f49517bc92ab8f61da1dd6264c567661f5bcb6..ce7da558c3086e6f96ba65427e2fb6c948868926 100644
--- a/Packets/DefaultBundle/UDPPacket.cc
+++ b/Packets/DefaultBundle/UDPPacket.cc
@@ -67,4 +67,5 @@ prefix_ void senf::UDPPacket::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.cti b/Packets/DefaultBundle/UDPPacket.cti
index db0ef73f6c33fa267ed33482cd4382bad1ba5c9a..60f572a0287b8dffc50d6ed5c497525e58f82ee0 100644
--- a/Packets/DefaultBundle/UDPPacket.cti
+++ b/Packets/DefaultBundle/UDPPacket.cti
@@ -47,4 +47,5 @@ prefix_ senf::UDPPacket::UDPPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.hh b/Packets/DefaultBundle/UDPPacket.hh
index 58b945587adfeb08c0366cf038ea5cc1d15020c7..2935f409fa6505137b0004d4ec7e92b8b5547ed8 100644
--- a/Packets/DefaultBundle/UDPPacket.hh
+++ b/Packets/DefaultBundle/UDPPacket.hh
@@ -97,4 +97,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/UDPPacket.test.cc b/Packets/DefaultBundle/UDPPacket.test.cc
index a7364b7b8634e39ec71b40d3e57c37e6e8f68a34..5e236d5ee2fb1bd5c0a21e2041965dc3b74a04a6 100644
--- a/Packets/DefaultBundle/UDPPacket.test.cc
+++ b/Packets/DefaultBundle/UDPPacket.test.cc
@@ -82,4 +82,5 @@ BOOST_AUTO_UNIT_TEST(udpPacket_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/DefaultBundle/main.test.cc b/Packets/DefaultBundle/main.test.cc
index a7b3fb509357af20be24b2fa368ea972de8301b9..7607fdcbc6d6b2c665ad27a47e24f3c03d492903 100644
--- a/Packets/DefaultBundle/main.test.cc
+++ b/Packets/DefaultBundle/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/GenericPacket.ct b/Packets/GenericPacket.ct
index 7f91b4b7ffa1beb234fa20f8f32b3d7d431615c9..59cede2c48fc8000b743bb8845fbe619d76cb8a1 100644
--- a/Packets/GenericPacket.ct
+++ b/Packets/GenericPacket.ct
@@ -58,4 +58,5 @@ prefix_ void senf::GenericPacket<HEADER,TRAILER>::v_dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/GenericPacket.cti b/Packets/GenericPacket.cti
index 495e2ec0df52e906e8a7c822562cf17eaf2ef9bc..551ab8d59d5ea5ac3a755e72fc5c47394a6b5079 100644
--- a/Packets/GenericPacket.cti
+++ b/Packets/GenericPacket.cti
@@ -99,4 +99,5 @@ senf::GenericPacket<HEADER,TRAILER>::trailer_len()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/GenericPacket.hh b/Packets/GenericPacket.hh
index 939cd3a137e75d5589634cc47231b87a9f65bc32..cb8d39c3160d5aff212ae28e8dbd4481b916b706 100644
--- a/Packets/GenericPacket.hh
+++ b/Packets/GenericPacket.hh
@@ -92,4 +92,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.cc b/Packets/Packet.cc
index cbb824a603d432c73edaf4f180aa1f3cd82e8dbb..0ca332195ca02536d1832d58a614cb175c0c5497 100644
--- a/Packets/Packet.cc
+++ b/Packets/Packet.cc
@@ -296,4 +296,5 @@ prefix_ void senf::Packet::dump(std::ostream & os)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.cci b/Packets/Packet.cci
index 8033bd3bf89a77fbb4be9c11dbdf6d51d10b7a68..13339b8ba83b3c1585d241cbecf59841f82b7058 100644
--- a/Packets/Packet.cci
+++ b/Packets/Packet.cci
@@ -195,4 +195,5 @@ prefix_ bool senf::Packet::unlink()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.ct b/Packets/Packet.ct
index 734c4afd09258518217d0e7fd1ec809943e2aa5a..44a53c6f33af2ff46498af017fdf5797faec4b17 100644
--- a/Packets/Packet.ct
+++ b/Packets/Packet.ct
@@ -153,4 +153,5 @@ prefix_ void senf::Packet::insert(iterator pos, InputIterator f, InputIterator l
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.cti b/Packets/Packet.cti
index 2f655a7f0601a1f63e66bafeb01b219b1d4cbd35..7f222690d459ceaa34b123733984906ea16774af 100644
--- a/Packets/Packet.cti
+++ b/Packets/Packet.cti
@@ -71,4 +71,5 @@ prefix_ senf::impl::PacketImpl::PacketImpl(InputIterator begin, InputIterator en
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.hh b/Packets/Packet.hh
index f396042613f74e66b61b42da4e3f768942da060b..6cffcaef808f5b8e1df5752e92bb06d6bfd65487 100644
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -627,4 +627,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.ih b/Packets/Packet.ih
index 741b280c9263189937530fb19472361edd3ec8de..dcdaab4e987f21bbd910016e5657dc35ff29a896 100644
--- a/Packets/Packet.ih
+++ b/Packets/Packet.ih
@@ -144,4 +144,5 @@ struct senf::Packet::PacketOp_set
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc
index a777309647a9afc0e81d4f365b25f51951ac1438..bc565de79906fa813d59f1f0cdefb3c16a292a76 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -248,4 +248,5 @@ BOOST_AUTO_UNIT_TEST(Packet_new)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.cc b/Packets/PacketRegistry.cc
index a544c8216cd19d48f9446641ad82a96ee5096693..e563a815561e8c98e0e97c8f971360039514cdf5 100644
--- a/Packets/PacketRegistry.cc
+++ b/Packets/PacketRegistry.cc
@@ -44,4 +44,5 @@ senf::impl::PkReg_EntryImpl<senf::DataPacket>
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.ct b/Packets/PacketRegistry.ct
index 7d0b690e9d776824a855bfe080178eb7c2e302a8..f3dd1a1c90ed2822e5909e246232328ef6afb341 100644
--- a/Packets/PacketRegistry.ct
+++ b/Packets/PacketRegistry.ct
@@ -108,4 +108,5 @@ senf::PacketRegistry<Tag>::registry()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.cti b/Packets/PacketRegistry.cti
index 988ba36ee514ba8c2099b228b09b4a03cbb26e62..72e503a850cec368436ad8b92dd096d7c490f867 100644
--- a/Packets/PacketRegistry.cti
+++ b/Packets/PacketRegistry.cti
@@ -84,4 +84,5 @@ senf::PacketRegistryMixin<Tag,Derived>::registerInterpreter(typename Tag::key_t
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.hh b/Packets/PacketRegistry.hh
index 9bdfa75abbc89c45e02f42141e6c83f9f02837b9..9174395b4600abcd393439a64ff584e1b64b9e8d 100644
--- a/Packets/PacketRegistry.hh
+++ b/Packets/PacketRegistry.hh
@@ -206,4 +206,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.ih b/Packets/PacketRegistry.ih
index 38cdb97731ecd285ca0c5d71f83e1fe80f6142a1..75159df9798771184dc3467c16f36a755933d8c9 100644
--- a/Packets/PacketRegistry.ih
+++ b/Packets/PacketRegistry.ih
@@ -110,4 +110,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketRegistry.test.cc b/Packets/PacketRegistry.test.cc
index ed584fc66038987788e99409e21fd4e8eb816bf6..aebe11a2440d615b5d4cd3916764991793914614 100644
--- a/Packets/PacketRegistry.test.cc
+++ b/Packets/PacketRegistry.test.cc
@@ -172,4 +172,5 @@ BOOST_AUTO_UNIT_TEST(packetRegistry_test)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseArray.cti b/Packets/ParseArray.cti
index 52632ebfb76d2065e67a9f3aed18a8b9ecd8619d..5fc715906cb8e8734dabc39f1921d1788e9418af 100644
--- a/Packets/ParseArray.cti
+++ b/Packets/ParseArray.cti
@@ -207,4 +207,5 @@ senf::impl::Parse_Array_iterator<Parser,Iterator>::advance(int n)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseArray.hh b/Packets/ParseArray.hh
index a88d984ba671b3284a4cac4cca05b12cf96c4a97..ee39b49ce75a9cbd6774e2594f331b07ad19d6bf 100644
--- a/Packets/ParseArray.hh
+++ b/Packets/ParseArray.hh
@@ -92,4 +92,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseArray.ih b/Packets/ParseArray.ih
index 16783856212cc3dd954c0e1b342924a003291577..5ac5d033e4038833deb5ca1eb5bc580fcfb29f40 100644
--- a/Packets/ParseArray.ih
+++ b/Packets/ParseArray.ih
@@ -70,4 +70,5 @@ private:
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc
index 8d1e903f85a1062bbc42f96b54cf330f8e65ad2b..b2afcdbdcf9ded9568b7de686d730df4378392ab 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -68,4 +68,5 @@ BOOST_AUTO_UNIT_TEST(parseArray_test)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseInt.hh b/Packets/ParseInt.hh
index fb201147ab0096ac0f48f92b5fa1b5f4bb8f74a5..6f219e3b15d2e3d465575d39342f56d0c164b0d7 100644
--- a/Packets/ParseInt.hh
+++ b/Packets/ParseInt.hh
@@ -355,4 +355,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseInt.ih b/Packets/ParseInt.ih
index b6aec456e9033b7bad0ee76e63464dca3202de4e..ff44c58d728c2eedef1f64888942d932f34f76f6 100644
--- a/Packets/ParseInt.ih
+++ b/Packets/ParseInt.ih
@@ -225,4 +225,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseInt.test.cc b/Packets/ParseInt.test.cc
index 82daef1ab43b87fe168280063267c031d80d54c9..be69c8668e43532f565f004692af4e68cc49297b 100644
--- a/Packets/ParseInt.test.cc
+++ b/Packets/ParseInt.test.cc
@@ -242,4 +242,5 @@ BOOST_AUTO_UNIT_TEST(parseInt_inherited)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.ct b/Packets/ParseListS.ct
index 1f1dabbcc2ea30591c0ee5da51ffb6bf8e4dfc73..a96196f844a9bf1dd62708d8b27e95c3e613edb1 100644
--- a/Packets/ParseListS.ct
+++ b/Packets/ParseListS.ct
@@ -122,4 +122,5 @@ senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::insert(iterator pos,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.cti b/Packets/ParseListS.cti
index 8c77102f780ccc69cd5dac427cef5660d69bfd8b..49e767c195d34d6e8b99b39f12aa2921f3f9bebf 100644
--- a/Packets/ParseListS.cti
+++ b/Packets/ParseListS.cti
@@ -202,4 +202,5 @@ senf::Parse_ListS_wrapper<Parser,Sentinel,Container>::range()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.hh b/Packets/ParseListS.hh
index ecbb4d14a042e023a93500b49c5c0809ebc80241..7a777d80b5a6a12222e7834cf4bdbb592bc021ea 100644
--- a/Packets/ParseListS.hh
+++ b/Packets/ParseListS.hh
@@ -196,4 +196,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.ih b/Packets/ParseListS.ih
index dad395ca51d87f50034c51376bc42cff5909e424..114259b11072625cf06e807ff2f9cc011efd9da0 100644
--- a/Packets/ParseListS.ih
+++ b/Packets/ParseListS.ih
@@ -70,4 +70,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseListS.test.cc b/Packets/ParseListS.test.cc
index a317d7d9b2f0e70358dc16ee4283c1a61777d0a2..b7d1907c1aede0a2a6a4a44c1374e9cdc69db9f0 100644
--- a/Packets/ParseListS.test.cc
+++ b/Packets/ParseListS.test.cc
@@ -175,4 +175,5 @@ BOOST_AUTO_UNIT_TEST(parse_ListS_wrapper)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseVec.ct b/Packets/ParseVec.ct
index 7834140ae4b72a513b497578eac1e75dcf92e828..9aabd74ac34726ef3014b564a0ee430d4bab4668 100644
--- a/Packets/ParseVec.ct
+++ b/Packets/ParseVec.ct
@@ -83,4 +83,5 @@ senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::insert(iterator pos,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseVec.cti b/Packets/ParseVec.cti
index f1bdf85fd2d3bcaf01eb4ac2b526741b627e4ac8..7b30ef5b13f74e2bd67ff2a91de4dfe6ef1075d8 100644
--- a/Packets/ParseVec.cti
+++ b/Packets/ParseVec.cti
@@ -225,4 +225,5 @@ prefix_ void senf::Parse_Vector_wrapper<Parser,SizeParser,Container>::clear()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseVec.hh b/Packets/ParseVec.hh
index 2d2b0b5bb2c7064140388e235334c484b9a07144..fe01842d721dfedcabe5bbdda8c465c1f40327f5 100644
--- a/Packets/ParseVec.hh
+++ b/Packets/ParseVec.hh
@@ -176,4 +176,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc
index 42afcb0d0984be61ab22bcea5775d8c48599906f..a66e1bdd34d070c958fed96ecdece22760bcc8a1 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -154,4 +154,5 @@ BOOST_AUTO_UNIT_TEST(parserTraits_test)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.cti b/Packets/ParserBase.cti
index 4cd419813a52d2a7667b08f9f3effb2c122f5ff6..3f49eca3e9aa3ed87b7fa6dc3be8f1f54a49bd3c 100644
--- a/Packets/ParserBase.cti
+++ b/Packets/ParserBase.cti
@@ -97,4 +97,5 @@ prefix_ unsigned senf::min_bytes()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.hh b/Packets/ParserBase.hh
index dcdce00fccff6b95288a010572eb577fbcd757a2..a985645a97647e127f4dfb53b2f8d14cb8278747 100644
--- a/Packets/ParserBase.hh
+++ b/Packets/ParserBase.hh
@@ -310,4 +310,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.ih b/Packets/ParserBase.ih
index 8eee2346dc1a8f6e741952585389ce6d0f2dbbb4..5606977c38fb05aebf24daca8b0c562817d4c63e 100644
--- a/Packets/ParserBase.ih
+++ b/Packets/ParserBase.ih
@@ -100,4 +100,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParserBase.test.cc b/Packets/ParserBase.test.cc
index a2800033c0ec65e81f5a76fa18eb992cd6cb60e1..213cbd714e9136946e4c097e22b297b82cd946fa 100644
--- a/Packets/ParserBase.test.cc
+++ b/Packets/ParserBase.test.cc
@@ -107,4 +107,5 @@ BOOST_AUTO_UNIT_TEST(parserBase_construction)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.cc b/Packets/RTPBundle/RTCPPacket.cc
index bf4ecc0a37b4c6e618c32d10d737d89810a53a95..1985a678f5c41387203c1d0ce956378c2f4ff17c 100644
--- a/Packets/RTPBundle/RTCPPacket.cc
+++ b/Packets/RTPBundle/RTCPPacket.cc
@@ -52,4 +52,5 @@ prefix_ void senf::RTCPPacket::v_finalize()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.cti b/Packets/RTPBundle/RTCPPacket.cti
index b65c9c6755c2feee3e9e028ef841563b5a1310aa..eb377a0e224da249a6086205d3e386346f7f7f48 100644
--- a/Packets/RTPBundle/RTCPPacket.cti
+++ b/Packets/RTPBundle/RTCPPacket.cti
@@ -45,4 +45,5 @@ prefix_ senf::RTCPPacket::RTCPPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.hh b/Packets/RTPBundle/RTCPPacket.hh
index fb71573d08398865bc8110e98f5a794ea49ea010..e0532f95b7d22cc24a2dbfce75e8b279014bcb3d 100644
--- a/Packets/RTPBundle/RTCPPacket.hh
+++ b/Packets/RTPBundle/RTCPPacket.hh
@@ -316,4 +316,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTCPPacket.test.cc b/Packets/RTPBundle/RTCPPacket.test.cc
index 0380c7c405fecf538f952f26436fcea8c471e8a4..06c7a7411b915f3786707704797d83cabc861e68 100644
--- a/Packets/RTPBundle/RTCPPacket.test.cc
+++ b/Packets/RTPBundle/RTCPPacket.test.cc
@@ -340,4 +340,5 @@ BOOST_AUTO_UNIT_TEST(rtcpPacket_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.cc b/Packets/RTPBundle/RTPPacket.cc
index ed1eaa89e3d271c2537536b4fb93abbe675b119f..c53270d6aa0416cf9cf12c5ea85bb4c014513400 100644
--- a/Packets/RTPBundle/RTPPacket.cc
+++ b/Packets/RTPBundle/RTPPacket.cc
@@ -106,4 +106,5 @@ prefix_ void senf::RTPUnknownExtensionPacket::v_finalize()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.cti b/Packets/RTPBundle/RTPPacket.cti
index 4c11a838e7cbd44e23be9ddbda965dd886caf2f4..d462c1fbe6b00e8d90d7c4d747976141903bb14d 100644
--- a/Packets/RTPBundle/RTPPacket.cti
+++ b/Packets/RTPBundle/RTPPacket.cti
@@ -57,4 +57,5 @@ RTPUnknownExtensionPacket(Arg const & arg)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.hh b/Packets/RTPBundle/RTPPacket.hh
index 17be86ab7c7a9e0c9fe92cce5712ff978887754b..512ba88a96e9bc1ff182aac7b13597e9c7ae3fed 100644
--- a/Packets/RTPBundle/RTPPacket.hh
+++ b/Packets/RTPBundle/RTPPacket.hh
@@ -225,4 +225,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/RTPPacket.test.cc b/Packets/RTPBundle/RTPPacket.test.cc
index 63311f9713311a4ff0ab8c957fd128366bcd225e..9311ffe09de0cf0c96804621febd75cead4246a1 100644
--- a/Packets/RTPBundle/RTPPacket.test.cc
+++ b/Packets/RTPBundle/RTPPacket.test.cc
@@ -247,4 +247,5 @@ BOOST_AUTO_UNIT_TEST(eth_rtpPacket_packet)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/RTPBundle/main.test.cc b/Packets/RTPBundle/main.test.cc
index a7b3fb509357af20be24b2fa368ea972de8301b9..7607fdcbc6d6b2c665ad27a47e24f3c03d492903 100644
--- a/Packets/RTPBundle/main.test.cc
+++ b/Packets/RTPBundle/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/docstub.hh b/Packets/docstub.hh
index 3bfd41dc53321b232e54a194fa16519a15f35ef2..29cf7e08611a10fc64d47eb6a4d94a593c26e827 100644
--- a/Packets/docstub.hh
+++ b/Packets/docstub.hh
@@ -60,4 +60,5 @@ namespace std {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/main.test.cc b/Packets/main.test.cc
index 15b8f3138d568ed1b0385f9e0ba6243f8399419b..b759387fbca292242de194b77da0f6ad98b714b1 100644
--- a/Packets/main.test.cc
+++ b/Packets/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/typeidvalue.cci b/Packets/typeidvalue.cci
index bb65104e79a8d306a2780832753dde082536885b..1d65269115a0b26dffd15777b543bcfe8c47c096 100644
--- a/Packets/typeidvalue.cci
+++ b/Packets/typeidvalue.cci
@@ -79,4 +79,5 @@ prefix_ senf::TypeIdValue const senf::typeIdValue()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/typeidvalue.cti b/Packets/typeidvalue.cti
index eed794b3cb3dff67bda52108a9bf7c66cba1be87..ebebe47e1729d7cc7ed9cc71a21ea1f47fd6bf27 100644
--- a/Packets/typeidvalue.cti
+++ b/Packets/typeidvalue.cti
@@ -64,4 +64,5 @@ prefix_ senf::TypeIdValue const senf::typeIdValue()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/typeidvalue.hh b/Packets/typeidvalue.hh
index cd6389bf60ba8eb68f198bfdd37f3c4c2e23e950..a212051b51b126273b53318390623d531ca732e1 100644
--- a/Packets/typeidvalue.hh
+++ b/Packets/typeidvalue.hh
@@ -105,4 +105,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.cci b/Scheduler/ReadHelper.cci
index 944c5ef4ed8bbcf2c5a74297c783ef2b131a8a5a..17ffa4adfb680f086463f65b7b4fb74de8d85808 100644
--- a/Scheduler/ReadHelper.cci
+++ b/Scheduler/ReadHelper.cci
@@ -46,4 +46,5 @@ prefix_ std::string::size_type senf::ReadUntil::operator()(std::string const & d
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.ct b/Scheduler/ReadHelper.ct
index 35fbc1c3b863ca83bb58ada1e11008e46b5313fc..ce7e75c926fcca23fc93bb7ee2a83e23cb13dca3 100644
--- a/Scheduler/ReadHelper.ct
+++ b/Scheduler/ReadHelper.ct
@@ -120,4 +120,5 @@ operator()(std::string const & data)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.cti b/Scheduler/ReadHelper.cti
index 8fd8ae254d05e32ecb8f9b9bc1aaa22e732b5b24..380091ad05fb35cb5b6f13157e1d0bf987be4041 100644
--- a/Scheduler/ReadHelper.cti
+++ b/Scheduler/ReadHelper.cti
@@ -108,4 +108,5 @@ prefix_ void senf::ReadHelper<Handle>::throw_error()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.hh b/Scheduler/ReadHelper.hh
index 2b7bdb30e41aaa816b25b552c5e2b98c8cb26928..449532f8434dd631f3cc21864e068fc3d8824582 100644
--- a/Scheduler/ReadHelper.hh
+++ b/Scheduler/ReadHelper.hh
@@ -178,4 +178,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.ih b/Scheduler/ReadHelper.ih
index e73892f938042071055072924e69ec7b136c23b4..619574b5489322b088e63773318b635785088e54 100644
--- a/Scheduler/ReadHelper.ih
+++ b/Scheduler/ReadHelper.ih
@@ -75,4 +75,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/ReadHelper.test.cc b/Scheduler/ReadHelper.test.cc
index 9e5f589dc68af2839a0c07823c7cdac1f4cc5f9d..79b0715815cce2ca39bfbc46cfe8a93aaec7b4c5 100644
--- a/Scheduler/ReadHelper.test.cc
+++ b/Scheduler/ReadHelper.test.cc
@@ -29,4 +29,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.cc b/Scheduler/Scheduler.cc
index 65b3f0998501478ca207859fd6dd94a6011c9df9..ed6649df547ccdb8e261c278aa3ea8eb07044bf6 100644
--- a/Scheduler/Scheduler.cc
+++ b/Scheduler/Scheduler.cc
@@ -233,4 +233,5 @@ prefix_ void senf::Scheduler::process()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.cci b/Scheduler/Scheduler.cci
index 8bdf5b085dc254966100324f2c33b2d5b8967c0a..230870545751b338c3239c29586063026f841d34 100644
--- a/Scheduler/Scheduler.cci
+++ b/Scheduler/Scheduler.cci
@@ -52,4 +52,5 @@ prefix_ int senf::retrieve_filehandle(int fd)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.cti b/Scheduler/Scheduler.cti
index d263e4ab3e56afe1847cd516da48f8713c46d60b..e3cb21f4fc3c6411459c1925e18d93c00fb8f7a3 100644
--- a/Scheduler/Scheduler.cti
+++ b/Scheduler/Scheduler.cti
@@ -61,4 +61,5 @@ prefix_ void senf::Scheduler::remove(Handle const & handle, int eventMask)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.hh b/Scheduler/Scheduler.hh
index fb1aebf2f07e5a4d1855c1f4da8aa6e411e4777d..12b4b6cf081c8ee69b67d8c588721383eddde5f4 100644
--- a/Scheduler/Scheduler.hh
+++ b/Scheduler/Scheduler.hh
@@ -234,4 +234,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/Scheduler.test.cc b/Scheduler/Scheduler.test.cc
index 64a0d3dfb983668385b4cfae90708a788af38aa2..0e178691adf6e0557086e303b0cfbd24db8ff66e 100644
--- a/Scheduler/Scheduler.test.cc
+++ b/Scheduler/Scheduler.test.cc
@@ -264,4 +264,5 @@ BOOST_AUTO_UNIT_TEST(scheduler)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.ct b/Scheduler/WriteHelper.ct
index f573f95d6fae3640bf78a63257089c83f6a0d0f4..0b18fcc492f357cd9e093d4bb3acad957dc36142 100644
--- a/Scheduler/WriteHelper.ct
+++ b/Scheduler/WriteHelper.ct
@@ -113,4 +113,5 @@ prefix_ void senf::WriteHelper<Handle>::done()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.cti b/Scheduler/WriteHelper.cti
index 53c8433a46661e96bb77eea099966076a805f0b6..12e7e0f76094542ff938442317d774604acf2a02 100644
--- a/Scheduler/WriteHelper.cti
+++ b/Scheduler/WriteHelper.cti
@@ -77,4 +77,5 @@ prefix_ void senf::WriteHelper<Handle>::throw_error()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.hh b/Scheduler/WriteHelper.hh
index aa6af1c970207b5c09e4d1230929d8d5e52611f9..65b58a81a6e9a7941eaea8ef4155551606ac1183 100644
--- a/Scheduler/WriteHelper.hh
+++ b/Scheduler/WriteHelper.hh
@@ -127,4 +127,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/WriteHelper.test.cc b/Scheduler/WriteHelper.test.cc
index db9d45d8490b09ed4cd2eb2b641bdb2b99f9a0b9..ab4f479c29f8ae5789901ff570f90415b1191c52 100644
--- a/Scheduler/WriteHelper.test.cc
+++ b/Scheduler/WriteHelper.test.cc
@@ -29,4 +29,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Scheduler/main.test.cc b/Scheduler/main.test.cc
index 15b8f3138d568ed1b0385f9e0ba6243f8399419b..b759387fbca292242de194b77da0f6ad98b714b1 100644
--- a/Scheduler/main.test.cc
+++ b/Scheduler/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/AddressingPolicy.hh b/Socket/AddressingPolicy.hh
index 529c30c52b002afb5845edb896d235edf0b515cd..825c2453d8cdd9a98bf5e5d5aa36392ac453cc76 100644
--- a/Socket/AddressingPolicy.hh
+++ b/Socket/AddressingPolicy.hh
@@ -66,4 +66,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BSDSocketProtocol.cc b/Socket/BSDSocketProtocol.cc
index 7c40cd9bae698950d52128d5843af11c5657f559..889da3cbe81a56928dcfcb712981bebc02ebfe37 100644
--- a/Socket/BSDSocketProtocol.cc
+++ b/Socket/BSDSocketProtocol.cc
@@ -98,4 +98,5 @@ prefix_ void senf::AddressableBSDSocketProtocol::reuseaddr(bool value)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BSDSocketProtocol.hh b/Socket/BSDSocketProtocol.hh
index ff4799255c649021183d719f730bb79d9bda3265..3743f528f6c459cd3d7d3791b66a06d7ab11d1ba 100644
--- a/Socket/BSDSocketProtocol.hh
+++ b/Socket/BSDSocketProtocol.hh
@@ -107,4 +107,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BufferingPolicy.cc b/Socket/BufferingPolicy.cc
index 2fc21d19d03b6750d44a61929e0224599e9f4828..099bc15868a933a6f8f50ec911ddb3de6ff84e3c 100644
--- a/Socket/BufferingPolicy.cc
+++ b/Socket/BufferingPolicy.cc
@@ -84,4 +84,5 @@ prefix_ void senf::SocketBufferingPolicy::sndbuf(FileHandle handle, unsigned siz
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/BufferingPolicy.hh b/Socket/BufferingPolicy.hh
index c595450c80664ce78cdc6b7859afc98144a6833d..3d353dda206049fdaac50211988b5d9e9e251d6d 100644
--- a/Socket/BufferingPolicy.hh
+++ b/Socket/BufferingPolicy.hh
@@ -85,4 +85,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.ct b/Socket/ClientSocketHandle.ct
index 9502fd70b50dff2af91ce00474a75c57f069e0ae..b51abbd6a39c620761bff53fad16727017a5b51a 100644
--- a/Socket/ClientSocketHandle.ct
+++ b/Socket/ClientSocketHandle.ct
@@ -167,4 +167,5 @@ prefix_ unsigned senf::ClientSocketHandle<Policy>::available()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.cti b/Socket/ClientSocketHandle.cti
index 9d56f8704bbd58e8e7840c8eb08f68d7d2fe35b6..b3c124045888b1559cb0ebe079467f9988fbf2f7 100644
--- a/Socket/ClientSocketHandle.cti
+++ b/Socket/ClientSocketHandle.cti
@@ -391,4 +391,5 @@ prefix_ std::string senf::ClientSocketHandle<Policy>::dumpState(unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.hh b/Socket/ClientSocketHandle.hh
index 0cca5f29895f3c9cc0473c407551ce446e73fff3..2b6f4250a92dda1f3c386e50b38ac3e9d34ca731 100644
--- a/Socket/ClientSocketHandle.hh
+++ b/Socket/ClientSocketHandle.hh
@@ -452,4 +452,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.ih b/Socket/ClientSocketHandle.ih
index e970c1a1629db886507baf8beb1f277eaae44e57..6ee58369db3bc3eed6e2aacb486f0a113ea39823 100644
--- a/Socket/ClientSocketHandle.ih
+++ b/Socket/ClientSocketHandle.ih
@@ -93,4 +93,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index 11d717da98aebfd2e788b644f77fdfc514a56e54..37494d79a3d96b520db6aa50df3f75c3d84958e9 100644
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -148,4 +148,5 @@ BOOST_AUTO_UNIT_TEST(clientSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/CommunicationPolicy.cc b/Socket/CommunicationPolicy.cc
index 5e6e561a6c5cd9ad94e7256ef2ae506915d64933..d67a92369b8fefd17fa155ea3d0eba916afc8d68 100644
--- a/Socket/CommunicationPolicy.cc
+++ b/Socket/CommunicationPolicy.cc
@@ -76,4 +76,5 @@ prefix_ int senf::ConnectedCommunicationPolicy::do_accept(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/CommunicationPolicy.cti b/Socket/CommunicationPolicy.cti
index 6ff7b9304636d4f3f85ba661b490b3e610ae0f48..92b410bf98bac0bbfb5dfb87a4b65aebeaa198ba 100644
--- a/Socket/CommunicationPolicy.cti
+++ b/Socket/CommunicationPolicy.cti
@@ -59,4 +59,5 @@ accept(ServerSocketHandle<Policy> handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/CommunicationPolicy.hh b/Socket/CommunicationPolicy.hh
index f82ed805eaa991369e61fe225d65dc2c50fac71d..1f8bb032754b75444008c5fc64999ec21941ec3f 100644
--- a/Socket/CommunicationPolicy.hh
+++ b/Socket/CommunicationPolicy.hh
@@ -105,4 +105,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.cc b/Socket/FileHandle.cc
index daae811b2d779ab3338ea5eff614d6ec4397bb1a..0cc9b79cff40146b9028a03d3a87d265087d2036 100644
--- a/Socket/FileHandle.cc
+++ b/Socket/FileHandle.cc
@@ -113,4 +113,5 @@ prefix_ bool senf::FileBody::pollCheck(int fd, bool incoming, bool block)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.cci b/Socket/FileHandle.cci
index 8038c7fb44c31e17f38545cf47f96683cb530171..70161317937fbe9c80a76626fa86eee3f59536db 100644
--- a/Socket/FileHandle.cci
+++ b/Socket/FileHandle.cci
@@ -251,4 +251,5 @@ prefix_ int senf::retrieve_filehandle(FileHandle handle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.hh b/Socket/FileHandle.hh
index bc15651712ebff43363567865dcb2cca145036b4..afb4cd2d3d411a5f34b12117a7befca162358285 100644
--- a/Socket/FileHandle.hh
+++ b/Socket/FileHandle.hh
@@ -210,4 +210,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.ih b/Socket/FileHandle.ih
index 5600e490ae37ad6645ec3279b4277ce49b3e3b81..380b39f484c9d93b46db078b88175c1ebae55e0f 100644
--- a/Socket/FileHandle.ih
+++ b/Socket/FileHandle.ih
@@ -146,4 +146,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FileHandle.test.cc b/Socket/FileHandle.test.cc
index 93c15ea8291bcfc059ce6f9cceb4f6d2afd4ffbf..21b3708b5a1ad40d051271054e05cd302dd7a7a4 100644
--- a/Socket/FileHandle.test.cc
+++ b/Socket/FileHandle.test.cc
@@ -119,4 +119,5 @@ BOOST_AUTO_UNIT_TEST(fileHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/FramingPolicy.hh b/Socket/FramingPolicy.hh
index 2e7785d17248673a9bdf352d01776474a936c189..1bae2d1108be49a375a4c07144119c2400449dcc 100644
--- a/Socket/FramingPolicy.hh
+++ b/Socket/FramingPolicy.hh
@@ -78,4 +78,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericAddressingPolicy.cc b/Socket/GenericAddressingPolicy.cc
index 1d577cc31e1e3e1eda9ab561883321e437133353..2a179a9f28711594d21b1bac31ae4ca7c218ae61 100644
--- a/Socket/GenericAddressingPolicy.cc
+++ b/Socket/GenericAddressingPolicy.cc
@@ -99,4 +99,5 @@ prefix_ void senf::GenericAddressingPolicy_Base::do_connect(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericAddressingPolicy.cti b/Socket/GenericAddressingPolicy.cti
index 28b5337fe2937c605b5581fd424286c9e32d711a..5f7a4a72d9d91a935fd653bd10eca3b8784a2719 100644
--- a/Socket/GenericAddressingPolicy.cti
+++ b/Socket/GenericAddressingPolicy.cti
@@ -79,4 +79,5 @@ prefix_ void senf::GenericAddressingPolicy<Address>::bind(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericAddressingPolicy.hh b/Socket/GenericAddressingPolicy.hh
index 569efdcd7229d3664fe89f1aca3003951569a344..07e67b9d8321e5780ab4e1a770995c5be11b10fd 100644
--- a/Socket/GenericAddressingPolicy.hh
+++ b/Socket/GenericAddressingPolicy.hh
@@ -130,4 +130,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericSockAddr.cci b/Socket/GenericSockAddr.cci
index 5a637257c63e40c564cd3bb31eb806049203cadb..3aa05af4e949b73c2f305f88449df71347275139 100644
--- a/Socket/GenericSockAddr.cci
+++ b/Socket/GenericSockAddr.cci
@@ -57,4 +57,5 @@ prefix_ unsigned senf::GenericSockAddr::sockaddr_len()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/GenericSockAddr.hh b/Socket/GenericSockAddr.hh
index 793463e662ec60e6592a0a48bc929a147264520c..6cbc70686f8f0554e4d2271d80bc814ec4ced7ed 100644
--- a/Socket/GenericSockAddr.hh
+++ b/Socket/GenericSockAddr.hh
@@ -106,4 +106,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.cc b/Socket/INetAddressing.cc
index 941b95e78d7976cdf51998ec000a1a2ed436fc7c..b97777028d4de4abd49dbfa7ff40e4e54c4dff5d 100644
--- a/Socket/INetAddressing.cc
+++ b/Socket/INetAddressing.cc
@@ -232,4 +232,5 @@ prefix_ void senf::INet6SocketAddress::assignIface(std::string const & iface)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.cci b/Socket/INetAddressing.cci
index 4d5bf40071f4de25d5b84fc1a8c407a6ef204d03..45802bcc3fbad1e5f48c400694078c2622013738 100644
--- a/Socket/INetAddressing.cci
+++ b/Socket/INetAddressing.cci
@@ -243,4 +243,5 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, INet6SocketAddress co
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.ct b/Socket/INetAddressing.ct
index 876addbfbd1dfbf1cdbf540f7c37ab8eff3baf8a..db187b3097cc674c365ea0273e7dec3d68efcadf 100644
--- a/Socket/INetAddressing.ct
+++ b/Socket/INetAddressing.ct
@@ -53,4 +53,5 @@ prefix_ senf::INet6Address::INet6Address(Range const & range)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.hh b/Socket/INetAddressing.hh
index f8a74d1419eb83e94f2560923be2f46207b7a4df..a9f172c70563a4675252ba69b9a7a1cdeb82964e 100644
--- a/Socket/INetAddressing.hh
+++ b/Socket/INetAddressing.hh
@@ -347,4 +347,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetAddressing.test.cc b/Socket/INetAddressing.test.cc
index 1ddfebbe92a9c7f88e82ccb4f64a41e1c44f88fa..48398e6c84e9ba26dceac375af6166c6d78ecfd0 100644
--- a/Socket/INetAddressing.test.cc
+++ b/Socket/INetAddressing.test.cc
@@ -171,4 +171,5 @@ BOOST_AUTO_UNIT_TEST(inet6Address)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetProtocol.cc b/Socket/INetProtocol.cc
index 7125c9135cf027f56928e0da690df0b096491438..fff10c01ddebeb8c0c744b97dac853042732d5df 100644
--- a/Socket/INetProtocol.cc
+++ b/Socket/INetProtocol.cc
@@ -82,4 +82,5 @@ prefix_ void senf::IPv6Protocol::bind(INet6SocketAddress const & address)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/INetProtocol.hh b/Socket/INetProtocol.hh
index 12ee76c34a1a09e5f3c92b62a5e819327853e048..df3cea136b6bca8d1b3e45b8fd14bdceeffb2ea5 100644
--- a/Socket/INetProtocol.hh
+++ b/Socket/INetProtocol.hh
@@ -109,4 +109,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.cc b/Socket/LLAddressing.cc
index e362068f7c3ce2d61887c3f9d0d3ede54f18b8c2..c5d5c00505cf72cc0a3a1566d50d26bcfaf3aa24 100644
--- a/Socket/LLAddressing.cc
+++ b/Socket/LLAddressing.cc
@@ -131,4 +131,5 @@ senf::llAddress(std::string address)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.cci b/Socket/LLAddressing.cci
index ce3866d6317a821618b50c743eaff1cbca30eb5d..93deeb35191822f6b2c6d43cc58cf3774b564b41 100644
--- a/Socket/LLAddressing.cci
+++ b/Socket/LLAddressing.cci
@@ -116,4 +116,5 @@ prefix_ unsigned senf::LLSocketAddress::sockaddr_len()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.ct b/Socket/LLAddressing.ct
index 300d20d7cb8f616251c174173237ebeea44ba170..52130e3f61301fcd816963515f31deab9a10bd71 100644
--- a/Socket/LLAddressing.ct
+++ b/Socket/LLAddressing.ct
@@ -89,4 +89,5 @@ prefix_ unsigned char senf::detail::HexConverter::operator()(ForwardRange const
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.cti b/Socket/LLAddressing.cti
index 7b077099e953f84da8500c3ef4d23f23cab4efc3..42e9934a5ec9c3981d7392b149789de88e99b1db 100644
--- a/Socket/LLAddressing.cti
+++ b/Socket/LLAddressing.cti
@@ -53,4 +53,5 @@ LLSocketAddress(ForwardRange const & address, std::string interface,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.hh b/Socket/LLAddressing.hh
index 5bc6a4f1ae5fb8becf1a7e441fd317a03659fb56..779312316a757c3a97873ba99551da8b2abe140a 100644
--- a/Socket/LLAddressing.hh
+++ b/Socket/LLAddressing.hh
@@ -193,4 +193,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.ih b/Socket/LLAddressing.ih
index ddfd874791ad5e039ecec9c48b6b7f32b251e307..a5d7397bc72501e669f696bf7560411277fc751d 100644
--- a/Socket/LLAddressing.ih
+++ b/Socket/LLAddressing.ih
@@ -66,4 +66,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/LLAddressing.test.cc b/Socket/LLAddressing.test.cc
index b9bd7580339618af3546ce74957c37bd043ec878..7e1a06029d14d10f9467473305ddd9cf105c8e0a 100644
--- a/Socket/LLAddressing.test.cc
+++ b/Socket/LLAddressing.test.cc
@@ -86,4 +86,5 @@ BOOST_AUTO_UNIT_TEST(llAddress)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.cc b/Socket/PacketSocketHandle.cc
index 0965aec7ccf9b1743d7ef0312008f9511a5b947a..7250c8c46249213460a1df739d8df281da57d37c 100644
--- a/Socket/PacketSocketHandle.cc
+++ b/Socket/PacketSocketHandle.cc
@@ -105,4 +105,5 @@ prefix_ void senf::PacketProtocol::do_mc_i(std::string interface,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.ct b/Socket/PacketSocketHandle.ct
index ba22740e812ece997fa0c6bd818bfcd64e67824d..5a6eb0c246be4d09f3ae73c8772a242cf9aa35a1 100644
--- a/Socket/PacketSocketHandle.ct
+++ b/Socket/PacketSocketHandle.ct
@@ -56,4 +56,5 @@ senf::detail::Range_LLAddressCopier<ForwardRange>::operator()(unsigned char * ta
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.cti b/Socket/PacketSocketHandle.cti
index f5242802383fadbd6dd7c34fa2cae744c00a68a7..d22e07715aa311a0efbbbbc153d55d1639a2db95 100644
--- a/Socket/PacketSocketHandle.cti
+++ b/Socket/PacketSocketHandle.cti
@@ -73,4 +73,5 @@ prefix_ void senf::PacketProtocol::do_mc(std::string interface,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.hh b/Socket/PacketSocketHandle.hh
index 1f2eb0f3341cc82d3b2fe557668c13bdf33b2309..a435369ba82b9120e95fdc7818f738e92e229631 100644
--- a/Socket/PacketSocketHandle.hh
+++ b/Socket/PacketSocketHandle.hh
@@ -172,4 +172,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.ih b/Socket/PacketSocketHandle.ih
index 9a1db1ccb62f96aa19921c37e7674f0bd746ae5e..58ab1a94f297ed2a21cc2e5e27660c97c88a50f9 100644
--- a/Socket/PacketSocketHandle.ih
+++ b/Socket/PacketSocketHandle.ih
@@ -81,4 +81,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/PacketSocketHandle.test.cc b/Socket/PacketSocketHandle.test.cc
index 562f2c0e2e03ceed518512ce3a2939f83bb48dad..f579885f7a44ad1c26c21f30487ae2f8d81636e3 100644
--- a/Socket/PacketSocketHandle.test.cc
+++ b/Socket/PacketSocketHandle.test.cc
@@ -76,4 +76,5 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolClientSocketHandle.cti b/Socket/ProtocolClientSocketHandle.cti
index 33f73276c723ec1a6aba5bb0f1e9a0da49f2696e..751cf80b4e51d816ef04eafb1102e65203930484 100644
--- a/Socket/ProtocolClientSocketHandle.cti
+++ b/Socket/ProtocolClientSocketHandle.cti
@@ -113,4 +113,5 @@ senf::ProtocolClientSocketHandle<SocketProtocol>::dumpState(unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolClientSocketHandle.hh b/Socket/ProtocolClientSocketHandle.hh
index f64848b6c60779824a8a6d19f00369c5ea8eb0bd..bc39504d3d4b6a4e6309124810a2a06efceb509a 100644
--- a/Socket/ProtocolClientSocketHandle.hh
+++ b/Socket/ProtocolClientSocketHandle.hh
@@ -136,4 +136,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index a2edda82df4cbe5f4f50327325bde32d17125cbf..ad37183b3cb5a5d201bd5a675d554ba4adab3d06 100644
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -78,4 +78,5 @@ BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolServerSocketHandle.cti b/Socket/ProtocolServerSocketHandle.cti
index 7d04977013fcb43cdae7227a8fc3426acf380748..b104c49c5f2f524febca47a82585992335043024 100644
--- a/Socket/ProtocolServerSocketHandle.cti
+++ b/Socket/ProtocolServerSocketHandle.cti
@@ -119,4 +119,5 @@ ProtocolServerSocketHandle(FileHandle other, bool isChecked)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolServerSocketHandle.hh b/Socket/ProtocolServerSocketHandle.hh
index 673e50007fecb750f0d78f02f1fb721c1479f033..d0a358fa1a7d2610282e3164aa423e55794e8180 100644
--- a/Socket/ProtocolServerSocketHandle.hh
+++ b/Socket/ProtocolServerSocketHandle.hh
@@ -141,4 +141,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index 00ac46baa7a50692f38513c600fe9117692317ba..424372979a5fb96c8e6ffb6f08e3d9308fcee4e9 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -91,4 +91,5 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ReadWritePolicy.cc b/Socket/ReadWritePolicy.cc
index 30fcbf7119436a70b04f69cc736d705136fe32df..d5c10c49c7d2975efb95bcc6380594f1cf7f9708 100644
--- a/Socket/ReadWritePolicy.cc
+++ b/Socket/ReadWritePolicy.cc
@@ -133,4 +133,5 @@ prefix_ unsigned senf::WriteablePolicy::do_writeto(FileHandle handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ReadWritePolicy.cti b/Socket/ReadWritePolicy.cti
index 6a2bf027e2d533f97951f9878877239b10a81f37..7bd6ceb44a14b2b1e74a8046fdc7b231a94ef37f 100644
--- a/Socket/ReadWritePolicy.cti
+++ b/Socket/ReadWritePolicy.cti
@@ -69,4 +69,5 @@ writeto(ClientSocketHandle<Policy> handle,
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ReadWritePolicy.hh b/Socket/ReadWritePolicy.hh
index e8846694ad25e879a4491aa4fce381b81cee029b..f5f7207b89c08d9dbe7a8940dd192bdb9ae35f55 100644
--- a/Socket/ReadWritePolicy.hh
+++ b/Socket/ReadWritePolicy.hh
@@ -158,4 +158,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ServerSocketHandle.cti b/Socket/ServerSocketHandle.cti
index 7617ed1bb2b3e7b16f7cc2b60fc9aeea09cd0ea9..715a9a6addfa6077f57289da5469602bd2a9ef0f 100644
--- a/Socket/ServerSocketHandle.cti
+++ b/Socket/ServerSocketHandle.cti
@@ -169,4 +169,5 @@ prefix_ std::string senf::ServerSocketHandle<Policy>::dumpState(unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ServerSocketHandle.hh b/Socket/ServerSocketHandle.hh
index 5fa2126bf10c580a7e0dc79d2fed10295ee14691..879416b6b87a84a68065243c5b656d5ce72c5ea3 100644
--- a/Socket/ServerSocketHandle.hh
+++ b/Socket/ServerSocketHandle.hh
@@ -223,4 +223,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 263b21ff29e7597209968dd44bca2cd770016eb4..649585610c9760c6de159b981fbe0be2c4bc3771 100644
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -102,4 +102,5 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.cc b/Socket/SocketHandle.cc
index 8365bf7e134798a2aa8ffbce18e93c92bb061d3b..4d0b8fce4ca47e67bdf9838c9f1efa1ffb9536ed 100644
--- a/Socket/SocketHandle.cc
+++ b/Socket/SocketHandle.cc
@@ -116,4 +116,5 @@ prefix_ std::ostream & senf::operator<<(std::ostream & os, SocketHandle<Policy>
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.cci b/Socket/SocketHandle.cci
index 42f2a0c4a3342b2ba9fe7dcd56fc149f063dce3e..25ddfc1409be7cd2e032769bb55ef9460040f778 100644
--- a/Socket/SocketHandle.cci
+++ b/Socket/SocketHandle.cci
@@ -81,4 +81,5 @@ prefix_ senf::detail::ConvertibleString::ConvertibleString(bool v)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.ct b/Socket/SocketHandle.ct
index 11d309ce64568efc8620436df5399117478aa97a..96c5b131d8fdaa01e1e8f430291ba2548cfb2108 100644
--- a/Socket/SocketHandle.ct
+++ b/Socket/SocketHandle.ct
@@ -53,4 +53,5 @@ senf::detail::ConvertibleString::operator+=(ConvertibleString const & other)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.cti b/Socket/SocketHandle.cti
index 46a1df89360cc7054e010123d147fe7a6615b5ef..05b3790b7255705feafed24eac3b598c95fd0934 100644
--- a/Socket/SocketHandle.cti
+++ b/Socket/SocketHandle.cti
@@ -200,4 +200,5 @@ prefix_ senf::detail::ConvertibleString::ConvertibleString(T const & other)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.hh b/Socket/SocketHandle.hh
index c41336620015d3d686877d52697ff104687c918b..808b3c1ba9835a028f81e9a8e0344209b3f79a58 100644
--- a/Socket/SocketHandle.hh
+++ b/Socket/SocketHandle.hh
@@ -266,4 +266,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.ih b/Socket/SocketHandle.ih
index 0b470792525cf435093dd3a1fec42fe2a9445300..5bef63a659625b82729f1a853f8d77abf506d4ed 100644
--- a/Socket/SocketHandle.ih
+++ b/Socket/SocketHandle.ih
@@ -175,4 +175,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index c1ac392dba2ffec9fc6dc836ae90bde89c491401..f2e31a71879dbfdd91eec6515ac675efa0c9f251 100644
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -107,4 +107,5 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.ct b/Socket/SocketPolicy.ct
index f6d97d5c7cae3195734c909c21bcf0dcfe18a1b1..6a56e31c76bb4596e8ea136ecdbb24b1515c00f9 100644
--- a/Socket/SocketPolicy.ct
+++ b/Socket/SocketPolicy.ct
@@ -60,4 +60,5 @@ checkBaseOf(SocketPolicyBase const & other)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.hh b/Socket/SocketPolicy.hh
index e7bd1abd56e3b9d0c44b78008cbdf8fd57fa6de9..e3907fe9c5640da558b41cc0b5e4de780bd7fffd 100644
--- a/Socket/SocketPolicy.hh
+++ b/Socket/SocketPolicy.hh
@@ -558,4 +558,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.ih b/Socket/SocketPolicy.ih
index 3f0b8cc2f04cca73e2e56054c58b9419c9a5335f..09ccc391956c2a23a4daf753cd902bef6a90d5dc 100644
--- a/Socket/SocketPolicy.ih
+++ b/Socket/SocketPolicy.ih
@@ -242,4 +242,5 @@ namespace impl {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index a342406297c25a8d92dee0cfae0d5e469f180769..84a830cbd856fcb4477865706dcc0f2c64519949 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -151,4 +151,5 @@ BOOST_AUTO_UNIT_TEST(socketPolicy)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketPolicy.test.hh b/Socket/SocketPolicy.test.hh
index d1099405121a681b4f16554ac456268e2d54259e..065ec465cc0611c5ba9f7b2ada82d2f2686980f7 100644
--- a/Socket/SocketPolicy.test.hh
+++ b/Socket/SocketPolicy.test.hh
@@ -131,4 +131,5 @@ namespace test {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.cc b/Socket/SocketProtocol.cc
index fc5fd4c895936622f0f99b03bfb70a406ec9458d..395d27fb419dca92a2227627aa68b8b7afc9e7dd 100644
--- a/Socket/SocketProtocol.cc
+++ b/Socket/SocketProtocol.cc
@@ -49,4 +49,5 @@ prefix_ void senf::SocketProtocol::state(SocketStateMap & map, unsigned lod)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.cci b/Socket/SocketProtocol.cci
index f2a5fd5fdb04e74acb26f057b133414d47aeba44..7ecf0b04c83155e4587b7630aaf56c25753ed51c 100644
--- a/Socket/SocketProtocol.cci
+++ b/Socket/SocketProtocol.cci
@@ -57,4 +57,5 @@ prefix_ senf::SocketBody & senf::SocketProtocol::body()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.cti b/Socket/SocketProtocol.cti
index e5e04789ef2789a90a2a1b1d9c035a662179f1cb..df1c8234603fad3ec3305effa5ff9b375917210b 100644
--- a/Socket/SocketProtocol.cti
+++ b/Socket/SocketProtocol.cti
@@ -54,4 +54,5 @@ senf::ConcreteSocketProtocol<SocketPolicy>::policy()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.hh b/Socket/SocketProtocol.hh
index 24a8ff8a5cd980148a0120739c2ab206e41de774..839fdeba9f192d36fd16e6369853ef1a14d5b102 100644
--- a/Socket/SocketProtocol.hh
+++ b/Socket/SocketProtocol.hh
@@ -278,4 +278,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index 47799b3af74f6adba00f81764afd3563277734b1..2168488f25296f84dc1ea9155714e7fe2ad027d1 100644
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -57,4 +57,5 @@ BOOST_AUTO_UNIT_TEST(socketProtocol)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/SocketProtocol.test.hh b/Socket/SocketProtocol.test.hh
index e70b7f1ced711b13fa2246f01c064ce7631c2d68..88acc46bae03563f5c653025e8d49015b7a91283 100644
--- a/Socket/SocketProtocol.test.hh
+++ b/Socket/SocketProtocol.test.hh
@@ -69,4 +69,5 @@ namespace test {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPProtocol.cc b/Socket/TCPProtocol.cc
index 4dbb56da51d340b2c04af1cfdd540041caf87584..57ffef896800f700435d69589e6998e35414995e 100644
--- a/Socket/TCPProtocol.cc
+++ b/Socket/TCPProtocol.cc
@@ -100,4 +100,5 @@ prefix_ bool senf::TCPProtocol::eof()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPProtocol.hh b/Socket/TCPProtocol.hh
index ce84dc1c599f166abf5a5fdc9746c387f29a9603..e22905191dac0eb17c4b91217a898aab5a789c68 100644
--- a/Socket/TCPProtocol.hh
+++ b/Socket/TCPProtocol.hh
@@ -85,4 +85,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPSocketHandle.cc b/Socket/TCPSocketHandle.cc
index ffabdc2b21b060ae85f54ef53af028e2c06c0b14..2f7f0ad4e44434a172d991fcc8b3ec8a89edeca4 100644
--- a/Socket/TCPSocketHandle.cc
+++ b/Socket/TCPSocketHandle.cc
@@ -142,4 +142,5 @@ prefix_ std::auto_ptr<senf::SocketProtocol> senf::TCPv6SocketProtocol::clone()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPSocketHandle.hh b/Socket/TCPSocketHandle.hh
index 4104dc35578483be53e7cc81947f8da124397583..c4c6c94f863011dd7bfd70a7fb48ab59f44ea0ad 100644
--- a/Socket/TCPSocketHandle.hh
+++ b/Socket/TCPSocketHandle.hh
@@ -233,4 +233,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/TCPSocketHandle.test.cc b/Socket/TCPSocketHandle.test.cc
index b0d4863f776d126fd4988387eee61d3781766d88..0889d6db14f4de79da9d9a35e5c7ff3e13bf1094 100644
--- a/Socket/TCPSocketHandle.test.cc
+++ b/Socket/TCPSocketHandle.test.cc
@@ -398,4 +398,5 @@ BOOST_AUTO_UNIT_TEST(tcpv6ServerSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPProtocol.cc b/Socket/UDPProtocol.cc
index 5cc9f81ceba62ce3bb3b6632f9e2ff85004068c9..af5d91e1198274c18b2d17cd0e2fd2fcd6f355ea 100644
--- a/Socket/UDPProtocol.cc
+++ b/Socket/UDPProtocol.cc
@@ -163,4 +163,5 @@ prefix_ void senf::UDPProtocol::mcTTL(unsigned value)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPProtocol.hh b/Socket/UDPProtocol.hh
index 6ac49066c6b458f16b6c970bc57b90bc874abc26..55ab3143ecc3586cb3255b997306146f9ec303e0 100644
--- a/Socket/UDPProtocol.hh
+++ b/Socket/UDPProtocol.hh
@@ -123,4 +123,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPSocketHandle.cc b/Socket/UDPSocketHandle.cc
index 0206580131e6ff60958e0db4c8e30bee32b17e43..525e53113304f319b4103254407ce6cd194a6135 100644
--- a/Socket/UDPSocketHandle.cc
+++ b/Socket/UDPSocketHandle.cc
@@ -102,4 +102,5 @@ prefix_ std::auto_ptr<senf::SocketProtocol> senf::UDPv6SocketProtocol::clone()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPSocketHandle.hh b/Socket/UDPSocketHandle.hh
index 72a4f554302eef9ba88770a41127bfc657ab33d4..62362b4bcad9c56864e4fc4cf113e844722e8199 100644
--- a/Socket/UDPSocketHandle.hh
+++ b/Socket/UDPSocketHandle.hh
@@ -198,4 +198,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/UDPSocketHandle.test.cc b/Socket/UDPSocketHandle.test.cc
index 1af999fe96fa754668128526254debf07b8ccd62..f9e937f98849610b6c674cdd7165cd0be123cac2 100644
--- a/Socket/UDPSocketHandle.test.cc
+++ b/Socket/UDPSocketHandle.test.cc
@@ -176,4 +176,5 @@ BOOST_AUTO_UNIT_TEST(udpv4ClientSocketHandle)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Socket/main.test.cc b/Socket/main.test.cc
index 15b8f3138d568ed1b0385f9e0ba6243f8399419b..b759387fbca292242de194b77da0f6ad98b714b1 100644
--- a/Socket/main.test.cc
+++ b/Socket/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Buffer.hh b/Utils/Buffer.hh
index 3ff2349ea5134a1e9a643485cdd720865ca99753..aa4bba9005f3a3559e9ca3f3af2bd48037ee0a23 100644
--- a/Utils/Buffer.hh
+++ b/Utils/Buffer.hh
@@ -114,4 +114,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/DaemonTools.cc b/Utils/DaemonTools.cc
index ba26cc7c33b3ad256c4f66b4f2f50db05ab7c43a..06db1a0a0d4f4fc06ee39fd2228377e05242e3e4 100644
--- a/Utils/DaemonTools.cc
+++ b/Utils/DaemonTools.cc
@@ -69,4 +69,5 @@ prefix_ void senf::redirect_stdio(std::string const & path)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/DaemonTools.hh b/Utils/DaemonTools.hh
index d1b85f1a2198f9d45ef3ed15ea12f011a44fadc0..15e4e7d812dad7b393bde9837b36cf9412805649 100644
--- a/Utils/DaemonTools.hh
+++ b/Utils/DaemonTools.hh
@@ -82,4 +82,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Exception.cc b/Utils/Exception.cc
index a1ae061f4ef3ef1a993808286f62e5f1f8f0fa89..80b6c98bd31068cd065dd4d4f65d63fa35092a02 100644
--- a/Utils/Exception.cc
+++ b/Utils/Exception.cc
@@ -62,4 +62,5 @@ prefix_ char const * senf::SystemException::what()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Exception.cci b/Utils/Exception.cci
index a9830b5ee9ce1723e4873d7c5c7bd07a4ed669ab..9c3a383a48c3cd06fe834f0f3ec4436d5d6bbda7 100644
--- a/Utils/Exception.cci
+++ b/Utils/Exception.cci
@@ -52,4 +52,5 @@ prefix_  senf::SystemException::~SystemException()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Exception.hh b/Utils/Exception.hh
index d7e86d592528eb8499bcd2ff956ce3dc62be0d3a..cc37ee1318b8a0553a5cc5af15a332b6bd992a27 100644
--- a/Utils/Exception.hh
+++ b/Utils/Exception.hh
@@ -87,4 +87,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.cti b/Utils/IteratorTraits.cti
index 9134732cf87a06b34b1239baf4eb3ce7cded6c72..75c42f7c11eccb5d316971060e7ff6876e93c2a3 100644
--- a/Utils/IteratorTraits.cti
+++ b/Utils/IteratorTraits.cti
@@ -47,4 +47,5 @@ prefix_ typename std::iterator_traits<Iterator>::pointer senf::storage_iterator(
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.hh b/Utils/IteratorTraits.hh
index 92cae92da1118ddc0adf6d4a08f60ac7084caf2e..12fd22376a6dd3c55098c5021a3ee31b1b0a294e 100644
--- a/Utils/IteratorTraits.hh
+++ b/Utils/IteratorTraits.hh
@@ -86,4 +86,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.ih b/Utils/IteratorTraits.ih
index 871c688e185e71265c5a879d8aaee87e5177412d..1abcb6a6ffb458ec12389fe4f608ab0d8240eece 100644
--- a/Utils/IteratorTraits.ih
+++ b/Utils/IteratorTraits.ih
@@ -62,4 +62,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/IteratorTraits.test.cc b/Utils/IteratorTraits.test.cc
index f5aa2cca909afb0179bad6233cb72ddb7e640f31..820b07c60c4615eabda131413cf24de8cd95af0f 100644
--- a/Utils/IteratorTraits.test.cc
+++ b/Utils/IteratorTraits.test.cc
@@ -55,4 +55,5 @@ BOOST_AUTO_UNIT_TEST(iteratorTraits)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Logger.hh b/Utils/Logger.hh
index ef649fc0a8995ecb7e866fec0bbb867307ae7626..7b568e87c4ddba1a31fef4677315188cb046d7ca 100644
--- a/Utils/Logger.hh
+++ b/Utils/Logger.hh
@@ -217,4 +217,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/Logger.test.cc b/Utils/Logger.test.cc
index c7892da7949fa1d7dbb06ea704d8276f34bdcb4c..4498bcf5b3d3e015d0d6184ec8f9fe93412845c3 100644
--- a/Utils/Logger.test.cc
+++ b/Utils/Logger.test.cc
@@ -67,4 +67,5 @@ BOOST_AUTO_UNIT_TEST(logger)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/MicroTime.cc b/Utils/MicroTime.cc
index 1f1ea617ab1889b980a6b8712473d4bce62e47c9..4a19fdf4bf339fda72a80e11258a1ce6dac71a08 100644
--- a/Utils/MicroTime.cc
+++ b/Utils/MicroTime.cc
@@ -55,4 +55,5 @@ prefix_ senf::MicroTime senf::now()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/MicroTime.hh b/Utils/MicroTime.hh
index bdeeed66b0f353e8dbccf3da5cc77923cc3c73c0..c9b537c47ca4690915334585c05f003d9f80934d 100644
--- a/Utils/MicroTime.hh
+++ b/Utils/MicroTime.hh
@@ -72,4 +72,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/MicroTime.test.cc b/Utils/MicroTime.test.cc
index aa2eec2cf6001b701f36e97bb1bce5ef431cba9e..18b563f1145f6c9b3bb86d61ffb08ce449087069 100644
--- a/Utils/MicroTime.test.cc
+++ b/Utils/MicroTime.test.cc
@@ -32,4 +32,5 @@ BOOST_AUTO_UNIT_TEST(microTime)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/SafeBool.cci b/Utils/SafeBool.cci
index 249618590ddcfb1f389b92893131974ccfcf33eb..618be826a91d1d22375494bbe9b7584a63c9dab8 100644
--- a/Utils/SafeBool.cci
+++ b/Utils/SafeBool.cci
@@ -38,4 +38,5 @@ prefix_ senf::SafeBoolBase::~SafeBoolBase()
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/SafeBool.cti b/Utils/SafeBool.cti
index 5c3cf5157bd678ea54297ef308c9196c087682f9..1948e2d9545ece07248ef3694ebf82750d17097f 100644
--- a/Utils/SafeBool.cti
+++ b/Utils/SafeBool.cti
@@ -53,4 +53,5 @@ prefix_ void senf::operator!=(const SafeBool<T>& lhs, const SafeBool<U>& rhs)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/SafeBool.hh b/Utils/SafeBool.hh
index 02f4151f5e464dafe495881bc663d741ee7dc575..129f6d271e81664cf3c410160804f667b667a38a 100644
--- a/Utils/SafeBool.hh
+++ b/Utils/SafeBool.hh
@@ -113,4 +113,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/TypeInfo.cc b/Utils/TypeInfo.cc
index 06a2c90c773592990053260354291d5b81e3cb9f..1e3606ca8b5c41771b3da092224d73108d3d3301 100644
--- a/Utils/TypeInfo.cc
+++ b/Utils/TypeInfo.cc
@@ -64,4 +64,5 @@ prefix_ std::string senf::prettyName(std::type_info const & type)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/TypeInfo.hh b/Utils/TypeInfo.hh
index 472ea981e736fd67d4149286d3a44d3763dfe9a5..5a213607dac23b3158401244fc866ed6d9688277 100644
--- a/Utils/TypeInfo.hh
+++ b/Utils/TypeInfo.hh
@@ -69,4 +69,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/TypeInfo.test.cc b/Utils/TypeInfo.test.cc
index 94c3d41e19c9c22723d7d4f13b8e8597a369b305..a8e7312e2e22bc474fca5420e213af1e7f19b6be 100644
--- a/Utils/TypeInfo.test.cc
+++ b/Utils/TypeInfo.test.cc
@@ -68,4 +68,5 @@ BOOST_AUTO_UNIT_TEST(prettyName)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/impl/membind.hh b/Utils/impl/membind.hh
index 782ed23adbfd1e1b8129ef1f436aaa3589df2fcc..b2394237f8d3efc551aa7fa015d817f78c5f3033 100644
--- a/Utils/impl/membind.hh
+++ b/Utils/impl/membind.hh
@@ -65,4 +65,5 @@ membind(R (T::* fn)( scPARAMS(A) ), scOBTYPE ob)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.cci b/Utils/intrusive_refcount.cci
index 9742d6560c9facf37b9a4c75c308a07bc976b8cd..b89a6f4dfd19e750ef84d161c352984f6118d6dc 100644
--- a/Utils/intrusive_refcount.cci
+++ b/Utils/intrusive_refcount.cci
@@ -81,4 +81,5 @@ prefix_ void senf::intrusive_ptr_release(intrusive_refcount* p)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.hh b/Utils/intrusive_refcount.hh
index b3e2f82dfaa9c85499e3ff97566aacccab846457..0fb690a4f3e7577330113ec78cf91aa8c0a5937e 100644
--- a/Utils/intrusive_refcount.hh
+++ b/Utils/intrusive_refcount.hh
@@ -88,4 +88,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.test.cc b/Utils/intrusive_refcount.test.cc
index ab547a9b70e2fb6d3c90119d90b00be493c86911..8a550964b0f8ab9c1a6e42be6f440cefc853c35f 100644
--- a/Utils/intrusive_refcount.test.cc
+++ b/Utils/intrusive_refcount.test.cc
@@ -85,4 +85,5 @@ BOOST_AUTO_UNIT_TEST(intrusive_refcount)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/main.test.cc b/Utils/main.test.cc
index 8716c4440b558180e5f0826cd8b78e6ae6310275..5971ff1b8618e8e01ff385f20b49bd9170b45e6f 100644
--- a/Utils/main.test.cc
+++ b/Utils/main.test.cc
@@ -45,4 +45,5 @@
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/membind.hh b/Utils/membind.hh
index 4949d5941de899666a94b058b1c1f28095825865..5cb73d095ad515c437069a0402445e2fdfb07a7b 100644
--- a/Utils/membind.hh
+++ b/Utils/membind.hh
@@ -103,4 +103,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/membind.test.cc b/Utils/membind.test.cc
index 5c4cabfc3c5b53e51c6019eeef98c75c552e26fc..f30a00af0a3665a97d5e78d5f20f6e12d0845e96 100644
--- a/Utils/membind.test.cc
+++ b/Utils/membind.test.cc
@@ -73,4 +73,5 @@ BOOST_AUTO_UNIT_TEST(membind)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/project.el b/project.el
index fef05ab99b2c0846ecee82f2cee6e745ae12e794..fa52c6d6a32bc39bda7adc82fd60f6e2ce3cce52 100644
--- a/project.el
+++ b/project.el
@@ -27,7 +27,8 @@
 (c-add-style "senf" senf-c-style)
 
 (set (make-local-variable 'ccide-file-vars)
-     '(( fill-column  . 100    )
+     '(( fill-column  . 100 )
+       ( comment-column . 40 )
        ( c-file-style . "senf" )
        ( indent-tabs-mode . nil )
        ( ispell-local-dictionary . "american" )