diff --git a/Zend/zend.c b/Zend/zend.c
index 376e792eca2..2f4c62c6601 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -1542,4 +1542,6 @@ void free_estring(char **str_p) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend.h b/Zend/zend.h
index 87d4b8fcba0..228b82b06fa 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -336,4 +336,6 @@ ZEND_API void zend_restore_error_handling(zend_error_handling *saved);
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 82def3a36d2..ca8b4e2f997 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -4328,4 +4328,6 @@ ZEND_API zend_bool zend_is_iterable(zval *iterable) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 9c81d99a978..865f5dd2914 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1323,4 +1323,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 70613b2b963..28c65312e6a 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2837,4 +2837,6 @@ ZEND_API void * __zend_realloc(void *p, size_t len)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index 33265c0b95a..b1d25e10902 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -402,4 +402,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_alloc_sizes.h b/Zend/zend_alloc_sizes.h
index 12203a19ea6..1a1f407c336 100644
--- a/Zend/zend_alloc_sizes.h
+++ b/Zend/zend_alloc_sizes.h
@@ -62,3 +62,13 @@
 	_(29, 3072,    4, 3, x, y)
 
 #endif /* ZEND_ALLOC_SIZES_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h
index 47504b55151..26ac74f5c4a 100644
--- a/Zend/zend_arena.h
+++ b/Zend/zend_arena.h
@@ -120,4 +120,6 @@ static zend_always_inline void zend_arena_release(zend_arena **arena_ptr, void *
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index c19a47f037e..772ba04e63a 100644
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -1721,3 +1721,13 @@ ZEND_API zend_string *zend_ast_export(const char *prefix, zend_ast *ast, const c
 	smart_str_0(&str);
 	return str.s;
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index 65d1f7c4d1c..a0aff31d709 100644
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -275,3 +275,13 @@ static zend_always_inline zend_ast *zend_ast_list_rtrim(zend_ast *ast) {
 	return ast;
 }
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_bitset.h b/Zend/zend_bitset.h
index c909887b089..da2dcacd92d 100644
--- a/Zend/zend_bitset.h
+++ b/Zend/zend_bitset.h
@@ -253,4 +253,6 @@ static inline int zend_bitset_last(zend_bitset set, uint32_t len)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_build.h b/Zend/zend_build.h
index 947aee450bd..fbe363bfc7a 100644
--- a/Zend/zend_build.h
+++ b/Zend/zend_build.h
@@ -44,3 +44,13 @@
 #define ZEND_BUILD_EXTRA
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 150603f8795..aebe2b121c5 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -2704,4 +2704,6 @@ ZEND_FUNCTION(get_extension_funcs)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_builtin_functions.h b/Zend/zend_builtin_functions.h
index 0da6ed22266..78944b78152 100644
--- a/Zend/zend_builtin_functions.h
+++ b/Zend/zend_builtin_functions.h
@@ -36,4 +36,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
index 2dd468d9545..2e4e103fb51 100644
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@ -726,4 +726,6 @@ void zend_closure_bind_var(zval *closure_zv, zend_string *var_name, zval *var) /
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_closures.h b/Zend/zend_closures.h
index 33664cd19c5..8f5c9c6bdaf 100644
--- a/Zend/zend_closures.h
+++ b/Zend/zend_closures.h
@@ -45,4 +45,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f854631f0b3..69fea4c2cf3 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -8656,4 +8656,6 @@ void zend_eval_const_expr(zend_ast **ast_ptr) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 99f8e372402..af67018bdc7 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -1057,4 +1057,6 @@ ZEND_API zend_bool zend_binary_op_produces_numeric_string_error(uint32_t opcode,
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_config.nw.h b/Zend/zend_config.nw.h
index 754191ef559..ad77b54c84b 100644
--- a/Zend/zend_config.nw.h
+++ b/Zend/zend_config.nw.h
@@ -86,4 +86,6 @@ typedef unsigned int uint;
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h
index aa289152920..2ba42cdc9d7 100644
--- a/Zend/zend_config.w32.h
+++ b/Zend/zend_config.w32.h
@@ -90,4 +90,6 @@ typedef unsigned int uint;
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 4d128c48437..f5a71ac6cc0 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -516,4 +516,6 @@ ZEND_API int zend_register_constant(zend_constant *c)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h
index 3622cc45b8d..3bbe9a81da8 100644
--- a/Zend/zend_constants.h
+++ b/Zend/zend_constants.h
@@ -89,4 +89,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_default_classes.c b/Zend/zend_default_classes.c
index 9cd888da371..af5dc3b91b5 100644
--- a/Zend/zend_default_classes.c
+++ b/Zend/zend_default_classes.c
@@ -43,4 +43,6 @@ ZEND_API void zend_register_default_classes(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
index a92ba405468..79c963492a5 100644
--- a/Zend/zend_dtrace.c
+++ b/Zend/zend_dtrace.c
@@ -115,3 +115,12 @@ ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *ret
 
 #endif /* HAVE_DTRACE */
 
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_dtrace.h b/Zend/zend_dtrace.h
index f2250eccaed..d1dbc49fd40 100644
--- a/Zend/zend_dtrace.h
+++ b/Zend/zend_dtrace.h
@@ -46,3 +46,13 @@ ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data, zval *ret
 #endif
 
 #endif	/* _ZEND_DTRACE_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_errors.h b/Zend/zend_errors.h
index 9f5cc8c5ea1..048dd6aa7b9 100644
--- a/Zend/zend_errors.h
+++ b/Zend/zend_errors.h
@@ -49,4 +49,6 @@
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 9895b09556c..4bf2b746cb0 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -1049,4 +1049,6 @@ ZEND_API ZEND_COLD void zend_throw_exception_object(zval *exception) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h
index bff4faa2758..e8817c652a9 100644
--- a/Zend/zend_exceptions.h
+++ b/Zend/zend_exceptions.h
@@ -88,4 +88,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index e2b750303f7..c5a4a471c5d 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -3060,4 +3060,6 @@ ZEND_API int ZEND_FASTCALL zend_check_arg_type(zend_function *zf, uint32_t arg_n
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index c412d802096..7edba6f2a51 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -379,4 +379,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index f3777d767b4..390a745c2df 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1729,4 +1729,6 @@ ZEND_API int zend_forbid_dynamic_call(const char *func_name) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 3b6ba48398e..ceda2a3e8db 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -327,4 +327,6 @@ ZEND_API size_t zend_extensions_op_array_persist(zend_op_array *op_array, void *
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h
index 204c1122095..caeb3a263b4 100644
--- a/Zend/zend_extensions.h
+++ b/Zend/zend_extensions.h
@@ -159,4 +159,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_float.c b/Zend/zend_float.c
index 107a6aa78af..27ba84dcafc 100644
--- a/Zend/zend_float.c
+++ b/Zend/zend_float.c
@@ -56,3 +56,13 @@ ZEND_API void zend_ensure_fpu_mode(void) /* {{{ */
 	XPFPA_SWITCH_DOUBLE();
 }
 /* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index f32c72e3cde..d0258e4c1a8 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -418,3 +418,13 @@ END_EXTERN_C()
 #endif /* FPU CONTROL */
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index d8757d07ad5..818539ae75d 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -1212,6 +1212,8 @@ ZEND_API int zend_gc_collect_cycles(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  *
  * vim:noexpandtab:
  */
diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h
index 10c881cfeab..e71d2c4f445 100644
--- a/Zend/zend_gc.h
+++ b/Zend/zend_gc.h
@@ -167,4 +167,6 @@ static zend_always_inline void gc_check_possible_root(zend_refcounted *ref)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index d7d6035869a..e08e7d65aa1 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -1261,4 +1261,6 @@ void zend_register_generator_ce(void) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h
index 5509f6305ce..2b8a6c347f2 100644
--- a/Zend/zend_generators.h
+++ b/Zend/zend_generators.h
@@ -143,4 +143,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index c026b30d340..d9e872ae0e0 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -302,4 +302,6 @@ struct _zend_php_scanner_globals {
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_globals_macros.h b/Zend/zend_globals_macros.h
index e4cd15dccec..a6f7b29dc64 100644
--- a/Zend/zend_globals_macros.h
+++ b/Zend/zend_globals_macros.h
@@ -76,4 +76,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index faf5f8575f7..c1ac05cc3db 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -2601,4 +2601,6 @@ convert:
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h
index 82e10653034..7faedca299e 100644
--- a/Zend/zend_hash.h
+++ b/Zend/zend_hash.h
@@ -1087,4 +1087,6 @@ static zend_always_inline void _zend_hash_append_ind(HashTable *ht, zend_string
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_highlight.c b/Zend/zend_highlight.c
index 49b6015b87d..d2c98f3cf33 100644
--- a/Zend/zend_highlight.c
+++ b/Zend/zend_highlight.c
@@ -239,5 +239,7 @@ ZEND_API void zend_strip(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
 
diff --git a/Zend/zend_highlight.h b/Zend/zend_highlight.h
index b0a42358ddb..bb2e5753bc1 100644
--- a/Zend/zend_highlight.h
+++ b/Zend/zend_highlight.h
@@ -57,4 +57,6 @@ extern zend_syntax_highlighter_ini syntax_highlighter_ini;
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 868a0bddf07..7689a7c963d 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -1723,4 +1723,6 @@ void zend_check_deprecated_constructor(const zend_class_entry *ce) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_inheritance.h b/Zend/zend_inheritance.h
index f593e2cff62..653734b296e 100644
--- a/Zend/zend_inheritance.h
+++ b/Zend/zend_inheritance.h
@@ -45,4 +45,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c
index e6070dfb912..54ee1492229 100644
--- a/Zend/zend_ini.c
+++ b/Zend/zend_ini.c
@@ -750,4 +750,6 @@ ZEND_API ZEND_INI_MH(OnUpdateStringUnempty) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ini.h b/Zend/zend_ini.h
index 46ad4d99840..41d38adcef7 100644
--- a/Zend/zend_ini.h
+++ b/Zend/zend_ini.h
@@ -198,4 +198,6 @@ typedef struct _zend_ini_parser_param {
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index 0a06f21f9e2..333d001ef71 100644
--- a/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@ -411,4 +411,6 @@ constant_string:
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ini_scanner.h b/Zend/zend_ini_scanner.h
index fe2c2b71f4c..38348aac91e 100644
--- a/Zend/zend_ini_scanner.h
+++ b/Zend/zend_ini_scanner.h
@@ -44,4 +44,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index e078c7f6b2c..7a6484c2ba1 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -560,4 +560,6 @@ ZEND_API void zend_register_interfaces(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_interfaces.h b/Zend/zend_interfaces.h
index fbb84705001..90203775fc4 100644
--- a/Zend/zend_interfaces.h
+++ b/Zend/zend_interfaces.h
@@ -89,4 +89,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_istdiostream.h b/Zend/zend_istdiostream.h
index ea65985a91b..80ea93e9058 100644
--- a/Zend/zend_istdiostream.h
+++ b/Zend/zend_istdiostream.h
@@ -41,4 +41,6 @@ public:
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index fe2554bb139..efbd3d028c6 100644
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -103,4 +103,6 @@ ZEND_API zend_object_iterator* zend_iterator_unwrap(zval *array_ptr)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_iterators.h b/Zend/zend_iterators.h
index 94185bcdc37..a6f7456d02b 100644
--- a/Zend/zend_iterators.h
+++ b/Zend/zend_iterators.h
@@ -88,4 +88,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index f1a7e388936..2c508a59fe1 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -1375,4 +1375,6 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h
index 70d6ec0172c..d426c7293cb 100644
--- a/Zend/zend_language_scanner.h
+++ b/Zend/zend_language_scanner.h
@@ -81,4 +81,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index ac96e3d69c7..c816b94b615 100644
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -343,4 +343,6 @@ const char *zend_rsrc_list_get_rsrc_type(zend_resource *res)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index fe3194931ea..2d6535c8053 100644
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -80,4 +80,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_llist.c b/Zend/zend_llist.c
index 677b7da4b7c..7d9b501da1e 100644
--- a/Zend/zend_llist.c
+++ b/Zend/zend_llist.c
@@ -316,4 +316,6 @@ ZEND_API void *zend_llist_get_prev_ex(zend_llist *l, zend_llist_position *pos)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_llist.h b/Zend/zend_llist.h
index 018d3c72b29..a0d1d2d57b4 100644
--- a/Zend/zend_llist.h
+++ b/Zend/zend_llist.h
@@ -83,4 +83,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_long.h b/Zend/zend_long.h
index 7aee02e76e2..0e62bb20b0f 100644
--- a/Zend/zend_long.h
+++ b/Zend/zend_long.h
@@ -137,4 +137,6 @@ static const char long_min_digits[] = LONG_MIN_DIGITS;
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h
index 11a939ae6df..0537d8d9b10 100644
--- a/Zend/zend_modules.h
+++ b/Zend/zend_modules.h
@@ -138,4 +138,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c
index a9489077299..c97f8bcb10d 100644
--- a/Zend/zend_multibyte.c
+++ b/Zend/zend_multibyte.c
@@ -218,6 +218,6 @@ ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value,
  * tab-width: 4
  * c-basic-offset: 4
  * End:
- * vim600: sw=4 ts=4 tw=78
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_multibyte.h b/Zend/zend_multibyte.h
index 867021f21e9..bd08afed203 100644
--- a/Zend/zend_multibyte.h
+++ b/Zend/zend_multibyte.h
@@ -85,6 +85,6 @@ END_EXTERN_C()
  * tab-width: 4
  * c-basic-offset: 4
  * End:
- * vim600: sw=4 ts=4 tw=78
- * vim<600: sw=4 ts=4 tw=78
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index e40cb463281..12c06af4347 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -336,4 +336,6 @@ static zend_always_inline size_t zend_safe_addmult(size_t nmemb, size_t size, si
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index e485ad0e3d0..df675a987d4 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1740,4 +1740,6 @@ ZEND_API zend_object_handlers std_object_handlers = {
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_object_handlers.h b/Zend/zend_object_handlers.h
index f9577eab18a..819185320f2 100644
--- a/Zend/zend_object_handlers.h
+++ b/Zend/zend_object_handlers.h
@@ -200,4 +200,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index 2c038042fc3..d5c375f6edc 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -263,4 +263,6 @@ ZEND_API zend_object *zend_objects_clone_obj(zval *zobject)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h
index c584b0f459a..6bcb5fe9227 100644
--- a/Zend/zend_objects.h
+++ b/Zend/zend_objects.h
@@ -41,4 +41,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index 6c622c6702a..d4de16fde18 100644
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -211,4 +211,6 @@ ZEND_API zend_object_handlers *zend_get_std_object_handlers(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index a1bc6e68106..c26284affef 100644
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -94,4 +94,6 @@ static zend_always_inline size_t zend_object_properties_size(zend_class_entry *c
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 895cd83b3f9..394b610aa99 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -750,4 +750,6 @@ ZEND_API binary_op_type get_binary_op(int opcode)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index ea9e506dd61..ffc4dcc9a2a 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -3133,4 +3133,6 @@ ZEND_API zend_long ZEND_FASTCALL zend_dval_to_lval_slow(double d)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index eb77c1c17c9..9c2df28479c 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -906,4 +906,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index eefbd7b8218..893633fe45c 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -518,4 +518,6 @@ static zend_always_inline double _zend_get_nan(void) /* {{{ */
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ptr_stack.c b/Zend/zend_ptr_stack.c
index 293f7fa7fd5..bd2e354549a 100644
--- a/Zend/zend_ptr_stack.c
+++ b/Zend/zend_ptr_stack.c
@@ -116,4 +116,6 @@ ZEND_API int zend_ptr_stack_num_elements(zend_ptr_stack *stack)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_ptr_stack.h b/Zend/zend_ptr_stack.h
index 85b11d79cb1..49e528c7ec1 100644
--- a/Zend/zend_ptr_stack.h
+++ b/Zend/zend_ptr_stack.h
@@ -124,4 +124,6 @@ static zend_always_inline void *zend_ptr_stack_top(zend_ptr_stack *stack)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_range_check.h b/Zend/zend_range_check.h
index 812db687020..749afa8a4c9 100644
--- a/Zend/zend_range_check.h
+++ b/Zend/zend_range_check.h
@@ -72,4 +72,6 @@
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index 368ad7b5b3b..874a9d42105 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -443,6 +443,6 @@ void zend_signal_startup(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
- * vim600: fdm=marker
- * vim: noet sw=4 ts=4
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_signal.h b/Zend/zend_signal.h
index b86f39e5f0f..d578195347c 100644
--- a/Zend/zend_signal.h
+++ b/Zend/zend_signal.h
@@ -119,4 +119,6 @@ ZEND_API int zend_sigaction(int signo, const struct sigaction *act, struct sigac
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_smart_str.c b/Zend/zend_smart_str.c
index 6ed3eacba56..b020fddbaad 100644
--- a/Zend/zend_smart_str.c
+++ b/Zend/zend_smart_str.c
@@ -124,3 +124,13 @@ ZEND_API void ZEND_FASTCALL smart_str_append_printf(smart_str *dest, const char
 	zend_printf_to_smart_str(dest, format, arg);
 	va_end(arg);
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_smart_str.h b/Zend/zend_smart_str.h
index f48ecebf3ba..cc8c8b7ec05 100644
--- a/Zend/zend_smart_str.h
+++ b/Zend/zend_smart_str.h
@@ -140,3 +140,12 @@ static zend_always_inline void smart_str_setl(smart_str *dest, const char *src,
 
 #endif
 
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_smart_str_public.h b/Zend/zend_smart_str_public.h
index da9f6e3aa9f..6d7a4f0bc2a 100644
--- a/Zend/zend_smart_str_public.h
+++ b/Zend/zend_smart_str_public.h
@@ -25,3 +25,13 @@ typedef struct {
 } smart_str;
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_smart_string.h b/Zend/zend_smart_string.h
index 80135334591..2282202792a 100644
--- a/Zend/zend_smart_string.h
+++ b/Zend/zend_smart_string.h
@@ -137,3 +137,13 @@ static zend_always_inline void smart_string_setl(smart_string *dest, char *src,
 }
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_smart_string_public.h b/Zend/zend_smart_string_public.h
index d580dd76e60..71e1170ce5d 100644
--- a/Zend/zend_smart_string_public.h
+++ b/Zend/zend_smart_string_public.h
@@ -31,3 +31,13 @@ typedef struct {
 } smart_string;
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_sort.c b/Zend/zend_sort.c
index 5b2b9c7c3f0..adc42d0ddae 100644
--- a/Zend/zend_sort.c
+++ b/Zend/zend_sort.c
@@ -380,6 +380,6 @@ done:
  * c-basic-offset: 4
  * tab-width: 4
  * End:
- * vim600: fdm=marker
- * vim: noet sw=4 ts=4
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_sort.h b/Zend/zend_sort.h
index fcf644d1fbf..22d6c87449a 100644
--- a/Zend/zend_sort.h
+++ b/Zend/zend_sort.h
@@ -36,4 +36,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_sprintf.c b/Zend/zend_sprintf.c
index 2631d49cb44..974e312d651 100644
--- a/Zend/zend_sprintf.c
+++ b/Zend/zend_sprintf.c
@@ -47,4 +47,6 @@ int zend_sprintf(char *buffer, const char *format, ...)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_stack.c b/Zend/zend_stack.c
index 25f264aaabc..951c33896f4 100644
--- a/Zend/zend_stack.c
+++ b/Zend/zend_stack.c
@@ -171,4 +171,6 @@ ZEND_API void zend_stack_clean(zend_stack *stack, void (*func)(void *), zend_boo
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_stack.h b/Zend/zend_stack.h
index 8362f560109..d1e8bcf0ec6 100644
--- a/Zend/zend_stack.h
+++ b/Zend/zend_stack.h
@@ -56,4 +56,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index ced5144c276..77968c9ec3b 100644
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -345,3 +345,13 @@ ZEND_API int zend_compare_file_handles(zend_file_handle *fh1, zend_file_handle *
 	}
 	return 0;
 } /* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_stream.h b/Zend/zend_stream.h
index 65e39018721..42a5f8b368b 100644
--- a/Zend/zend_stream.h
+++ b/Zend/zend_stream.h
@@ -98,3 +98,13 @@ typedef struct stat zend_stat_t;
 #endif
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_string.c b/Zend/zend_string.c
index 4e43975d333..4cfd3dedec8 100644
--- a/Zend/zend_string.c
+++ b/Zend/zend_string.c
@@ -223,4 +223,6 @@ ZEND_API void zend_interned_strings_switch_storage(void)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_string.h b/Zend/zend_string.h
index 7277101efde..400795a9b25 100644
--- a/Zend/zend_string.h
+++ b/Zend/zend_string.h
@@ -440,4 +440,6 @@ ZEND_KNOWN_STRINGS(_ZEND_STR_ID)
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_strtod.h b/Zend/zend_strtod.h
index 918ad807e02..60c8c59acac 100644
--- a/Zend/zend_strtod.h
+++ b/Zend/zend_strtod.h
@@ -36,3 +36,13 @@ ZEND_API int zend_shutdown_strtod(void);
 END_EXTERN_C()
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_strtod_int.h b/Zend/zend_strtod_int.h
index 4b4cfa39040..b9aadabd572 100644
--- a/Zend/zend_strtod_int.h
+++ b/Zend/zend_strtod_int.h
@@ -142,3 +142,12 @@ typedef unsigned long int uint32_t;
 
 #endif /* ZEND_STRTOD_INT_H */
 
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h
index 4d4b80af9f6..18421e58f6b 100644
--- a/Zend/zend_ts_hash.h
+++ b/Zend/zend_ts_hash.h
@@ -153,4 +153,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_type_info.h b/Zend/zend_type_info.h
index 0b975ee8c2d..a7549d669aa 100644
--- a/Zend/zend_type_info.h
+++ b/Zend/zend_type_info.h
@@ -65,4 +65,6 @@
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 98bf27c45ac..b78ed0c45af 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -1076,4 +1076,6 @@ static zend_always_inline uint32_t zval_delref_p(zval* pz) {
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_variables.h b/Zend/zend_variables.h
index f7abc81cc09..f63379003ff 100644
--- a/Zend/zend_variables.h
+++ b/Zend/zend_variables.h
@@ -121,4 +121,6 @@ END_EXTERN_C()
  * c-basic-offset: 4
  * indent-tabs-mode: t
  * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
  */
diff --git a/Zend/zend_virtual_cwd.h b/Zend/zend_virtual_cwd.h
index b2ba918bf2b..c1b48cfd45b 100644
--- a/Zend/zend_virtual_cwd.h
+++ b/Zend/zend_virtual_cwd.h
@@ -374,3 +374,13 @@ CWD_API realpath_cache_bucket** realpath_cache_get_buckets(void);
 #endif
 
 #endif /* VIRTUAL_CWD_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h
index caa896d3e13..9c6c0036272 100644
--- a/Zend/zend_vm.h
+++ b/Zend/zend_vm.h
@@ -38,3 +38,13 @@ END_EXTERN_C()
 #define ZEND_VM_SET_OPCODE_HANDLER(opline) zend_vm_set_opcode_handler(opline)
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index b3d6c995771..e6a7e57ef98 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -8819,3 +8819,13 @@ ZEND_VM_HELPER(zend_interrupt_helper, ANY, ANY)
 	}
 	ZEND_VM_CONTINUE();
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */
diff --git a/Zend/zend_vm_opcodes.h b/Zend/zend_vm_opcodes.h
index 6001400bf8e..ea863ec5ac1 100644
--- a/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@ -271,3 +271,13 @@ END_EXTERN_C()
 #define ZEND_VM_LAST_OPCODE                  195
 
 #endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: sw=4 ts=4 fdm=marker
+ * vim<600: sw=4 ts=4
+ */