diff --git a/compat.m4 b/compat.m4
index 47650f6d..8fa9abee 100644
--- a/compat.m4
+++ b/compat.m4
@@ -46,24 +46,6 @@ ifdef(
 	,
 	[AC_DEFUN([AC_PROG_SED], [AC_CHECK_PROGS([SED], [sed])])]
 )
-ifdef(
-	[AC_TYPE_INT8_T],
-	,
-	[
-		AC_CHECK_HEADERS([inttypes.h stdint.h])
-		test -z "${ac_cv_header_inttypes_h}${ac_cv_header_stdint_h}" && \
-			AC_MSG_ERROR([Required inttypes.h stdint.h not found])
-		
-		AC_DEFUN([AC_TYPE_INT8_T], [])
-		AC_DEFUN([AC_TYPE_INT16_T], [])
-		AC_DEFUN([AC_TYPE_INT32_T], [])
-		AC_DEFUN([AC_TYPE_INT64_T], [])
-		AC_DEFUN([AC_TYPE_UINT8_T], [])
-		AC_DEFUN([AC_TYPE_UINT16_T], [])
-		AC_DEFUN([AC_TYPE_UINT32_T], [])
-		AC_DEFUN([AC_TYPE_UINT64_T], [])
-	]
-)
 ifdef(
 	[PKG_CHECK_VAR],
 	,
diff --git a/configure.ac b/configure.ac
index 23dac74f..07a62ad8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,14 +409,6 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
 AC_TYPE_SIGNAL
 AX_TYPE_SOCKLEN_T
 AC_CHECK_SIZEOF([unsigned int])
diff --git a/src/openvpn/syshead.h b/src/openvpn/syshead.h
index 16f5ab11..bca71d5c 100644
--- a/src/openvpn/syshead.h
+++ b/src/openvpn/syshead.h
@@ -118,11 +118,9 @@
 #include <stdlib.h>
 #endif
 
-#ifdef HAVE_INTTYPES_H
+/* These headers belong to C99 and should be always be present */
 #include <inttypes.h>
-#elif defined(HAVE_STDINT_H)
 #include <stdint.h>
-#endif
 
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>