diff --git a/main/php.h b/main/php.h
index 880c3c5a00ac1..b985d4bf9f1c2 100644
--- a/main/php.h
+++ b/main/php.h
@@ -122,25 +122,25 @@
 	}
 
 #ifndef HAVE_STRLCPY
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 PHPAPI size_t php_strlcpy(char *dst, const char *src, size_t siz);
-END_EXTERN_C();
+END_EXTERN_C()
 #undef strlcpy
 #define strlcpy php_strlcpy
 #endif
 
 #ifndef HAVE_STRLCAT
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 PHPAPI size_t php_strlcat(char *dst, const char *src, size_t siz);
-END_EXTERN_C();
+END_EXTERN_C()
 #undef strlcat
 #define strlcat php_strlcat
 #endif
 
 #ifndef HAVE_STRTOK_R
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 char *strtok_r(char *s, const char *delim, char **last);
-END_EXTERN_C();
+END_EXTERN_C()
 #endif
 
 #ifndef HAVE_SOCKLEN_T
@@ -276,7 +276,7 @@ ssize_t pwrite(int, void *, size_t, off64_t);
 ssize_t pread(int, void *, size_t, off64_t);
 #endif
 
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 void phperror(char *error);
 PHPAPI int php_write(void *buf, uint size TSRMLS_DC);
 PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
@@ -284,7 +284,7 @@ PHPAPI int php_printf(const char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1,
 PHPAPI void php_log_err(char *log_message TSRMLS_DC);
 int Debug(char *format, ...) PHP_ATTRIBUTE_FORMAT(printf, 1, 2);
 int cfgparse(void);
-END_EXTERN_C();
+END_EXTERN_C()
 
 #define php_error zend_error
 
@@ -294,7 +294,7 @@ typedef enum {
 	EH_THROW
 } error_handling_t;
 
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 PHPAPI void php_set_error_handling(error_handling_t error_handling, zend_class_entry *exception_class TSRMLS_DC);
 #define php_std_error_handling() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC)
 
@@ -313,7 +313,7 @@ PHPAPI void php_error_docref1(const char *docref TSRMLS_DC, const char *param1,
 	PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 4, PHP_ATTR_FMT_OFFSET + 5);
 PHPAPI void php_error_docref2(const char *docref TSRMLS_DC, const char *param1, const char *param2, int type, const char *format, ...)
 	PHP_ATTRIBUTE_FORMAT(printf, PHP_ATTR_FMT_OFFSET + 5, PHP_ATTR_FMT_OFFSET + 6);
-END_EXTERN_C();
+END_EXTERN_C()
 
 #define php_error_docref php_error_docref0
 
@@ -327,7 +327,7 @@ END_EXTERN_C();
 #define php_memnstr zend_memnstr
 
 /* functions */
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 int php_startup_internal_extensions(void);
 
 int php_mergesort(void *base, size_t nmemb, register size_t size, int (*cmp)(const void *, const void * TSRMLS_DC) TSRMLS_DC);
@@ -337,7 +337,7 @@ PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userda
 PHPAPI int cfg_get_long(char *varname, long *result);
 PHPAPI int cfg_get_double(char *varname, double *result);
 PHPAPI int cfg_get_string(char *varname, char **result);
-END_EXTERN_C();
+END_EXTERN_C()
 
 /* PHP-named Zend macro wrappers */
 #define PHP_FN					ZEND_FN
diff --git a/main/php_ini.h b/main/php_ini.h
index 85c2e3910f6e9..4337505adc0b8 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -23,12 +23,12 @@
 
 #include "zend_ini.h"
 
-BEGIN_EXTERN_C();
+BEGIN_EXTERN_C()
 int php_init_config();
 int php_shutdown_config(void);
 void php_ini_delayed_modules_startup(TSRMLS_D);
 zval *cfg_get_entry(char *name, uint name_length);
-END_EXTERN_C();
+END_EXTERN_C()
 
 #define PHP_INI_USER	ZEND_INI_USER
 #define PHP_INI_PERDIR	ZEND_INI_PERDIR