diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 172225f62..13eae2ff0 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-25   Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/winbase.h (WINBASEAPI): Guard with __INSIDE_CYGWIN__.
+
 2004-08-24  Sam Robb  <samrobb@users.sourceforge.net>
 
 	* include/winbase.h (GetFileSizeEx): Add _WIN32_WINNT >= 0x0500
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index a71fff2a1..c362d7b4b 100644
--- a/winsup/w32api/include/winbase.h
+++ b/winsup/w32api/include/winbase.h
@@ -5,7 +5,12 @@
 #endif
 
 #ifndef WINBASEAPI
+#ifdef __INSIDE_CYGWIN__
+#define WINBASEAPI
+#else
 #define WINBASEAPI DECLSPEC_IMPORT
+#endif
+
 #endif
 #ifdef __cplusplus
 extern "C" {