diff --git a/include/libxml/xmlexports.h b/include/libxml/xmlexports.h
index 5b36fa95a..3149c7317 100644
--- a/include/libxml/xmlexports.h
+++ b/include/libxml/xmlexports.h
@@ -15,22 +15,19 @@
  * Symbol visibility
  */
 
-#if defined(_WIN32) || defined(__CYGWIN__)
-  #ifdef LIBXML_STATIC
-    #define XMLPUBLIC
-  #elif defined(IN_LIBXML)
-    #define XMLPUBLIC __declspec(dllexport)
+#if (defined(_WIN32) || defined(__CYGWIN__)) && !defined(LIBXML_STATIC)
+  #if defined(IN_LIBXML)
+    #define XMLPUBFUN __declspec(dllexport)
+    #define XMLPUBVAR __declspec(dllexport) extern
   #else
-    #define XMLPUBLIC __declspec(dllimport)
+    #define XMLPUBFUN __declspec(dllimport)
+    #define XMLPUBVAR __declspec(dllimport) extern
   #endif
 #else /* not Windows */
-  #define XMLPUBLIC
+  #define XMLPUBFUN
+  #define XMLPUBVAR extern
 #endif /* platform switch */
 
-#define XMLPUBFUN XMLPUBLIC
-
-#define XMLPUBVAR XMLPUBLIC extern
-
 /* Compatibility */
 #define XMLCALL
 #define XMLCDECL