diff --git a/include/share/getopt.h b/include/share/getopt.h
index 0cb909a1..b8285a51 100644
--- a/include/share/getopt.h
+++ b/include/share/getopt.h
@@ -34,7 +34,7 @@
 #ifndef FLAC__SHARE__GETOPT_H
 #define FLAC__SHARE__GETOPT_H
 
-#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define GETOPT_API
 
 #else
diff --git a/include/share/utf8.h b/include/share/utf8.h
index 38190f10..24541f5b 100644
--- a/include/share/utf8.h
+++ b/include/share/utf8.h
@@ -1,7 +1,7 @@
 #ifndef FLAC__SHARE__UTF8_H
 #define FLAC__SHARE__UTF8_H
 
-#if defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
 #define UTF8_API
 
 #else
diff --git a/src/flac/Makefile.vc b/src/flac/Makefile.vc
index f04af306..cf313ed3 100644
--- a/src/flac/Makefile.vc
+++ b/src/flac/Makefile.vc
@@ -21,10 +21,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DFLAC__HAS_OGG -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/metaflac/Makefile.vc b/src/metaflac/Makefile.vc
index eae9291f..6f1e3a2c 100644
--- a/src/metaflac/Makefile.vc
+++ b/src/metaflac/Makefile.vc
@@ -19,10 +19,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/plugin_winamp2/Makefile.vc b/src/plugin_winamp2/Makefile.vc
index 0e4f0669..f3527f6b 100644
--- a/src/plugin_winamp2/Makefile.vc
+++ b/src/plugin_winamp2/Makefile.vc
@@ -19,10 +19,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL /GX $(cdebug) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) $(cvarsdll) /I "..\..\include" /I ".\include" /I ".." -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/test_libFLAC++/Makefile.vc b/src/test_libFLAC++/Makefile.vc
index 4ac5f036..5881f538 100644
--- a/src/test_libFLAC++/Makefile.vc
+++ b/src/test_libFLAC++/Makefile.vc
@@ -21,18 +21,18 @@ SUFFIXES = .cpp
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
 !endif
 
 !IFDEF DEBUG
 .cpp.obj:
-	$(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .cpp.obj:
-	$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/test_libFLAC/Makefile.vc b/src/test_libFLAC/Makefile.vc
index 94d6cf67..1981a3d0 100644
--- a/src/test_libFLAC/Makefile.vc
+++ b/src/test_libFLAC/Makefile.vc
@@ -19,10 +19,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\libFLAC\include" /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/test_libOggFLAC++/Makefile.vc b/src/test_libOggFLAC++/Makefile.vc
index cc391147..30140804 100644
--- a/src/test_libOggFLAC++/Makefile.vc
+++ b/src/test_libOggFLAC++/Makefile.vc
@@ -21,18 +21,18 @@ SUFFIXES = .cpp
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
 !endif
 
 !IFDEF DEBUG
 .cpp.obj:
-	$(cc) /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL /GR /D "_LIB" /GX $(cdebug) $(cflags) /I "..\..\include" -DSTRICT -YX /Od /D "_DEBUG" $<
 !else
 .cpp.obj:
-	$(cc) /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /GR /D "_LIB" /O2 $(crelease) $(cflags) /I "..\..\include" -DSTRICT -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/test_libOggFLAC/Makefile.vc b/src/test_libOggFLAC/Makefile.vc
index 2936d60c..97084389 100644
--- a/src/test_libOggFLAC/Makefile.vc
+++ b/src/test_libOggFLAC/Makefile.vc
@@ -19,10 +19,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
 !endif
 
 C_FILES= \
diff --git a/src/test_streams/Makefile.vc b/src/test_streams/Makefile.vc
index 0baa8b5a..9aba7b43 100644
--- a/src/test_streams/Makefile.vc
+++ b/src/test_streams/Makefile.vc
@@ -19,10 +19,10 @@
 
 !IFDEF DEBUG
 .c.obj:
-	$(cc) $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
+	$(cc) -DFLAC__NO_DLL $(cdebug) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX /Od /D "_DEBUG" $<
 !else
 .c.obj:
-	$(cc) /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
+	$(cc) -DFLAC__NO_DLL /O2 $(crelease) $(cflags) /I "..\..\include" /I ".\include" -DSTRICT -DVERSION=\"1.0.4\" -YX -DNODEBUG $<
 !endif
 
 C_FILES= \