diff --git a/src/hb-common.h b/src/hb-common.h
index ebb10b3c7..6648486ff 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -39,10 +39,6 @@ HB_BEGIN_DECLS
 
 
 #ifdef _MSC_VER
-#define _HB__STR2__(x) #x
-#define _HB__STR1__(x) _HB__STR2__(x)
-#define _HB__LOC__ __FILE__ "("_HB__STR1__(__LINE__)") : Warning Msg: "
-#pragma message(_HB__LOC__"Not using stdint.h; integer types may have wrong size")
 typedef signed char int8_t;
 typedef unsigned char uint8_t;
 typedef signed short int16_t;
@@ -51,9 +47,6 @@ typedef signed int int32_t;
 typedef unsigned int uint32_t;
 typedef signed long long int64_t;
 typedef unsigned long long uint64_t;
-#ifndef __cplusplus
-#define inline __inline
-#endif
 #else
 #include <stdint.h>
 #endif
diff --git a/src/hb-private.h b/src/hb-private.h
index eecb4419f..69a815327 100644
--- a/src/hb-private.h
+++ b/src/hb-private.h
@@ -90,6 +90,7 @@ ASSERT_STATIC (sizeof (uint32_t) == 4);
 ASSERT_STATIC (sizeof (int64_t) == 8);
 ASSERT_STATIC (sizeof (uint64_t) == 8);
 
+ASSERT_STATIC (sizeof (hb_var_int_t) == 4);
 
 /* Misc */
 
@@ -223,6 +224,9 @@ typedef GStaticMutex hb_mutex_t;
 #else
 
 #ifdef _MSC_VER
+#define _HB__STR2__(x) #x
+#define _HB__STR1__(x) _HB__STR2__(x)
+#define _HB__LOC__ __FILE__ "("_HB__STR1__(__LINE__)") : Warning Msg: "
 #pragma message(_HB__LOC__"Could not find any system to define platform macros, library will NOT be thread-safe")
 #else
 #warning "Could not find any system to define platform macros, library will NOT be thread-safe"