7 files changed, 13 insertions, 15 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c
index c6aea3d003..eec07555ef 100644
--- a/main/fopen_wrappers.c
+++ b/main/fopen_wrappers.c
@@ -244,7 +244,7 @@ PHPAPI int php_check_open_basedir(char *path)
 	return 0;
 }
 
-FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char **opened_path)
+static FILE *php_fopen_and_set_opened_path(const char *path, char *mode, char **opened_path)
 {
 		FILE *fp;
 
diff --git a/main/main.c b/main/main.c
index 93ff276093..b52ae64031 100644
--- a/main/main.c
+++ b/main/main.c
@@ -304,7 +304,7 @@ void php_log_err(char *log_message)
 #define PRINTF_BUFFER_SIZE 1024*4
 
 /* wrapper for modules to use PHPWRITE */
-PHPAPI int php_write(void *buf, int size)
+PHPAPI int php_write(void *buf, uint size)
 {
 	return PHPWRITE(buf, size);
 }
diff --git a/main/php.h b/main/php.h
index 670335d63c..c8a0a3699c 100644
--- a/main/php.h
+++ b/main/php.h
@@ -156,7 +156,7 @@ typedef unsigned int socklen_t;
 #include "safe_mode.h"
 
 #ifndef HAVE_STRERROR
-extern char *strerror(int);
+char *strerror(int);
 #endif
 
 #include "fopen-wrappers.h"
@@ -240,12 +240,12 @@ extern char **environ;
 #define php_sleep sleep
 #endif
 
-extern void phperror(char *error);
-extern PHPAPI int php_write(void *buf, int size);
-extern PHPAPI int php_printf(const char *format, ...);
-extern void php_log_err(char *log_message);
-extern int Debug(char *format, ...);
-extern int cfgparse(void);
+void phperror(char *error);
+PHPAPI int php_write(void *buf, uint size);
+PHPAPI int php_printf(const char *format, ...);
+void php_log_err(char *log_message);
+int Debug(char *format, ...);
+int cfgparse(void);
 
 #define php_error zend_error
 
@@ -264,9 +264,6 @@ int php_global_shutdown_internal_extensions(void);
 
 int mergesort(void *base, size_t nmemb, register size_t size, int (*cmp) (const void *, const void *));
 
-/*from basic functions*/
-extern PHPAPI int _php_error_log(int opt_err,char *message,char *opt,char *headers);
-
 PHPAPI void php_register_pre_request_shutdown(void (*func)(void *), void *userdata);
 
 PHPAPI int cfg_get_long(char *varname, long *result);
diff --git a/main/php_ini.c b/main/php_ini.c
index 417415f594..dc5ebf1e24 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -103,7 +103,7 @@ static int ini_key_compare(const void *a, const void *b)
 }
 
 
-void php_ini_sort_entries()
+void php_ini_sort_entries(void)
 {
 	zend_hash_sort(&known_directives, qsort, ini_key_compare, 0);
 }
diff --git a/main/php_ini.h b/main/php_ini.h
index 4fdaf126d8..7c5721f6ca 100644
--- a/main/php_ini.h
+++ b/main/php_ini.h
@@ -55,7 +55,7 @@ int php_ini_mstartup(void);
 int php_ini_mshutdown(void);
 int php_ini_rshutdown(void);
 
-void php_ini_sort_entries();
+void php_ini_sort_entries(void);
 
 PHPAPI int php_register_ini_entries(php_ini_entry *ini_entry, int module_number);
 PHPAPI void php_unregister_ini_entries(int module_number);
diff --git a/main/php_ticks.c b/main/php_ticks.c
index bb6ac715bb..c93200c9ad 100644
--- a/main/php_ticks.c
+++ b/main/php_ticks.c
@@ -55,7 +55,7 @@ PHPAPI int php_remove_tick_function(void (*func)(int))
 	return SUCCESS;
 }
 
-void php_tick_iterator(void *data, void *arg)
+static void php_tick_iterator(void *data, void *arg)
 {
 	void (*func)(int);
 	func = (void(*)(int))data;
diff --git a/main/php_variables.c b/main/php_variables.c
index 180a2c0d1d..3fa22a9c33 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -23,6 +23,7 @@
 #include "ext/standard/php_standard.h"
 #include "php_variables.h"
 #include "php_globals.h"
+#include "php_content_types.h"
 #include "SAPI.h"
 
 #include "zend_globals.h"