diff --git a/classpath/jni-util.h b/classpath/jni-util.h
index d04c5de64a..0ad6d9d636 100644
--- a/classpath/jni-util.h
+++ b/classpath/jni-util.h
@@ -19,6 +19,10 @@
 
 #undef JNIEXPORT
 
+#ifdef UNUSED
+#undef UNUSED
+#endif
+
 #if (defined __MINGW32__) || (defined _MSC_VER)
 #define PLATFORM_WINDOWS
 #define PATH_SEPARATOR ';'
diff --git a/classpath/sockets.h b/classpath/sockets.h
index 00c968b14b..12b9dca9a2 100644
--- a/classpath/sockets.h
+++ b/classpath/sockets.h
@@ -16,9 +16,9 @@
 #ifndef SOCKETS_H_
 #define SOCKETS_H_
 
-#include "avian/common.h"
 #include "jni.h"
 #include "jni-util.h"
+#include "avian/common.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <winsock2.h>
diff --git a/src/avian/common.h b/src/avian/common.h
index b08e2dc659..e1e6a76de3 100644
--- a/src/avian/common.h
+++ b/src/avian/common.h
@@ -25,6 +25,10 @@
 #include "avian/types.h"
 #include "math.h"
 
+#ifdef UNUSED
+#undef UNUSED
+#endif
+
 #ifdef _MSC_VER
 
 #include "float.h"