diff --git a/CMakeLists.txt b/CMakeLists.txt
index 925f0e40d..6bc98ec16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -345,14 +345,6 @@ else()
 	set(HAVE_SYS_FILIO_H 1)
 endif()
 
-if(HAVE_STDBOOL_H)
-	add_definitions(-DHAVE_STDBOOL_H)
-endif()
-
-if(HAVE_STDINT_H)
-	add_definitions(-DHAVE_STDINT_H)
-endif()
-
 if(NOT IOS)
 	check_struct_has_member("struct tm" tm_gmtoff time.h HAVE_TM_GMTOFF)
 else()
diff --git a/config.h.in b/config.h.in
index df24a3071..9dc44bdba 100644
--- a/config.h.in
+++ b/config.h.in
@@ -4,6 +4,8 @@
 /* Include files */
 #cmakedefine HAVE_FCNTL_H
 #cmakedefine HAVE_UNISTD_H
+#cmakedefine HAVE_STDINT_H
+#cmakedefine HAVE_STDBOOL_H
 #cmakedefine HAVE_INTTYPES_H
 #cmakedefine HAVE_SYS_MODEM_H
 #cmakedefine HAVE_SYS_FILIO_H
diff --git a/winpr/include/winpr/wtypes.h b/winpr/include/winpr/wtypes.h
index 2ba38fb1e..66b545b5a 100644
--- a/winpr/include/winpr/wtypes.h
+++ b/winpr/include/winpr/wtypes.h
@@ -23,6 +23,10 @@
 /* MSDN: Windows Data Types - http://msdn.microsoft.com/en-us/library/aa383751/ */
 /* [MS-DTYP]: Windows Data Types - http://msdn.microsoft.com/en-us/library/cc230273/ */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <wchar.h>
 #include <winpr/windows.h>