diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h
index 5922f4b6..9b6d10b2 100644
--- a/include/FLAC++/export.h
+++ b/include/FLAC++/export.h
@@ -20,7 +20,7 @@
 #ifndef FLACPP__EXPORT_H
 #define FLACPP__EXPORT_H
 
-#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
 #define FLACPP_API
 
 #else
diff --git a/include/FLAC/export.h b/include/FLAC/export.h
index 4d6ab9e3..925c8ade 100644
--- a/include/FLAC/export.h
+++ b/include/FLAC/export.h
@@ -20,7 +20,7 @@
 #ifndef FLAC__EXPORT_H
 #define FLAC__EXPORT_H
 
-#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
 #define FLAC_API
 
 #else
diff --git a/include/OggFLAC++/export.h b/include/OggFLAC++/export.h
index 099dc2c7..7a096829 100644
--- a/include/OggFLAC++/export.h
+++ b/include/OggFLAC++/export.h
@@ -20,7 +20,7 @@
 #ifndef OggFLACPP__EXPORT_H
 #define OggFLACPP__EXPORT_H
 
-#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
 #define OggFLACPP_API
 
 #else
diff --git a/include/OggFLAC/export.h b/include/OggFLAC/export.h
index 7b8e2faa..49f931bf 100644
--- a/include/OggFLAC/export.h
+++ b/include/OggFLAC/export.h
@@ -20,7 +20,7 @@
 #ifndef OggFLAC__EXPORT_H
 #define OggFLAC__EXPORT_H
 
-#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || !defined(_MSC_VER)
 #define OggFLAC_API
 
 #else