diff --git a/Makefile b/Makefile
index 5eb96ee..d1e38b1 100644
--- a/Makefile
+++ b/Makefile
@@ -251,6 +251,3 @@ clean:
 
 cleanall: clean
 	rm -rf vendor
-
-
-#EOF
diff --git a/boxes-config b/boxes-config
index b9aa436..e7784bc 100644
--- a/boxes-config
+++ b/boxes-config
@@ -3541,4 +3541,4 @@ END dragon
 # ============================================================================
 
 
-#EOF                                     vim: set ai sw=4 expandtab syn=boxes:
+# vim: set ai sw=4 expandtab syn=boxes:
diff --git a/boxes.vim b/boxes.vim
index daf2faf..deb3bc4 100644
--- a/boxes.vim
+++ b/boxes.vim
@@ -225,4 +225,4 @@ let b:current_syntax = "boxes"
 
 
 
-"EOF                                      vim: sw=4 nowrap:
+" vim: sw=4 nowrap:
diff --git a/src/Makefile b/src/Makefile
index 62dd390..59c432e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -136,6 +136,3 @@ package: $(BOXES_EXECUTABLE_NAME)
 clean:
 	rm -rf $(OUT_DIR)
 	rm -f core
-
-
-#EOF
diff --git a/src/boxes.c b/src/boxes.c
index 13d7867..7125fdf 100644
--- a/src/boxes.c
+++ b/src/boxes.c
@@ -539,4 +539,4 @@ int main(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 
-/*EOF*/                                                  /* vim: set sw=4: */
+/* vim: set sw=4: */
diff --git a/src/cmdline.c b/src/cmdline.c
index 07d087f..2f98398 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -941,4 +941,4 @@ opt_t *process_commandline(int argc, char *argv[])
 }
 
 
-/*EOF*/                                                  /* vim: set sw=4: */
+/* vim: set sw=4: */
diff --git a/src/cmdline.h b/src/cmdline.h
index 4edd549..7da461e 100644
--- a/src/cmdline.h
+++ b/src/cmdline.h
@@ -53,4 +53,4 @@ opt_t *process_commandline(int argc, char *argv[]);
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/config.h b/src/config.h
index fd8979f..ce1c41f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -55,6 +55,3 @@
 
 
 #endif /*CONFIG_H*/
-
-
-/*EOF*/
diff --git a/src/discovery.c b/src/discovery.c
index 015c2cb..e92e5dd 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -311,4 +311,4 @@ bxstr_t *discover_config_file(const int global_only)
 }
 
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/discovery.h b/src/discovery.h
index 36f6689..bd33434 100644
--- a/src/discovery.h
+++ b/src/discovery.h
@@ -28,4 +28,4 @@ bxstr_t *discover_config_file(const int global_only);
 
 #endif /* BOXES_DISCOVERY_H */
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/generate.h b/src/generate.h
index ed1ef2a..d3dec43 100644
--- a/src/generate.h
+++ b/src/generate.h
@@ -28,4 +28,4 @@ int output_box(const sentry_t *thebox);
 
 #endif /*GENERATE_H*/
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/input.h b/src/input.h
index cc59b05..2089a2d 100644
--- a/src/input.h
+++ b/src/input.h
@@ -51,4 +51,4 @@ int apply_substitutions(input_t *input_data, const int mode);
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/lexer.l b/src/lexer.l
index 360b508..e8f14f1 100644
--- a/src/lexer.l
+++ b/src/lexer.l
@@ -514,4 +514,4 @@ static int change_string_delimiters(pass_to_flex *extra, char *delim_expr)
 }
 
 
-/*EOF*/                                         /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/list.c b/src/list.c
index 0dbe523..70360c5 100644
--- a/src/list.c
+++ b/src/list.c
@@ -400,4 +400,4 @@ int list_designs()
 }
 
 
-/*EOF*/                                                  /* vim: set sw=4: */
+/* vim: set sw=4: */
diff --git a/src/list.h b/src/list.h
index 6a7824b..35f5146 100644
--- a/src/list.h
+++ b/src/list.h
@@ -40,4 +40,4 @@ int list_designs();
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/parsecode.h b/src/parsecode.h
index 48044ad..a1e72bc 100644
--- a/src/parsecode.h
+++ b/src/parsecode.h
@@ -195,4 +195,4 @@ int action_add_shape_line(pass_to_bison *bison_args, sentry_t *shape, bxstr_t *l
 
 #endif
 
-/*EOF*/                                       /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/parser.y b/src/parser.y
index 6e3ec5a..7c54018 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -418,4 +418,4 @@ wlist_entry: ASCII_ID YNUMBER
 %%
 
 
-/*EOF*/                                          /* vim: set sw=4 cindent: */
+/* vim: set sw=4 cindent: */
diff --git a/src/parsing.h b/src/parsing.h
index 71e4c4b..bf3327d 100644
--- a/src/parsing.h
+++ b/src/parsing.h
@@ -51,4 +51,4 @@ design_t *parse_config_files(bxstr_t *first_config_file, size_t *r_num_designs);
 
 #endif
 
-/*EOF*/                                       /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/query.c b/src/query.c
index 772425c..2293806 100644
--- a/src/query.c
+++ b/src/query.c
@@ -172,4 +172,4 @@ int query_by_tag()
 }
 
 
-/*EOF*/                                                  /* vim: set sw=4: */
+/* vim: set sw=4: */
diff --git a/src/query.h b/src/query.h
index b419a03..52522d2 100644
--- a/src/query.h
+++ b/src/query.h
@@ -38,4 +38,4 @@ int query_by_tag();
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/regulex.h b/src/regulex.h
index 96c0f94..3377a5f 100644
--- a/src/regulex.h
+++ b/src/regulex.h
@@ -102,4 +102,4 @@ uint32_t *u32_regex_replace(pcre2_code *search, uint32_t *replace, uint32_t *inp
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/src/shape.h b/src/shape.h
index 05d0364..12627dd 100644
--- a/src/shape.h
+++ b/src/shape.h
@@ -76,4 +76,4 @@ void debug_print_shape(sentry_t *shape);
 
 #endif /*SHAPE_H*/
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/test/123_data/.config/boxes/boxes-config b/test/123_data/.config/boxes/boxes-config
index f6d8dbc..59ce6da 100644
--- a/test/123_data/.config/boxes/boxes-config
+++ b/test/123_data/.config/boxes/boxes-config
@@ -24,4 +24,4 @@ elastic (n,s,e, w)
 END test1
 
 
-#EOF                                                  vim: set ai sw=4:
+# vim: set ai sw=4:
diff --git a/test/test-config-unused.cfg b/test/test-config-unused.cfg
index 37f6d3d..92c7857 100644
--- a/test/test-config-unused.cfg
+++ b/test/test-config-unused.cfg
@@ -81,4 +81,4 @@ END retest
 
 # ============================================================================
 
-#EOF                                                  vim: set ai sw=4:
+# vim: set ai sw=4:
diff --git a/test/testrunner.sh b/test/testrunner.sh
index a810495..b2750ef 100755
--- a/test/testrunner.sh
+++ b/test/testrunner.sh
@@ -331,5 +331,3 @@ rm "${testOutputFile}"
 
 echo "    OK"
 exit 0
-
-#EOF
diff --git a/utest/cmdline_test.c b/utest/cmdline_test.c
index f3f273e..14a3f86 100644
--- a/utest/cmdline_test.c
+++ b/utest/cmdline_test.c
@@ -478,4 +478,4 @@ void test_version_requested(void **state)
 }
 
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/cmdline_test.h b/utest/cmdline_test.h
index b71e84d..1ff0e7f 100644
--- a/utest/cmdline_test.h
+++ b/utest/cmdline_test.h
@@ -67,4 +67,4 @@ void test_version_requested(void **state);
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/global_mock.c b/utest/global_mock.c
index f4a2a9a..05a858c 100644
--- a/utest/global_mock.c
+++ b/utest/global_mock.c
@@ -111,4 +111,4 @@ void teardown()
 }
 
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/global_mock.h b/utest/global_mock.h
index bffd450..ec80b60 100644
--- a/utest/global_mock.h
+++ b/utest/global_mock.h
@@ -36,4 +36,4 @@ void teardown();
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/main.c b/utest/main.c
index 60dfb3d..f7cadd1 100644
--- a/utest/main.c
+++ b/utest/main.c
@@ -252,4 +252,4 @@ int main(void)
 }
 
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/regulex_test.c b/utest/regulex_test.c
index 61e3fe9..14b15e5 100644
--- a/utest/regulex_test.c
+++ b/utest/regulex_test.c
@@ -110,4 +110,4 @@ void test_regex_replace_error(void **state)
 }
 
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/regulex_test.h b/utest/regulex_test.h
index dd8a867..db506eb 100644
--- a/utest/regulex_test.h
+++ b/utest/regulex_test.h
@@ -32,4 +32,4 @@ void test_regex_replace_error(void **state);
 #endif
 
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */
diff --git a/utest/utest_tools.h b/utest/utest_tools.h
index dbf92d2..714f833 100644
--- a/utest/utest_tools.h
+++ b/utest/utest_tools.h
@@ -41,4 +41,4 @@ void print_array_s(size_t p_array[], size_t p_len);
 
 #endif
 
-/*EOF*/                                          /* vim: set cindent sw=4: */
+/* vim: set cindent sw=4: */