diff --git a/common/common.h b/common/common.h
index 31c928164..79e9af616 100644
--- a/common/common.h
+++ b/common/common.h
@@ -29,9 +29,11 @@
 
 #endif // !ENABLE_DEBUG
 
-#ifdef __GNUC__
 // Forces compiler to inline, even against its better judgement. Use wisely.
+#if defined(__GNUC__)
 #define FORCE_INLINE __attribute__((always_inline))
+#elif defined(WIN32)
+#define FORCE_INLINE __forceinline
 #else
 #define FORCE_INLINE
 #endif
diff --git a/source/convert.cc b/source/convert.cc
index 8d6d1b1f7..ddaa51f22 100644
--- a/source/convert.cc
+++ b/source/convert.cc
@@ -10,6 +10,7 @@
 
 
 #include "convert.h"
+#include "basic_types.h"
 
 #include <string.h>     // memcpy(), memset()
 #include <assert.h>