diff --git a/Zend/zend.h b/Zend/zend.h
index 86f1aa36c38..1a7b5b9d7c2 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -140,6 +140,10 @@ typedef unsigned int zend_uint;
 typedef unsigned long zend_ulong;
 typedef unsigned short zend_ushort;
 
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L
 #endif
diff --git a/Zend/zend_hash.c b/Zend/zend_hash.c
index f551dcde468..b9a0fae4e1b 100644
--- a/Zend/zend_hash.c
+++ b/Zend/zend_hash.c
@@ -26,10 +26,6 @@
 # include <stdlib.h>
 #endif
 
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
-
 #define HANDLE_NUMERIC(key, length, func) {												\
 	register char *tmp=key;																\
 																						\
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index ed400dabe84..bdd1a9a8cea 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -39,7 +39,6 @@
 #endif
 
 #include <errno.h>
-#include <limits.h>
 #include "zend.h"
 #include "zend_alloc.h"
 #include "zend_language_parser.h"
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 2a11174e471..dd8b3f91839 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <limits.h>
 #include <ctype.h>
 #include <math.h>