diff --git a/include/FLAC/export.h b/include/FLAC/export.h
index c0f367e8..8d9e7931 100644
--- a/include/FLAC/export.h
+++ b/include/FLAC/export.h
@@ -72,8 +72,16 @@
 #define FLAC_API_VERSION_REVISION 0 /**< see above */
 #define FLAC_API_VERSION_AGE 0 /**< see above */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** \c 1 if the library has been compiled with support for Ogg FLAC, else \c 0. */
-extern int FLAC_API_SUPPORTS_OGG_FLAC;
+extern FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC;
+
+#ifdef __cplusplus
+}
+#endif
 
 /* \} */
 
diff --git a/src/libFLAC/libFLAC_dynamic.dsp b/src/libFLAC/libFLAC_dynamic.dsp
index 0a0f8428..7d285ea1 100644
--- a/src/libFLAC/libFLAC_dynamic.dsp
+++ b/src/libFLAC/libFLAC_dynamic.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC.dll"
+# ADD LINK32 ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\obj\release\bin/libFLAC.dll"
 
 !ELSEIF  "$(CFG)" == "libFLAC_dynamic - Win32 Debug"
 
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC.dll" /pdbtype:sept
+# ADD LINK32 ..\..\obj\release\lib\ogg_static.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\obj\debug\bin/libFLAC.dll" /pdbtype:sept
 
 !ENDIF 
 
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index d6e624a5..af476178 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -78,7 +78,7 @@
 
 
 /* technically this should be in an "export.c" but this is convenient enough */
-int FLAC_API_SUPPORTS_OGG_FLAC =
+FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC =
 #if FLAC__HAS_OGG
 	1
 #else