diff --git a/mozilla/sun-java/stubs/include/jni_md.h b/mozilla/sun-java/stubs/include/jni_md.h
index 0a0ef1de500..1277ad7b1aa 100644
--- a/mozilla/sun-java/stubs/include/jni_md.h
+++ b/mozilla/sun-java/stubs/include/jni_md.h
@@ -40,6 +40,8 @@
 #ifndef JNI_MD_H
 #define JNI_MD_H
 
+#include "prtypes.h" /* needed for _declspec */
+
 /*******************************************************************************
  * WHAT'S UP WITH THIS FILE?
  * 
@@ -94,7 +96,7 @@
 /* PC */
 #elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
 #	include <windows.h>
-#	if defined(_MSC_VER)
+#	if defined(_MSC_VER) || defined(__GNUC__)
 #		if defined(WIN32) || defined(_WIN32)
 #			define JNI_PUBLIC_API(ResultType)	_declspec(dllexport) ResultType __stdcall
 #			define JNI_PUBLIC_VAR(VarType)		VarType
diff --git a/mozilla/sun-java/stubs/include/jri_md.h b/mozilla/sun-java/stubs/include/jri_md.h
index a0dbd0c0d2c..f55dade8a93 100644
--- a/mozilla/sun-java/stubs/include/jri_md.h
+++ b/mozilla/sun-java/stubs/include/jri_md.h
@@ -43,7 +43,7 @@
 #define JRI_MD_H
 
 #include <assert.h>
-#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs */
+#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs & _declspec */
 
 #ifdef __cplusplus
 extern "C" {
@@ -81,7 +81,7 @@ extern "C" {
 #  endif
 #elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
 #	include <windows.h>
-#	if defined(_MSC_VER)
+#	if defined(_MSC_VER) || defined(__GNUC__)
 #		if defined(WIN32) || defined(_WIN32)
 #			define JRI_PUBLIC_API(ResultType)	_declspec(dllexport) ResultType
 #			define JRI_PUBLIC_VAR(VarType)		VarType