diff --git a/configure.ac b/configure.ac
index 58522499..5aeaa088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,6 +155,10 @@ if test "x${ac_cv_big_endian}" = "x1" ; then
   AC_DEFINE_UNQUOTED([JEMALLOC_BIG_ENDIAN], [ ])
 fi
 
+if test "x${je_cv_msvc}" = "xyes" -a "x${ac_cv_header_inttypes_h}" = "xno"; then
+  CPPFLAGS="$CPPFLAGS -I${srcroot}/include/msvc_compat/C99"
+fi
+
 AC_CHECK_SIZEOF([void *])
 if test "x${ac_cv_sizeof_void_p}" = "x8" ; then
   LG_SIZEOF_PTR=3
diff --git a/include/msvc_compat/inttypes.h b/include/msvc_compat/C99/inttypes.h
similarity index 100%
rename from include/msvc_compat/inttypes.h
rename to include/msvc_compat/C99/inttypes.h
diff --git a/include/msvc_compat/stdbool.h b/include/msvc_compat/C99/stdbool.h
similarity index 100%
rename from include/msvc_compat/stdbool.h
rename to include/msvc_compat/C99/stdbool.h
diff --git a/include/msvc_compat/stdint.h b/include/msvc_compat/C99/stdint.h
similarity index 100%
rename from include/msvc_compat/stdint.h
rename to include/msvc_compat/C99/stdint.h