5 files changed, 6 insertions, 6 deletions
diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in
index 3c5d1a95b9..36e24d2475 100644
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@ -29,7 +29,7 @@
 
 @EXT_INCLUDE_CODE@
 
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
 @EXT_MODULE_PTRS@
 };
 
diff --git a/main/internal_functions_nw.c b/main/internal_functions_nw.c
index 912e9bf397..a79ad6595a 100644
--- a/main/internal_functions_nw.c
+++ b/main/internal_functions_nw.c
@@ -62,7 +62,7 @@
 
 /* {{{ php_builtin_extensions[]
  */
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
 	phpext_standard_ptr,
 #if HAVE_BCMATH
 	phpext_bcmath_ptr,
diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index a2d7cf0e29..a14d9e9329 100644
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -118,7 +118,7 @@
 
 /* {{{ php_builtin_extensions[]
  */
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
 	phpext_standard_ptr
 #if HAVE_BCMATH
 	,phpext_bcmath_ptr
diff --git a/main/php_logos.c b/main/php_logos.c
index 05c29152c7..c544d7fdf3 100644
--- a/main/php_logos.c
+++ b/main/php_logos.c
@@ -25,7 +25,7 @@
 #include "SAPI.h"
 
 typedef struct _php_info_logo { 
-	char *mimetype;
+	const char *mimetype;
 	int mimelen;
 	const unsigned char *data; 
 	int size; 
@@ -33,7 +33,7 @@ typedef struct _php_info_logo {
 
 HashTable phpinfo_logo_hash;
 
-PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, const unsigned char *data, int size)
+PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size)
 {
 	php_info_logo info_logo;
 
diff --git a/main/php_logos.h b/main/php_logos.h
index e8aafcefc4..f08f28e088 100644
--- a/main/php_logos.h
+++ b/main/php_logos.h
@@ -23,7 +23,7 @@
 #define _PHP_LOGOS_H
 
 BEGIN_EXTERN_C()
-PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, const unsigned char *data, int size);
+PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype, const unsigned char *data, int size);
 PHPAPI int php_unregister_info_logo(char *logo_string);
 END_EXTERN_C()