diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index 7f546f95cd0..daa254f8fcf 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -26,7 +26,6 @@
 
 /* PHP Includes */
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
 #include "main/php_network.h"
 
 /* for fileno() */
diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 5cffe3b09f0..e6e9512f230 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -32,8 +32,7 @@
 
 #include "php_dba.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/flock_compat.h"
+#include "ext/standard/flock_compat.h" /* Compatibility for Windows */
 
 #include "php_gdbm.h"
 #include "php_ndbm.h"
diff --git a/ext/fileinfo/php_libmagic.h b/ext/fileinfo/php_libmagic.h
index b077abf428f..9830cabb0d3 100644
--- a/ext/fileinfo/php_libmagic.h
+++ b/ext/fileinfo/php_libmagic.h
@@ -17,10 +17,7 @@
 #ifndef PHP_LIBMAGIC_H
 #define PHP_LIBMAGIC_H
 
-#include "php_fileinfo.h"
-
 #include "main/php_network.h"
-#include "ext/standard/php_string.h"
 #include "ext/pcre/php_pcre.h"
 
 #ifdef PHP_WIN32
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 3887481124a..0554bd62c0d 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -22,6 +22,8 @@
 #endif
 
 #include "php_filter.h"
+#include "main/php_variables.h"
+#include "ext/standard/info.h"
 
 ZEND_DECLARE_MODULE_GLOBALS(filter)
 
diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h
index aae9fd38b9d..ac15fa20f74 100644
--- a/ext/filter/php_filter.h
+++ b/ext/filter/php_filter.h
@@ -22,10 +22,6 @@
 #include "zend_API.h"
 #include "php.h"
 #include "php_ini.h"
-#include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/html.h"
-#include "php_variables.h"
 
 extern zend_module_entry filter_module_entry;
 #define phpext_filter_ptr &filter_module_entry
diff --git a/ext/filter/sanitizing_filters.c b/ext/filter/sanitizing_filters.c
index eac384172a6..647d559c1df 100644
--- a/ext/filter/sanitizing_filters.c
+++ b/ext/filter/sanitizing_filters.c
@@ -16,6 +16,8 @@
 
 #include "php_filter.h"
 #include "filter_private.h"
+#include "ext/standard/php_string.h"
+#include "ext/standard/html.h"
 #include "zend_smart_str.h"
 
 /* {{{ STRUCTS */
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c
index 6e923d2a512..8a6c5dec88a 100644
--- a/ext/libxml/libxml.c
+++ b/ext/libxml/libxml.c
@@ -23,7 +23,6 @@
 #include "SAPI.h"
 
 #include "zend_variables.h"
-#include "ext/standard/php_string.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"
 
diff --git a/ext/mbstring/mb_gpc.c b/ext/mbstring/mb_gpc.c
index 8be70f921fd..ff46087c7e9 100644
--- a/ext/mbstring/mb_gpc.c
+++ b/ext/mbstring/mb_gpc.c
@@ -21,15 +21,9 @@
 #include "php_variables.h"
 #include "libmbfl/mbfl/mbfilter_pass.h"
 #include "mbstring.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/php_mail.h"
 #include "ext/standard/url.h"
-#include "main/php_output.h"
-#include "ext/standard/info.h"
 
 #include "php_globals.h"
-#include "rfc1867.h"
-#include "php_content_types.h"
 #include "SAPI.h"
 #include "TSRM.h"
 
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 2d719c7e29e..a9670684cbd 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -28,14 +28,12 @@
 #include "ext/standard/php_string.h"
 #include "ext/standard/php_mail.h"
 #include "ext/standard/exec.h"
-#include "ext/standard/url.h"
 #include "main/php_output.h"
 #include "ext/standard/info.h"
 #include "ext/pcre/php_pcre.h"
 
 #include "libmbfl/mbfl/mbfilter_8bit.h"
 #include "libmbfl/mbfl/mbfilter_pass.h"
-#include "libmbfl/mbfl/mbfilter_wchar.h"
 #include "libmbfl/mbfl/eaw_table.h"
 #include "libmbfl/filters/mbfilter_base64.h"
 #include "libmbfl/filters/mbfilter_cjk.h"
@@ -43,13 +41,11 @@
 #include "libmbfl/filters/mbfilter_htmlent.h"
 #include "libmbfl/filters/mbfilter_uuencode.h"
 #include "libmbfl/filters/mbfilter_ucs4.h"
-#include "libmbfl/filters/mbfilter_utf8.h"
 #include "libmbfl/filters/mbfilter_utf16.h"
 #include "libmbfl/filters/mbfilter_singlebyte.h"
 #include "libmbfl/filters/translit_kana_jisx0201_jisx0208.h"
 #include "libmbfl/filters/unicode_prop.h"
 
-#include "php_variables.h"
 #include "php_globals.h"
 #include "rfc1867.h"
 #include "php_content_types.h"
@@ -69,6 +65,15 @@
 
 #include "rare_cp_bitvec.h"
 
+#ifdef __SSE2__
+#include <emmintrin.h>
+#endif
+
+#ifdef __SSE3__
+#include <immintrin.h>
+#include <pmmintrin.h>
+#endif
+
 /* }}} */
 
 /* {{{ prototypes */
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index fc22ca669c7..1702c8cf9d6 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -25,7 +25,6 @@
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
 #include "php_mysqli.h"
 #include "php_mysqli_structs.h"
 #include "mysqli_priv.h"
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 51a18696f51..df0306780fc 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -27,14 +27,12 @@
 #include "zend_attributes.h"
 
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
 #include "ext/standard/php_standard.h"
 #include "Zend/zend_interfaces.h"
 #include "zend_smart_str.h"
 
 #include "php_odbc.h"
 #include "php_odbc_includes.h"
-#include "php_globals.h"
 
 /* actually lives in main/ */
 #include "php_odbc_utils.h"
@@ -42,7 +40,6 @@
 #ifdef HAVE_UODBC
 
 #include <fcntl.h>
-#include "ext/standard/head.h"
 #include "php_ini.h"
 
 #define PHP_ODBC_BINMODE_PASSTHRU 0
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 92594c8ede8..3047f889419 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -16,15 +16,12 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "php_globals.h"
 #include "php_pcre.h"
 #include "ext/standard/info.h"
 #include "ext/standard/basic_functions.h"
 #include "zend_smart_str.h"
 #include "SAPI.h"
 
-#include "ext/standard/php_string.h"
-
 #define PREG_PATTERN_ORDER			1
 #define PREG_SET_ORDER				2
 #define PREG_OFFSET_CAPTURE			(1<<8)
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
index a540393c736..42e0c307d63 100644
--- a/ext/pdo_pgsql/pgsql_driver.c
+++ b/ext/pdo_pgsql/pgsql_driver.c
@@ -22,8 +22,7 @@
 
 #include "php.h"
 #include "php_ini.h"
-#include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
+#include "ext/standard/php_string.h" /* For php_addcslashes_str() in _pdo_pgsql_escape_credentials() */
 #include "main/php_network.h"
 #include "pdo/php_pdo.h"
 #include "pdo/php_pdo_driver.h"
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 9b06d8554f2..67450315c7d 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -21,7 +21,6 @@
 #include "php.h"
 #include <unistd.h>
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
 #include "php_posix.h"
 
 #ifdef HAVE_POSIX
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 4ad175c8ebe..f1e65698fc3 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -25,14 +25,12 @@
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
-#include <stdio.h>
 #include <string.h>
 #ifdef PHP_WIN32
 #include "win32/unistd.h"
 #endif
 #include "zend_globals.h"
 #include "zend_interfaces.h"
-#include "php_globals.h"
 #include "php_array.h"
 #include "basic_functions.h"
 #include "php_string.h"
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c
index 69ef1f3dffd..c9591e270a3 100644
--- a/ext/standard/browscap.c
+++ b/ext/standard/browscap.c
@@ -17,7 +17,6 @@
 #include "php.h"
 #include "php_browscap.h"
 #include "php_ini.h"
-#include "php_string.h"
 
 #include "zend_ini_scanner.h"
 #include "zend_globals.h"
diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index 8e5bf1a36c2..edb62c368fc 100644
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -21,7 +21,6 @@
 #include "file.h"
 #include "php_dir.h"
 #include "php_dir_int.h"
-#include "php_string.h"
 #include "php_scandir.h"
 #include "basic_functions.h"
 #include "dir_arginfo.h"
diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 5b8ba89de97..5b3ba60e5fd 100644
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -19,11 +19,9 @@
 #include "php.h"
 #include <ctype.h>
 #include "php_string.h"
-#include "ext/standard/head.h"
 #include "ext/standard/file.h"
 #include "basic_functions.h"
 #include "exec.h"
-#include "php_globals.h"
 #include "SAPI.h"
 
 #ifdef HAVE_SYS_WAIT_H
diff --git a/ext/standard/file.c b/ext/standard/file.c
index f1842941f23..651c13a4f8d 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -22,9 +22,7 @@
 /* {{{ includes */
 
 #include "php.h"
-#include "php_globals.h"
 #include "ext/standard/flock_compat.h"
-#include "ext/standard/exec.h"
 #include "ext/standard/php_filestat.h"
 #include "php_open_temporary_file.h"
 #include "ext/standard/basic_functions.h"
@@ -61,7 +59,6 @@
 # endif
 #endif
 
-#include "ext/standard/head.h"
 #include "php_string.h"
 #include "file.h"
 
@@ -73,14 +70,9 @@
 # endif
 #endif
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
 #include "fsock.h"
 #include "fopen_wrappers.h"
-#include "streamsfuncs.h"
-#include "php_globals.h"
+#include "streamsfuncs.h" /* To define constants in the arg_info */
 
 #ifdef HAVE_SYS_FILE_H
 # include <sys/file.h>
diff --git a/ext/standard/filters.c b/ext/standard/filters.c
index 452493ba745..9eead020394 100644
--- a/ext/standard/filters.c
+++ b/ext/standard/filters.c
@@ -19,7 +19,6 @@
 */
 
 #include "php.h"
-#include "php_globals.h"
 #include "ext/standard/basic_functions.h"
 #include "ext/standard/file.h"
 #include "ext/standard/php_string.h"
diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c
index b988422df21..ba0f73d9a9c 100644
--- a/ext/standard/formatted_print.c
+++ b/ext/standard/formatted_print.c
@@ -16,14 +16,11 @@
 
 #include <math.h>				/* modf() */
 #include "php.h"
-#include "ext/standard/head.h"
-#include "php_string.h"
 #include "zend_execute.h"
-#include <stdio.h>
 
 #include <locale.h>
 #ifdef ZTS
-#include "ext/standard/php_string.h"
+#include "ext/standard/php_string.h" /* for localeconv_r() */
 #define LCONV_DECIMAL_POINT (*lconv.decimal_point)
 #else
 #define LCONV_DECIMAL_POINT (*lconv->decimal_point)
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 896fff1e174..92cee224e06 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -41,12 +41,8 @@
 #include <php_config.h>
 #endif
 #include "php_standard.h"
-#include "php_string.h"
 #include "SAPI.h"
 #include <locale.h>
-#ifdef HAVE_LANGINFO_H
-#include <langinfo.h>
-#endif
 
 #include <zend_hash.h>
 #include "html_tables.h"
diff --git a/ext/standard/levenshtein.c b/ext/standard/levenshtein.c
index fc71f8a7bcc..d4688dcb9c1 100644
--- a/ext/standard/levenshtein.c
+++ b/ext/standard/levenshtein.c
@@ -15,7 +15,6 @@
  */
 
 #include "php.h"
-#include "php_string.h"
 
 /* {{{ reference_levdist
  * reference implementation, only optimized for memory usage, not speed */
diff --git a/ext/standard/link.c b/ext/standard/link.c
index 58098d14e87..6b7c96ca7d8 100644
--- a/ext/standard/link.c
+++ b/ext/standard/link.c
@@ -15,8 +15,6 @@
  */
 
 #include "php.h"
-#include "php_filestat.h"
-#include "php_globals.h"
 
 #if defined(HAVE_SYMLINK) || defined(PHP_WIN32)
 
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index a424825a40d..1fddded7015 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -39,7 +39,6 @@
 #include "php_syslog.h"
 #include "php_mail.h"
 #include "php_ini.h"
-#include "php_string.h"
 #include "exec.h"
 
 #ifdef PHP_WIN32
diff --git a/ext/standard/pack.c b/ext/standard/pack.c
index 6abdc98bd6d..28d0f3af11c 100644
--- a/ext/standard/pack.c
+++ b/ext/standard/pack.c
@@ -28,8 +28,6 @@
 #else
 #include <sys/param.h>
 #endif
-#include "ext/standard/head.h"
-#include "php_string.h"
 #include "pack.h"
 #ifdef HAVE_PWD_H
 #ifdef PHP_WIN32
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 124e5fae1c3..7f87864bcaa 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -15,15 +15,11 @@
  */
 
 #include "php.h"
-#include <stdio.h>
 #include <ctype.h>
 #include <signal.h>
-#include "php_string.h"
-#include "ext/standard/head.h"
 #include "ext/standard/basic_functions.h"
 #include "ext/standard/file.h"
 #include "exec.h"
-#include "php_globals.h"
 #include "SAPI.h"
 #include "main/php_network.h"
 #include "zend_smart_str.h"
diff --git a/ext/standard/soundex.c b/ext/standard/soundex.c
index 7d50be97e75..5c45f4d3ef6 100644
--- a/ext/standard/soundex.c
+++ b/ext/standard/soundex.c
@@ -16,9 +16,7 @@
 
 #include "php.h"
 #include <stdlib.h>
-#include <errno.h>
 #include <ctype.h>
-#include "php_string.h"
 
 /* Simple soundex algorithm as described by Knuth in TAOCP, vol 3 */
 /* {{{ Calculate the soundex key of a string */
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 7dea31294bd..c4165836ecb 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -16,11 +16,8 @@
 */
 
 #include "php.h"
-#include "php_globals.h"
 #include "ext/standard/flock_compat.h"
 #include "ext/standard/file.h"
-#include "ext/standard/php_filestat.h"
-#include "php_open_temporary_file.h"
 #include "ext/standard/basic_functions.h"
 #include "php_ini.h"
 #include "streamsfuncs.h"
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 058eeb37733..f71c2db5972 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -32,7 +32,6 @@
 #include "scanf.h"
 #include "zend_API.h"
 #include "zend_execute.h"
-#include "php_globals.h"
 #include "basic_functions.h"
 #include "zend_smart_str.h"
 #include <Zend/zend_exceptions.h>
diff --git a/ext/zip/zip_stream.c b/ext/zip/zip_stream.c
index 28c363ed89e..a32324347d6 100644
--- a/ext/zip/zip_stream.c
+++ b/ext/zip/zip_stream.c
@@ -26,8 +26,6 @@
 #include "fopen_wrappers.h"
 #include "php_zip.h"
 
-#include "ext/standard/url.h"
-
 /* needed for ssize_t definition */
 #include <sys/types.h>
 
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index 30fa5a86bf4..e81508bbdc0 100644
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -26,7 +26,6 @@
 #include "SAPI.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "ext/standard/php_string.h"
 #include "php_zlib.h"
 #include "zlib_arginfo.h"
 
diff --git a/main/SAPI.c b/main/SAPI.c
index f9d8693a2bc..ba34f7ef638 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -24,8 +24,6 @@
 #include "SAPI.h"
 #include "php_variables.h"
 #include "php_ini.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/pageinfo.h"
 #ifdef ZTS
 #include "TSRM.h"
 #endif