diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
index 81d9a4c..81805c2 100644
--- a/src/jsontestrunner/main.cpp
+++ b/src/jsontestrunner/main.cpp
@@ -298,3 +298,4 @@ int main( int argc, const char *argv[] )
 
    return exitCode;
 }
+// vim: et ts=4 sts=4 sw=4 tw=0
diff --git a/src/lib_json/json_batchallocator.h b/src/lib_json/json_batchallocator.h
index 2a7c024..92f1843 100644
--- a/src/lib_json/json_batchallocator.h
+++ b/src/lib_json/json_batchallocator.h
@@ -125,3 +125,4 @@ private:
 # endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
 
 #endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/lib_json/json_internalarray.inl b/src/lib_json/json_internalarray.inl
index 5e8b8ef..0b9dc63 100644
--- a/src/lib_json/json_internalarray.inl
+++ b/src/lib_json/json_internalarray.inl
@@ -452,3 +452,4 @@ ValueInternalArray::compare( const ValueInternalArray &other ) const
 }
 
 } // namespace Json
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/lib_json/json_internalmap.inl b/src/lib_json/json_internalmap.inl
index f2fa160..efda139 100644
--- a/src/lib_json/json_internalmap.inl
+++ b/src/lib_json/json_internalmap.inl
@@ -613,3 +613,4 @@ ValueInternalMap::distance( const IteratorState &x, const IteratorState &y )
 }
 
 } // namespace Json
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
index b9165a4..ed4f7a3 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -932,3 +932,4 @@ std::istream& operator>>( std::istream &sin, Value &root )
 
 
 } // namespace Json
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index b925681..dd8dda0 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -1,4 +1,3 @@
-// vim: ts=3 sts=3 sw=3 tw=0
 // Copyright 2011 Baptiste Lepilleur
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
@@ -1922,3 +1921,4 @@ Path::make( Value &root ) const
 
 
 } // namespace Json
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl
index 9b85580..a6b046a 100644
--- a/src/lib_json/json_valueiterator.inl
+++ b/src/lib_json/json_valueiterator.inl
@@ -298,3 +298,4 @@ ValueIterator::operator =( const SelfType &other )
 }
 
 } // namespace Json
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
index 242bc57..3b9027f 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -839,3 +839,4 @@ std::ostream& operator<<( std::ostream &sout, const Value &root )
 
 
 } // namespace Json
+// vim: et ts=3 sts=3 sw=3 tw=0
diff --git a/src/test_lib_json/jsontest.cpp b/src/test_lib_json/jsontest.cpp
index e27a1eb..c43e7b6 100644
--- a/src/test_lib_json/jsontest.cpp
+++ b/src/test_lib_json/jsontest.cpp
@@ -575,3 +575,4 @@ checkStringEqual( TestResult &result,
 
 
 } // namespace JsonTest
+// vim: et ts=4 sts=4 sw=4 tw=0
diff --git a/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h
index 8d3f46a..70a5c2c 100644
--- a/src/test_lib_json/jsontest.h
+++ b/src/test_lib_json/jsontest.h
@@ -270,3 +270,4 @@ namespace JsonTest {
    (runner).add( JSONTEST_FIXTURE_FACTORY( FixtureType, name ) )
 
 #endif // ifndef JSONTEST_H_INCLUDED
+// vim: et ts=4 sts=4 sw=4 tw=0
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index c1a5e20..dbcbd78 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -1,4 +1,3 @@
-// vim: ts=4 sts=4 sw=4 tw=0
 // Copyright 2007-2010 Baptiste Lepilleur
 // Distributed under MIT license, or public domain if desired and
 // recognized in your jurisdiction.
@@ -1516,3 +1515,4 @@ int main( int argc, const char *argv[] )
    JSONTEST_REGISTER_FIXTURE( runner, WriterTest, dropNullPlaceholders );
    return runner.runCommandLine( argc, argv );
 }
+// vim: et ts=4 sts=4 sw=4 tw=0