diff --git a/Token.h b/Token.h
index 5e4a6317f..2c24f7aff 100644
--- a/Token.h
+++ b/Token.h
@@ -65,6 +65,12 @@ namespace solidity
 // an argument (at any position) for a TOKEN_LIST call. It does
 // nothing with tokens belonging to the respective category.
 
+#if defined(__MINGW32__)
+#undef IN
+#undef DELETE
+#undef CONST
+#endif
+
 #define IGNORE_TOKEN(name, string, precedence)
 
 #define TOKEN_LIST(T, K)												\
diff --git a/Types.h b/Types.h
index 8474c6c03..99c083c00 100644
--- a/Types.h
+++ b/Types.h
@@ -67,6 +67,9 @@ private:
 	MemberMap m_memberTypes;
 };
 
+#if defined(__MINGW32__)
+#undef VOID
+#endif
 
 /**
  * Abstract base class that forms the root of the type hierarchy.