diff --git a/include/FLAC++/export.h b/include/FLAC++/export.h
index f3460a87..addc0c1d 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(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define FLACPP_API
 
 #else
diff --git a/include/FLAC/export.h b/include/FLAC/export.h
index ddc25450..d47d89b6 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(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define FLAC_API
 
 #else
diff --git a/include/OggFLAC++/export.h b/include/OggFLAC++/export.h
index c0c58301..48eadfb1 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(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define OggFLACPP_API
 
 #else
diff --git a/include/OggFLAC/export.h b/include/OggFLAC/export.h
index a98d1945..aec839d2 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(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define OggFLAC_API
 
 #else
diff --git a/src/libFLAC++/Makefile.vc b/src/libFLAC++/Makefile.vc
index 8c9fd684..b555f9b6 100644
--- a/src/libFLAC++/Makefile.vc
+++ b/src/libFLAC++/Makefile.vc
@@ -22,10 +22,10 @@ SUFFIXES = .cpp
 
 !IFDEF DEBUG
 .cpp.obj:
-	$(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .cpp.obj:
-	$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 CPP_FILES= \
diff --git a/src/libFLAC/Makefile.vc b/src/libFLAC/Makefile.vc
index a47967c0..04dcacb5 100644
--- a/src/libFLAC/Makefile.vc
+++ b/src/libFLAC/Makefile.vc
@@ -22,10 +22,10 @@ NASM=nasmw
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM -DFLAC__OVERFLOW_DETECT /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) /D "_LIB" -DVERSION=\"1.0.4\" -DFLAC__NO_DLL -DFLAC__CPU_IA32 -DFLAC__HAS_NASM /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/libOggFLAC++/Makefile.vc b/src/libOggFLAC++/Makefile.vc
index 42f5aa5a..3d466a35 100644
--- a/src/libOggFLAC++/Makefile.vc
+++ b/src/libOggFLAC++/Makefile.vc
@@ -22,10 +22,10 @@ SUFFIXES = .cpp
 
 !IFDEF DEBUG
 .cpp.obj:
-	$(cc) /D "_LIB" /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /GX /GR $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .cpp.obj:
-	$(cc) /D "_LIB" /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 /GR $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 CPP_FILES= \
diff --git a/src/libOggFLAC/Makefile.vc b/src/libOggFLAC/Makefile.vc
index 7e4308d4..4df2d463 100644
--- a/src/libOggFLAC/Makefile.vc
+++ b/src/libOggFLAC/Makefile.vc
@@ -20,10 +20,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I ".\include" /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/plugin_common/Makefile.vc b/src/plugin_common/Makefile.vc
index 6154b03b..9f2be207 100644
--- a/src/plugin_common/Makefile.vc
+++ b/src/plugin_common/Makefile.vc
@@ -2,10 +2,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/plugin_common/export.h b/src/plugin_common/export.h
index 08734a6c..eb0b6341 100644
--- a/src/plugin_common/export.h
+++ b/src/plugin_common/export.h
@@ -19,7 +19,7 @@
 #ifndef FLAC__PLUGIN_COMMON__EXPORT_H
 #define FLAC__PLUGIN_COMMON__EXPORT_H
 
-#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define PLUGIN_COMMON_API
 
 #else
diff --git a/src/share/Makefile.vc b/src/share/Makefile.vc
index 2acda94a..15f9c3ac 100644
--- a/src/share/Makefile.vc
+++ b/src/share/Makefile.vc
@@ -2,10 +2,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /GX $(cdebug) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX -DNODEBUG $<
+	$(cc) /D "_LIB" -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I "..\..\include\share" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \