diff --git a/Packets/Packet.cc b/Packets/Packet.cc
index aed46e7700f7920892944d61e06f28b0bda54024..02cc5ec2d59f41e8c34da65af39eeab84be7deeb 100644
--- a/Packets/Packet.cc
+++ b/Packets/Packet.cc
@@ -70,4 +70,5 @@ prefix_ senf::Packet senf::Packet::checkLast()
 // 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 a65c653ee0f5d35c04ad9c85bf60420175c036c5..02e577208beb316cdfe355564b39f62f36dfc5a5 100644
--- a/Packets/Packet.cci
+++ b/Packets/Packet.cci
@@ -158,4 +158,5 @@ prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr()
 // 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 e840389cadf7b8abff9959b6b83569db05473a5f..e293a5ebaceeccfd024bacc4464263eb59f80218 100644
--- a/Packets/Packet.ct
+++ b/Packets/Packet.ct
@@ -68,4 +68,5 @@ prefix_ OtherPacket senf::Packet::findPrev(NoThrow_t)
 // 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 c17dc6fa9b406dfd9833aac1a7155f6ad79821d5..532c3b07b0097f04f677568801f5baff7c490cdc 100644
--- a/Packets/Packet.cti
+++ b/Packets/Packet.cti
@@ -296,4 +296,5 @@ senf::ConcretePacket<PacketType>::ptr()
 // 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 f4bc724f251d04a8262af24390176d3b96a206ee..ae2c66e4e3a9aee82ad99ab41eb5b7497e1a147e 100644
--- a/Packets/Packet.hh
+++ b/Packets/Packet.hh
@@ -236,4 +236,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.test.cc b/Packets/Packet.test.cc
index 7331b992235f1b68cd663c590e8684cfed062676..60b2bd2c493252afee52ec6676e76a7be2b25d08 100644
--- a/Packets/Packet.test.cc
+++ b/Packets/Packet.test.cc
@@ -242,4 +242,5 @@ BOOST_AUTO_UNIT_TEST(concretePacket)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketData.cc b/Packets/PacketData.cc
index 9abdf04d659cedde29424536d3690cd5d644b064..8751951ae8d2c6af8a49c9ec6cbbbd640a7b7f78 100644
--- a/Packets/PacketData.cc
+++ b/Packets/PacketData.cc
@@ -52,4 +52,6 @@ prefix_ void senf::PacketData::resize(size_type n, byte v)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketData.cci b/Packets/PacketData.cci
index 6a62bb08f96476420d802db578e8c791e905c62c..9a687cfdcc831fb99a9d523afa28718f4fa8913c 100644
--- a/Packets/PacketData.cci
+++ b/Packets/PacketData.cci
@@ -224,4 +224,6 @@ prefix_ senf::PacketData::iterator senf::safe_data_iterator::i()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketData.cti b/Packets/PacketData.cti
index 2e10568f0f37d3458ba536f09a4e50870c0aa06b..ffe2417ab66297d1c8af5c722f34f3516491df22 100644
--- a/Packets/PacketData.cti
+++ b/Packets/PacketData.cti
@@ -51,4 +51,6 @@ insert(iterator pos, InputIterator f, InputIterator l,
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh
index f1de1792c0e84681126a2fb8985e3a997f2f3ab4..e7dae963c74f8260926c17375919241dd4bd9ced 100644
--- a/Packets/PacketData.hh
+++ b/Packets/PacketData.hh
@@ -177,4 +177,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketData.test.cc b/Packets/PacketData.test.cc
index 4354b9a9fa32749313c8375a500431c65bd09190..e9e3f3a0549ea1d2023745326271219e0c79a1c1 100644
--- a/Packets/PacketData.test.cc
+++ b/Packets/PacketData.test.cc
@@ -137,4 +137,6 @@ BOOST_AUTO_UNIT_TEST(safePacketIterator)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc
index dd78bb767633ff0cbba2e71e8e4cbab4cc27c2ee..e4db0665ecf44d2672c79df99e836292d73de088 100644
--- a/Packets/PacketImpl.cc
+++ b/Packets/PacketImpl.cc
@@ -122,4 +122,6 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterat
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketImpl.cci b/Packets/PacketImpl.cci
index d8dd2cb0744c8bcaaff1ace676521ad0027142c3..f2293a8ecce2b21a1789048f8bef56ec3bfa8f79 100644
--- a/Packets/PacketImpl.cci
+++ b/Packets/PacketImpl.cci
@@ -195,4 +195,6 @@ prefix_ senf::detail::PacketImpl::Guard::~Guard()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketImpl.cti b/Packets/PacketImpl.cti
index aae761203d9e429b72debfe5c91944ad7c1e197a..2e3fada18bf3134e2dfe7d4a88465cb821df4d93 100644
--- a/Packets/PacketImpl.cti
+++ b/Packets/PacketImpl.cti
@@ -56,4 +56,6 @@ prefix_ senf::detail::PacketImpl::PacketImpl(InputIterator first, InputIterator
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh
index 7ba7cb03ecf897700b16de8735343157db64f2c8..39ccd470f7b2d42ac52e21b3c624f131c777b998 100644
--- a/Packets/PacketImpl.hh
+++ b/Packets/PacketImpl.hh
@@ -126,4 +126,6 @@ namespace detail {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketImpl.test.cc b/Packets/PacketImpl.test.cc
index 0c62174168f1a5ff52fc816fb6ebc6b034333ac9..83e5373c9bd4edd60eba7419870553029643cf98 100644
--- a/Packets/PacketImpl.test.cc
+++ b/Packets/PacketImpl.test.cc
@@ -207,4 +207,6 @@ BOOST_AUTO_UNIT_TEST(packetImpl_interpreters)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketInterpreter.cc b/Packets/PacketInterpreter.cc
index 5ab83d8ffb545025f98d2453faa9717680ac6a2b..7cd389a3b9bab3adb54e2e88b81c372d8ed07a98 100644
--- a/Packets/PacketInterpreter.cc
+++ b/Packets/PacketInterpreter.cc
@@ -101,4 +101,6 @@ prefix_  senf::PacketInterpreterBase::Factory::~Factory()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketInterpreter.cci b/Packets/PacketInterpreter.cci
index 5d6a51e13449002bfeeac4749c9477c393d78c0c..94e7c292d6c13e48c579f748d5a961593a336eb9 100644
--- a/Packets/PacketInterpreter.cci
+++ b/Packets/PacketInterpreter.cci
@@ -182,4 +182,6 @@ prefix_ void senf::PacketInterpreterBase::releaseImpl()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketInterpreter.ct b/Packets/PacketInterpreter.ct
index 3f726389b5292a3b987f9c206279f0c4135fc8fb..b2f455b2b752414a4b01b2260ba792f1ac94ac44 100644
--- a/Packets/PacketInterpreter.ct
+++ b/Packets/PacketInterpreter.ct
@@ -361,4 +361,6 @@ const typename senf::PacketInterpreter<PacketType>::FactoryImpl
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketInterpreter.cti b/Packets/PacketInterpreter.cti
index a0748b702039dd54a06e2f5aa2dce646b9e6f096..19dc0869c938c0236d647df37d0bbfe467de9304 100644
--- a/Packets/PacketInterpreter.cti
+++ b/Packets/PacketInterpreter.cti
@@ -225,4 +225,6 @@ senf::PacketInterpreter<PacketType>::parser_p()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketInterpreter.hh b/Packets/PacketInterpreter.hh
index 7e5f5221070a646fceca3ea12829063174a3440e..d49510f52f5e8de7d509447944a2c23c0324bcf9 100644
--- a/Packets/PacketInterpreter.hh
+++ b/Packets/PacketInterpreter.hh
@@ -359,4 +359,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketInterpreter.test.cc b/Packets/PacketInterpreter.test.cc
index b71bf33905af62879764ab0d4c437248623dc050..c26dc07fc575a9f2da2e36816cccf1e1defa76a3 100644
--- a/Packets/PacketInterpreter.test.cc
+++ b/Packets/PacketInterpreter.test.cc
@@ -301,4 +301,6 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketParser.cci b/Packets/PacketParser.cci
index d18cf3a93f9347bc11bc8fd400446ceb2dd7f030..173e54e80108ed8e1b1612729770ac3d18354a4b 100644
--- a/Packets/PacketParser.cci
+++ b/Packets/PacketParser.cci
@@ -96,4 +96,6 @@ prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::end()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti
index 9b885e57f5e2adbb7970a7b1f0f296b19457fc13..826f06654499acfe6d4b83b60c239a23788bd846 100644
--- a/Packets/PacketParser.cti
+++ b/Packets/PacketParser.cti
@@ -138,4 +138,6 @@ prefix_ bool senf::SafePacketParser<Parser>::boolean_test()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketParser.hh b/Packets/PacketParser.hh
index cd45e47bbe892a9f50ae043fbf4c2a0aeef2d160..e5eee7797d67cb39fc034d2a6a4f5260be9ba761 100644
--- a/Packets/PacketParser.hh
+++ b/Packets/PacketParser.hh
@@ -425,4 +425,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketParser.ih b/Packets/PacketParser.ih
index 0c6131e866f57ee4b1690ec73009b85779e39136..9acee0fa1879fba8ef35caa6c0d3e59ec435f018 100644
--- a/Packets/PacketParser.ih
+++ b/Packets/PacketParser.ih
@@ -80,4 +80,5 @@ namespace detail {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc
index 9f115cb5b500a15cd0b885c3500bb72c03a0e23e..5db0e606a0780a454b1a6a795765d5103377bcf5 100644
--- a/Packets/PacketParser.test.cc
+++ b/Packets/PacketParser.test.cc
@@ -120,4 +120,6 @@ BOOST_AUTO_UNIT_TEST(safePacketParser)
 // c-file-style: "senf"
 // 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 6b4956c3c714ef7ce24c9f3ca431d1b86ef1c47c..09a6af831a2b230e57f405d79efb78588042e95e 100644
--- a/Packets/PacketRegistry.cc
+++ b/Packets/PacketRegistry.cc
@@ -44,4 +44,6 @@ prefix_  senf::PkReg_Entry::~PkReg_Entry()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketType.cci b/Packets/PacketType.cci
index 9ef4a5a78714471642244404e66427d55be7a729..4e37767821a6fd4aed3ec98faf9091a89bbd86c9 100644
--- a/Packets/PacketType.cci
+++ b/Packets/PacketType.cci
@@ -78,4 +78,6 @@ prefix_ void senf::PacketTypeBase::dump(packet p, std::ostream & os)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketType.cti b/Packets/PacketType.cti
index aa610d8c1afb388d42d8ce60673da5565d02dda0..4f01389a107a0fcf07ca9345e1e64f7c0e6bc795 100644
--- a/Packets/PacketType.cti
+++ b/Packets/PacketType.cti
@@ -115,4 +115,6 @@ prefix_ void senf::PacketTypeMixin<Self,void>::init(Packet p)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketType.hh b/Packets/PacketType.hh
index 88ea3bd39b3876502bc8f60660e0e81fdfc2381d..8e46eecf83c28f01f0d9ecf5633b5ff9d37e7c90 100644
--- a/Packets/PacketType.hh
+++ b/Packets/PacketType.hh
@@ -284,4 +284,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/PacketTypes.hh b/Packets/PacketTypes.hh
index 5a89c1a084623088e1da3f3f9332bbdf6e99c47e..980c183309571a9de86201a75a302c1a049d868f 100644
--- a/Packets/PacketTypes.hh
+++ b/Packets/PacketTypes.hh
@@ -84,4 +84,6 @@ namespace test {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/ParseArray.ct b/Packets/ParseArray.ct
index f893f0107612f6f767e6cce15895104ecf9b44d1..411b077a278d816f1642a3f14a0ebf139d71f3d7 100644
--- a/Packets/ParseArray.ct
+++ b/Packets/ParseArray.ct
@@ -54,4 +54,5 @@ prefix_ void senf::Parse_Array<elements,ElementParser>::init()
 // 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 863181133eafa47ac06cd99294799d76263baddc..901b51a7487c2357d305470e7e9a14454c266e80 100644
--- a/Packets/ParseArray.cti
+++ b/Packets/ParseArray.cti
@@ -165,4 +165,5 @@ prefix_ void senf::detail::Parse_Array_iterator<ElementParser>::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 851486ac2e5686268251a6c597be98d0af099b28..1e98a71d5ca8dc058dc0c4d0026b155c9a57da11 100644
--- a/Packets/ParseArray.hh
+++ b/Packets/ParseArray.hh
@@ -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/Packets/ParseArray.ih b/Packets/ParseArray.ih
index 7ea3d5063af691353bc62479ee6aacbd3d12ceca..9aa344b4696a644a49a799aba27cb8d0af1a315f 100644
--- a/Packets/ParseArray.ih
+++ b/Packets/ParseArray.ih
@@ -74,4 +74,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 fdef965103a500bad4fda36add70112768c62118..8dc19ae1d557c07a7279a9c07a30dc320b1669df 100644
--- a/Packets/ParseArray.test.cc
+++ b/Packets/ParseArray.test.cc
@@ -107,4 +107,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/ParseVec.ct b/Packets/ParseVec.ct
index 9aaefbed8b2596a84e4832418fc284d2cd8eb916..de1f131c767ed5587b58a759f5dbfd0109a09f75 100644
--- a/Packets/ParseVec.ct
+++ b/Packets/ParseVec.ct
@@ -118,4 +118,5 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::resize(size_type
 // 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 66c6a93eb003630d5599b7d463570abd637aad01..b50e50b37da3546ccf2a866338c81a0680722781 100644
--- a/Packets/ParseVec.cti
+++ b/Packets/ParseVec.cti
@@ -391,4 +391,5 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::setSize(size_typ
 // 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 373903eea0a15b043bf974fa0c3b26c8d5dcf608..21239e8be0498b83a330454bda0e2b4d9b2c7dfb 100644
--- a/Packets/ParseVec.hh
+++ b/Packets/ParseVec.hh
@@ -211,4 +211,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 ffb22cac2d9a2859b03d0356b1e4812b802d18d5..35079a76c46d809706bb6a409d6e70b729fe78c0 100644
--- a/Packets/ParseVec.test.cc
+++ b/Packets/ParseVec.test.cc
@@ -185,4 +185,5 @@ BOOST_AUTO_UNIT_TEST(parseVec_wrapper)
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Packets/main.test.hh b/Packets/main.test.hh
index f7d6f7938858b870498b48a907e395facc4ee869..470fc57b0d8a43818129a3cc5f3818325ae76746 100644
--- a/Packets/main.test.hh
+++ b/Packets/main.test.hh
@@ -64,4 +64,6 @@ namespace test {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/intrusive_refcount.cti b/Utils/intrusive_refcount.cti
index bf3c744f8067a2621888dbf12255a9393fbb7654..7b5065581c6504c0535963914408c92333b6eb6a 100644
--- a/Utils/intrusive_refcount.cti
+++ b/Utils/intrusive_refcount.cti
@@ -66,4 +66,6 @@ prefix_ senf::intrusive_refcount_t<Self>::intrusive_refcount_t()
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/pool_alloc_mixin.cti b/Utils/pool_alloc_mixin.cti
index 613996179401068c4fa775f83030d89a591f6a5e..a16314638c66e80dfcd8358aaf895a5f084f8abe 100644
--- a/Utils/pool_alloc_mixin.cti
+++ b/Utils/pool_alloc_mixin.cti
@@ -81,4 +81,6 @@ prefix_ unsigned long senf::pool_alloc_mixin<Self>::allocCounter(long delta)
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/pool_alloc_mixin.hh b/Utils/pool_alloc_mixin.hh
index fc1a2320def5197706aa0e52efe4377d66e46a72..61548732dcf384233e6613e9b008cc88f5bf029c 100644
--- a/Utils/pool_alloc_mixin.hh
+++ b/Utils/pool_alloc_mixin.hh
@@ -104,4 +104,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/singleton.cti b/Utils/singleton.cti
index 02c07dc730b9ca48499ed4a029e5a1a23d5ff517..1f3b5c0f8db9d184bf1c13e1817fa001b8a16d87 100644
--- a/Utils/singleton.cti
+++ b/Utils/singleton.cti
@@ -62,4 +62,6 @@ typename senf::singleton<Self>::force_creation senf::singleton<Self>::create_;
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/Utils/singleton.hh b/Utils/singleton.hh
index d95b5184f5ddd0063b2beec597b6e806a0719d16..ade1fa343e12bf070e84268d33c1a0fbb779ae73 100644
--- a/Utils/singleton.hh
+++ b/Utils/singleton.hh
@@ -104,4 +104,6 @@ namespace senf {
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End:
diff --git a/find-sources.sh b/find-sources.sh
index df2080baa424f9ddf01444f08d502a01042722f5..b28c390cc52ce6ec9d1899e39525034f9f360b0c 100755
--- a/find-sources.sh
+++ b/find-sources.sh
@@ -1,4 +1,21 @@
-#!/bin/sh
+#!/bin/sh -e
+
+if [ -z "$1" ]; then
+    echo "Usage:"
+    echo "	$0 [-c] <commands>"
+    echo
+    echo "-c Only list C/C++ source files"
+    echo
+    echo "<commands> are any find commands (which should contain a -print somewhere)"
+    echo "which are matched for any file fond"
+    exit 1
+fi
+
+cond=""
+if [ "$1" = "-c" ]; then
+    shift
+    cond='( -name *.h -o -name *.hh -o -name *.ih -o -name *.c -o -name *.cc -o -name *.cci -o -name *.ct -o -name *.cti )'
+fi
 
 find . \
 	-name .svn -prune -o \
@@ -11,5 +28,5 @@ find . \
 	-name .test.bin -o \
 	-name "*.stamp" -o \
 	-name ".sconsign*" -o \
-	-type f \( "$@" \)
+    -type f $cond \( "$@" \)