diff --git a/cmake/config.in b/cmake/config.in
index f2524e41e43..6054b6dbe7b 100644
--- a/cmake/config.in
+++ b/cmake/config.in
@@ -19,9 +19,6 @@
 /* Define to 1 if you have the `gmtime_r' function. */
 #cmakedefine HAVE_GMTIME_R @HAVE_GMTIME_R@
 
-/* Define to 1 if you have the <limits.h> header file. */
-#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@
-
 /* Define to 1 if you have the <pcap/pcap.h> header file. */
 #cmakedefine HAVE_PCAP_PCAP_H @HAVE_PCAP_PCAP_H@
 
diff --git a/cmake/options.h.in b/cmake/options.h.in
index 985b54241d6..c46ada8045d 100644
--- a/cmake/options.h.in
+++ b/cmake/options.h.in
@@ -33,6 +33,9 @@ extern "C" {
 #endif
 
 #ifndef WOLFSSL_OPTIONS_IGNORE_SYS
+/* Since types.h depends on HAVE_LIMITS_H, we must define it in options.h. */
+#undef HAVE_LIMITS_H
+#cmakedefine HAVE_LIMITS_H @HAVE_LIMITS_H@
 #undef _GNU_SOURCE
 #cmakedefine _GNU_SOURCE
 #undef _POSIX_THREADS
diff --git a/configure.ac b/configure.ac
index 97445a22091..92b8c984ed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,9 @@ AC_ARG_ENABLE([freebsdkm-crypto-register],
     [ENABLED_BSDKM_REGISTER=no]
     )
 
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stddef.h time.h sys/ioctl.h sys/socket.h sys/time.h errno.h sys/un.h ctype.h sys/random.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stddef.h time.h sys/ioctl.h sys/socket.h sys/time.h errno.h sys/un.h ctype.h sys/random.h])
+# Special case: Since types.h depends on HAVE_LIMITS_H, we must define it in options.h.
+AC_CHECK_HEADER([limits.h], [AM_CPPFLAGS="$AM_CPPFLAGS -DHAVE_LIMITS_H=1"], [])
 AC_CHECK_LIB([network],[socket])
 AC_C_BIGENDIAN
 AC_C___ATOMIC