diff --git a/ext/hash/php_hash_adler32.h b/ext/hash/php_hash_adler32.h
index 90953573c69..091fdeb3488 100644
--- a/ext/hash/php_hash_adler32.h
+++ b/ext/hash/php_hash_adler32.h
@@ -17,8 +17,6 @@
 #ifndef PHP_HASH_ADLER32_H
 #define PHP_HASH_ADLER32_H
 
-#include "ext/standard/basic_functions.h"
-
 typedef struct {
 	uint32_t state;
 } PHP_ADLER32_CTX;
diff --git a/ext/hash/php_hash_gost.h b/ext/hash/php_hash_gost.h
index 45110dfb7b5..66992b09b97 100644
--- a/ext/hash/php_hash_gost.h
+++ b/ext/hash/php_hash_gost.h
@@ -17,8 +17,6 @@
 #ifndef PHP_HASH_GOST_H
 #define PHP_HASH_GOST_H
 
-#include "ext/standard/basic_functions.h"
-
 /* GOST context */
 typedef struct {
 	uint32_t state[16];
diff --git a/ext/hash/php_hash_haval.h b/ext/hash/php_hash_haval.h
index 7f1fb6bf0fa..e3a3a31b368 100644
--- a/ext/hash/php_hash_haval.h
+++ b/ext/hash/php_hash_haval.h
@@ -17,7 +17,6 @@
 #ifndef PHP_HASH_HAVAL_H
 #define PHP_HASH_HAVAL_H
 
-#include "ext/standard/basic_functions.h"
 /* HAVAL context. */
 typedef struct {
 	uint32_t state[8];
diff --git a/ext/hash/php_hash_ripemd.h b/ext/hash/php_hash_ripemd.h
index da5621acd7b..0065450d21b 100644
--- a/ext/hash/php_hash_ripemd.h
+++ b/ext/hash/php_hash_ripemd.h
@@ -16,7 +16,6 @@
 
 #ifndef PHP_HASH_RIPEMD_H
 #define PHP_HASH_RIPEMD_H
-#include "ext/standard/basic_functions.h"
 
 /* RIPEMD context. */
 typedef struct {
diff --git a/ext/hash/php_hash_sha.h b/ext/hash/php_hash_sha.h
index 7336a5ba0aa..d5b04ddd2f4 100644
--- a/ext/hash/php_hash_sha.h
+++ b/ext/hash/php_hash_sha.h
@@ -19,7 +19,6 @@
 #define PHP_HASH_SHA_H
 
 #include "ext/standard/sha1.h"
-#include "ext/standard/basic_functions.h"
 
 /* SHA224 context. */
 typedef struct {
diff --git a/ext/hash/php_hash_sha3.h b/ext/hash/php_hash_sha3.h
index b574087f60f..8381a8943b4 100644
--- a/ext/hash/php_hash_sha3.h
+++ b/ext/hash/php_hash_sha3.h
@@ -17,8 +17,6 @@
 #ifndef PHP_HASH_SHA3_H
 #define PHP_HASH_SHA3_H
 
-#include "php.h"
-
 typedef struct {
 #ifdef HAVE_SLOW_HASH3
 	unsigned char state[200]; // 5 * 5 * sizeof(uint64)
diff --git a/ext/hash/php_hash_snefru.h b/ext/hash/php_hash_snefru.h
index 217eb8727ef..df90e8e4696 100644
--- a/ext/hash/php_hash_snefru.h
+++ b/ext/hash/php_hash_snefru.h
@@ -21,8 +21,6 @@
  * AKA "Xerox Secure Hash Function"
  */
 
-#include "ext/standard/basic_functions.h"
-
 /* SNEFRU context */
 typedef struct {
 	uint32_t state[16];
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
index c09e39579a4..736d644516a 100644
--- a/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@ -29,6 +29,7 @@
 #ifdef ZEND_WIN32
 #include "ext/standard/md5.h"
 #endif
+#include "ext/standard/php_filestat.h"
 
 #include "ZendAccelerator.h"
 #include "zend_file_cache.h"
diff --git a/ext/standard/md5.h b/ext/standard/md5.h
index 0003a934be6..c488b5c534e 100644
--- a/ext/standard/md5.h
+++ b/ext/standard/md5.h
@@ -21,8 +21,6 @@
 PHPAPI void make_digest(char *md5str, const unsigned char *digest);
 PHPAPI void make_digest_ex(char *md5str, const unsigned char *digest, int len);
 
-#include "ext/standard/basic_functions.h"
-
 /*
  * This is an OpenSSL-compatible implementation of the RSA Data Security,
  * Inc. MD5 Message-Digest Algorithm (RFC 1321).
diff --git a/ext/standard/sha1.h b/ext/standard/sha1.h
index afec81272ca..046d6db2cc4 100644
--- a/ext/standard/sha1.h
+++ b/ext/standard/sha1.h
@@ -17,8 +17,6 @@
 #ifndef SHA1_H
 #define SHA1_H
 
-#include "ext/standard/basic_functions.h"
-
 /* SHA1 context. */
 typedef struct {
 	uint32_t state[5];		/* state (ABCD) */