diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 33c4cd5df5..929be857a2 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -31,17 +31,11 @@
  * work which got its smarts from Daniel J. Bernstein's work on the same.
  */
 
-#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 #ifdef OPENSSL_NO_EC_NISTP_64_GCC_128
 NON_EMPTY_TRANSLATION_UNIT
 #else
 
-# ifndef OPENSSL_SYS_VMS
-#  include <stdint.h>
-# else
-#  include <inttypes.h>
-# endif
-
 # include <string.h>
 # include <openssl/err.h>
 # include "ec_lcl.h"
diff --git a/crypto/sha/keccak1600.c b/crypto/sha/keccak1600.c
index 1056f89281..9deba8f12a 100644
--- a/crypto/sha/keccak1600.c
+++ b/crypto/sha/keccak1600.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <stdint.h>
+#include <openssl/e_os2.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index de71475a49..003a9b14a6 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -20,11 +20,7 @@
 # include <openssl/crypto.h>
 
 # ifndef OPENSSL_NO_SCTP
-#  ifndef OPENSSL_SYS_VMS
-#   include <stdint.h>
-#  else
-#   include <inttypes.h>
-#  endif
+#  include <openssl/e_os2.h>
 # endif
 
 #ifdef  __cplusplus