diff --git a/src/jsontestrunner/main.cpp b/src/jsontestrunner/main.cpp
index b368b45..e32db03 100644
--- a/src/jsontestrunner/main.cpp
+++ b/src/jsontestrunner/main.cpp
@@ -268,4 +268,3 @@ int main(int argc, const char *argv[]) {
 
   return exitCode;
 }
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/lib_json/json_batchallocator.h b/src/lib_json/json_batchallocator.h
index 3d19e90..a4703b2 100644
--- a/src/lib_json/json_batchallocator.h
+++ b/src/lib_json/json_batchallocator.h
@@ -119,4 +119,3 @@ private:
 #endif // ifndef JSONCPP_DOC_INCLUDE_IMPLEMENTATION
 
 #endif // JSONCPP_BATCHALLOCATOR_H_INCLUDED
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/lib_json/json_internalarray.inl b/src/lib_json/json_internalarray.inl
index f9e5206..a3dab84 100644
--- a/src/lib_json/json_internalarray.inl
+++ b/src/lib_json/json_internalarray.inl
@@ -451,4 +451,3 @@ 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 8bd48c4..3117390 100644
--- a/src/lib_json/json_internalmap.inl
+++ b/src/lib_json/json_internalmap.inl
@@ -612,4 +612,3 @@ 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 c5782b0..9a7ed6c 100644
--- a/src/lib_json/json_reader.cpp
+++ b/src/lib_json/json_reader.cpp
@@ -842,4 +842,3 @@ std::istream &operator>>(std::istream &sin, Value &root) {
 }
 
 } // namespace Json
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/lib_json/json_tool.h b/src/lib_json/json_tool.h
index a82c2d6..9f2b534 100644
--- a/src/lib_json/json_tool.h
+++ b/src/lib_json/json_tool.h
@@ -85,4 +85,3 @@ static inline void fixNumericLocale(char* begin, char* end) {
 } // namespace Json {
 
 #endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/lib_json/json_value.cpp b/src/lib_json/json_value.cpp
index e606f4d..89989a5 100644
--- a/src/lib_json/json_value.cpp
+++ b/src/lib_json/json_value.cpp
@@ -1540,4 +1540,3 @@ Value &Path::make(Value &root) const {
 }
 
 } // namespace Json
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/lib_json/json_valueiterator.inl b/src/lib_json/json_valueiterator.inl
index a6b046a..9b85580 100644
--- a/src/lib_json/json_valueiterator.inl
+++ b/src/lib_json/json_valueiterator.inl
@@ -298,4 +298,3 @@ 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 3a9994e..4b22777 100644
--- a/src/lib_json/json_writer.cpp
+++ b/src/lib_json/json_writer.cpp
@@ -681,4 +681,3 @@ std::ostream &operator<<(std::ostream &sout, const Value &root) {
 }
 
 } // namespace Json
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/test_lib_json/jsontest.cpp b/src/test_lib_json/jsontest.cpp
index f5ad21b..dc14cce 100644
--- a/src/test_lib_json/jsontest.cpp
+++ b/src/test_lib_json/jsontest.cpp
@@ -441,4 +441,3 @@ TestResult &checkStringEqual(TestResult &result,
 }
 
 } // namespace JsonTest
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/test_lib_json/jsontest.h b/src/test_lib_json/jsontest.h
index 361f827..b8afb7c 100644
--- a/src/test_lib_json/jsontest.h
+++ b/src/test_lib_json/jsontest.h
@@ -277,4 +277,3 @@ TestResult &checkStringEqual(TestResult &result,
   (runner).add(JSONTEST_FIXTURE_FACTORY(FixtureType, name))
 
 #endif // ifndef JSONTEST_H_INCLUDED
-// vim: et ts=2 sts=2 sw=2 tw=0
diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
index ddbc76c..d6f3582 100644
--- a/src/test_lib_json/main.cpp
+++ b/src/test_lib_json/main.cpp
@@ -1635,4 +1635,3 @@ int main(int argc, const char *argv[]) {
 
   return runner.runCommandLine(argc, argv);
 }
-// vim: et ts=2 sts=2 sw=2 tw=0