diff --git a/Zend/zend_float.c b/Zend/zend_float.c
index 90af0c4a5f9..ca2ed83282d 100644
--- a/Zend/zend_float.c
+++ b/Zend/zend_float.c
@@ -16,9 +16,9 @@
    +----------------------------------------------------------------------+
 */
 
-#include "zend.h"
-#include "zend_compile.h"
 #include "zend_float.h"
+#include "zend_globals.h" // struct _zend_executor_globals
+#include "zend_globals_macros.h" // for EG()
 
 ZEND_API void zend_init_fpu(void) /* {{{ */
 {
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index c8e91122a35..d4d67592a5f 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -19,6 +19,8 @@
 #ifndef ZEND_FLOAT_H
 #define ZEND_FLOAT_H
 
+#include "zend_portability.h" // for BEGIN_EXTERN_C
+
 BEGIN_EXTERN_C()
 
 /*