Reorganise headers a bit, include everything in the private header

Author: mkoppanen

config.m4

@@ -479,8 +479,6 @@ if test "$PHP_MEMCACHED" != "no"; then
     [
       PHP_ADD_EXTENSION_DEP(memcached, spl, true)
     ])
-
   fi
-
 fi
 

php_libmemcached_compat.c

@@ -14,6 +14,8 @@
   +----------------------------------------------------------------------+
 */
 
+#include "php_memcached.h"
+#include "php_memcached_private.h"
 #include "php_libmemcached_compat.h"
 
 memcached_st *php_memc_create_str (const char *str, size_t str_len)

php_libmemcached_compat.h

@@ -20,10 +20,6 @@
 /* this is the version(s) we support */
 #include <libmemcached/memcached.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 memcached_st *php_memc_create_str (const char *str, size_t str_len);
 
 #ifndef HAVE_LIBMEMCACHED_SERVER_TEMPORARILY_MARKER_DISABLED

php_memcached.c

@@ -22,28 +22,6 @@
  * - ability to set binary protocol for sessions
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <php.h>
-#include <php_main.h>
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#include <php_ini.h>
-#include <SAPI.h>
-#include <ext/standard/info.h>
-#include <zend_extensions.h>
-#include <zend_exceptions.h>
-#include <ext/standard/php_smart_str.h>
-#include <ext/standard/php_var.h>
-#include <ext/standard/basic_functions.h>
-
 #include "php_memcached.h"
 #include "php_memcached_private.h"
 #include "php_memcached_server.h"

php_memcached.h

@@ -20,6 +20,7 @@
 #define PHP_MEMCACHED_H
 
 #include "php.h"
+#include "main/php_config.h"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

php_memcached_private.h

@@ -19,12 +19,32 @@
 #ifndef PHP_MEMCACHED_PRIVATE_H
 #define PHP_MEMCACHED_PRIVATE_H
 
-#include "php_libmemcached_compat.h"
+#include "main/php_config.h"
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include "php_libmemcached_compat.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <php.h>
+#include <php_main.h>
+
+#ifdef ZTS
+#  include "TSRM.h"
+#endif
+
+#include <php_ini.h>
+#include <SAPI.h>
+#include <ext/standard/info.h>
+#include <zend_extensions.h>
+#include <zend_exceptions.h>
+#include <ext/standard/php_smart_str.h>
+#include <ext/standard/php_var.h>
+#include <ext/standard/basic_functions.h>
+
 #ifdef PHP_WIN32
 # include "win32/php_stdint.h"
 #else

php_memcached_server.c

@@ -14,15 +14,9 @@
   +----------------------------------------------------------------------+
 */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <php.h>
 #include "php_memcached.h"
 #include "php_memcached_private.h"
 #include "php_memcached_server.h"
-#include "php_libmemcached_compat.h"
 
 #include <event2/listener.h>
 

php_memcached_session.c

@@ -14,23 +14,6 @@
   +----------------------------------------------------------------------+
 */
 
-#include <stdlib.h>
-#include <string.h>
-#include <php.h>
-#include <php_main.h>
-
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
-#include <php_ini.h>
-#include <SAPI.h>
-#include <ext/standard/info.h>
-#include <zend_extensions.h>
-#include <zend_exceptions.h>
-#include <ext/standard/php_smart_str.h>
-#include <ext/standard/php_var.h>
-
 #include "php_memcached.h"
 #include "php_memcached_private.h"
 #include "php_memcached_session.h"