diff --git a/Zend/zend.c b/Zend/zend.c
index 80bc98ab13f..ea9af02128e 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -996,7 +996,7 @@ static void unicode_globals_dtor(zend_unicode_globals *unicode_globals TSRMLS_DC
 }
 /* }}} */
 
-void zend_init_opcodes_handlers();
+void zend_init_opcodes_handlers(void);
 
 int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions) /* {{{ */
 {
@@ -1285,7 +1285,7 @@ void zend_append_version_info(zend_extension *extension) /* {{{ */
 }
 /* }}} */
 
-ZEND_API char *get_zend_version() /* {{{ */
+ZEND_API char *get_zend_version(void) /* {{{ */
 {
 	return zend_version_info;
 }
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 0c23dee2129..a214475e906 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -197,8 +197,8 @@ ZEND_API zend_class_entry *zend_u_fetch_class(zend_uchar type, zstr class_name,
 void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC);
 
 #ifdef ZEND_WIN32
-void zend_init_timeout_thread();
-void zend_shutdown_timeout_thread();
+void zend_init_timeout_thread(void);
+void zend_shutdown_timeout_thread(void);
 #define WM_REGISTER_ZEND_TIMEOUT		(WM_USER+1)
 #define WM_UNREGISTER_ZEND_TIMEOUT		(WM_USER+2)
 #endif
@@ -215,7 +215,7 @@ void zend_shutdown_timeout_thread();
 
 ZEND_API zval** zend_get_compiled_variable_value(zend_execute_data *execute_data_ptr, zend_uint var);
 
-void init_unicode_strings();
+void init_unicode_strings(void);
 
 #define ZEND_USER_OPCODE_CONTINUE   0 /* execute next opcode */
 #define ZEND_USER_OPCODE_RETURN     1 /* exit from executor (return from function) */
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 4001d8424f7..84a41c75589 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -57,7 +57,8 @@ UChar u_return[sizeof("return ")];
 UChar u_semicolon[sizeof(" ;")];
 UChar u_doublecolon[sizeof(" ;")];
 
-void init_unicode_strings() {
+void init_unicode_strings(void)
+{
 	u_charsToUChars("main", u_main, sizeof("main"));
 	u_charsToUChars("return ", u_return, sizeof("return "));
 	u_charsToUChars(" ;", u_semicolon, sizeof(" ;"));
@@ -1545,7 +1546,7 @@ static unsigned __stdcall timeout_thread_proc(void *pArgs) /* {{{ */
 }
 /* }}} */
 
-void zend_init_timeout_thread() /* {{{ */
+void zend_init_timeout_thread(void) /* {{{ */
 {
 	timeout_thread_event = CreateEvent(NULL, FALSE, FALSE, NULL);
 	timeout_thread_handle = CreateEvent(NULL, FALSE, FALSE, NULL);
@@ -1554,7 +1555,7 @@ void zend_init_timeout_thread() /* {{{ */
 }
 /* }}} */
 
-void zend_shutdown_timeout_thread() /* {{{ */
+void zend_shutdown_timeout_thread(void) /* {{{ */
 {
 	if (!timeout_thread_initialized) {
 		return;
diff --git a/Zend/zend_extensions.c b/Zend/zend_extensions.c
index 4f0e535e7bd..7107b3bd663 100644
--- a/Zend/zend_extensions.c
+++ b/Zend/zend_extensions.c
@@ -146,7 +146,7 @@ static int zend_extension_startup(zend_extension *extension) /* {{{ */
 }
 /* }}} */
 
-int zend_startup_extensions_mechanism() /* {{{ */
+int zend_startup_extensions_mechanism(void) /* {{{ */
 {
 	/* Startup extensions mechanism */
 	zend_llist_init(&zend_extensions, sizeof(zend_extension), (void (*)(void *)) zend_extension_dtor, 1);
@@ -155,7 +155,7 @@ int zend_startup_extensions_mechanism() /* {{{ */
 }
 /* }}} */
 
-int zend_startup_extensions() /* {{{ */
+int zend_startup_extensions(void) /* {{{ */
 {
 	zend_llist_apply_with_del(&zend_extensions, (int (*)(void *)) zend_extension_startup);
 	return SUCCESS;
diff --git a/Zend/zend_indent.c b/Zend/zend_indent.c
index 5e1ad1e0e23..7640edbdd38 100644
--- a/Zend/zend_indent.c
+++ b/Zend/zend_indent.c
@@ -46,7 +46,7 @@ static void handle_whitespace(int *emit_whitespace) /* {{{ */
 }
 /* }}} */
 
-ZEND_API void zend_indent() /* {{{ */
+ZEND_API void zend_indent(void) /* {{{ */
 {
 	zval token;
 	int token_type;
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c
index dd06c07a3ff..9d003604980 100644
--- a/Zend/zend_objects_API.c
+++ b/Zend/zend_objects_API.c
@@ -379,7 +379,7 @@ ZEND_API zval* zend_object_proxy_get(zval *property TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
-ZEND_API zend_object_handlers *zend_get_std_object_handlers() /* {{{ */
+ZEND_API zend_object_handlers *zend_get_std_object_handlers(void) /* {{{ */
 {
 	return &std_object_handlers;
 }
diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h
index cbf44fa99b4..2cbecdaab2f 100644
--- a/Zend/zend_objects_API.h
+++ b/Zend/zend_objects_API.h
@@ -81,7 +81,7 @@ ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects
 
 ZEND_API zval *zend_object_create_proxy(zval *object, zval *member TSRMLS_DC);
 
-ZEND_API zend_object_handlers *zend_get_std_object_handlers();
+ZEND_API zend_object_handlers *zend_get_std_object_handlers(void);
 END_EXTERN_C()
 
 #endif /* ZEND_OBJECTS_H */
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 86614c43625..5e442792966 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -2551,7 +2551,7 @@ ZEND_API int zval_is_true(zval *op) /* {{{ */
 /* }}} */
 
 #ifdef ZEND_USE_TOLOWER_L
-ZEND_API void zend_update_current_locale() /* {{{ */
+ZEND_API void zend_update_current_locale(void) /* {{{ */
 {
         current_locale = _get_current_locale();
 }
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 6bc46ecc2e4..cac4c2497f7 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -484,7 +484,7 @@ END_EXTERN_C()
 #endif
 
 #ifdef ZEND_USE_TOLOWER_L
-ZEND_API void zend_update_current_locale();
+ZEND_API void zend_update_current_locale(void);
 #else
 #define zend_update_current_locale()
 #endif
diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h
index c2444ec88de..de2e2cad8d1 100644
--- a/Zend/zend_vm.h
+++ b/Zend/zend_vm.h
@@ -21,7 +21,7 @@
 #ifndef ZEND_VM_H
 #define ZEND_VM_H
 
-ZEND_API void zend_vm_use_old_executor();
+ZEND_API void zend_vm_use_old_executor(void);
 ZEND_API void zend_vm_set_opcode_handler(zend_op* opcode);
 
 #define ZEND_VM_SET_OPCODE_HANDLER(opline) zend_vm_set_opcode_handler(opline)
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7ae8b891d2d..c9f991038cc 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -28572,7 +28572,7 @@ static int ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 }
 
 
-void zend_init_opcodes_handlers()
+void zend_init_opcodes_handlers(void)
 {
   static const opcode_handler_t labels[] = {
   	ZEND_NOP_SPEC_HANDLER,
diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl
index b7a269d39c1..5118a36a895 100644
--- a/Zend/zend_vm_execute.skl
+++ b/Zend/zend_vm_execute.skl
@@ -71,7 +71,7 @@ ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
 
 {%EXTERNAL_EXECUTOR%}
 
-void {%INITIALIZER_NAME%}()
+void {%INITIALIZER_NAME%}(void)
 {
   {%EXTERNAL_LABELS%}
 }