Only in flac-1.2.1\include: private
Only in flac-1.2.1: msvc
diff -ru temp\flac-1.2.1\src\libFLAC\ogg_decoder_aspect.c flac-1.2.1\src\libFLAC\ogg_decoder_aspect.c
--- temp\flac-1.2.1\src\libFLAC\ogg_decoder_aspect.c	Fri Feb 02 07:23:10 2007
+++ flac-1.2.1\src\libFLAC\ogg_decoder_aspect.c	Wed Dec 29 15:07:24 2010
@@ -33,6 +33,8 @@
 #  include <config.h>
 #endif
 
+#ifdef FLAC__HAS_OGG
+
 #include <string.h> /* for memcpy() */
 #include "FLAC/assert.h"
 #include "private/ogg_decoder_aspect.h"
@@ -251,3 +253,6 @@
 
 	return FLAC__OGG_DECODER_ASPECT_READ_STATUS_OK;
 }
+
+#endif // #ifdef FLAC__HAS_OGG
+// eof
diff -ru temp\flac-1.2.1\src\libFLAC\ogg_encoder_aspect.c flac-1.2.1\src\libFLAC\ogg_encoder_aspect.c
--- temp\flac-1.2.1\src\libFLAC\ogg_encoder_aspect.c	Fri Feb 02 07:23:14 2007
+++ flac-1.2.1\src\libFLAC\ogg_encoder_aspect.c	Wed Dec 29 15:07:24 2010
@@ -33,6 +33,8 @@
 #  include <config.h>
 #endif
 
+#ifdef FLAC__HAS_OGG
+
 #include <string.h> /* for memset() */
 #include "FLAC/assert.h"
 #include "private/ogg_encoder_aspect.h"
@@ -225,3 +227,6 @@
 
 	return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
+
+#endif // #ifdef FLAC__HAS_OGG
+// eof
diff -ru temp\flac-1.2.1\src\libFLAC\ogg_helper.c flac-1.2.1\src\libFLAC\ogg_helper.c
--- temp\flac-1.2.1\src\libFLAC\ogg_helper.c	Mon Sep 10 07:10:42 2007
+++ flac-1.2.1\src\libFLAC\ogg_helper.c	Wed Dec 29 15:07:25 2010
@@ -33,6 +33,8 @@
 #  include <config.h>
 #endif
 
+#ifdef FLAC__HAS_OGG
+
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memcmp(), memcpy() */
 #include "FLAC/assert.h"
@@ -207,3 +209,6 @@
 
 	return true;
 }
+
+#endif // #ifdef FLAC__HAS_OGG
+// eof
diff -ru temp\flac-1.2.1\src\libFLAC\ogg_mapping.c flac-1.2.1\src\libFLAC\ogg_mapping.c
--- temp\flac-1.2.1\src\libFLAC\ogg_mapping.c	Fri Feb 02 07:23:16 2007
+++ flac-1.2.1\src\libFLAC\ogg_mapping.c	Wed Dec 29 15:07:25 2010
@@ -33,6 +33,8 @@
 #  include <config.h>
 #endif
 
+#ifdef FLAC__HAS_OGG
+
 #include "private/ogg_mapping.h"
 
 const unsigned FLAC__OGG_MAPPING_PACKET_TYPE_LEN = 8; /* bits */
@@ -45,3 +47,6 @@
 const unsigned FLAC__OGG_MAPPING_VERSION_MINOR_LEN = 8; /* bits */
 
 const unsigned FLAC__OGG_MAPPING_NUM_HEADERS_LEN = 16; /* bits */
+
+#endif // #ifdef FLAC__HAS_OGG
+// eof
diff -ru temp\flac-1.2.1\src\share\replaygain_analysis\replaygain_analysis.c flac-1.2.1\src\share\replaygain_analysis\replaygain_analysis.c
--- temp\flac-1.2.1\src\share\replaygain_analysis\replaygain_analysis.c	Thu Jun 14 07:40:46 2007
+++ flac-1.2.1\src\share\replaygain_analysis\replaygain_analysis.c	Wed Dec 29 14:54:37 2010
@@ -98,7 +98,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "replaygain_analysis.h"
+#include "share/replaygain_analysis.h"
 
 Float_t ReplayGainReferenceLoudness = 89.0; /* in dB SPL */
 
diff -ru temp\flac-1.2.1\src\share\replaygain_synthesis\replaygain_synthesis.c flac-1.2.1\src\share\replaygain_synthesis\replaygain_synthesis.c
--- temp\flac-1.2.1\src\share\replaygain_synthesis\replaygain_synthesis.c	Mon Mar 12 07:07:46 2007
+++ flac-1.2.1\src\share\replaygain_synthesis\replaygain_synthesis.c	Wed Dec 29 14:51:35 2010
@@ -41,7 +41,7 @@
 #include <string.h> /* for memset() */
 #include <math.h>
 #include "private/fast_float_math_hack.h"
-#include "replaygain_synthesis.h"
+#include "share/replaygain_synthesis.h"
 #include "FLAC/assert.h"
 
 #ifndef FLaC__INLINE
diff -ru temp\flac-1.2.1\src\share\utf8\utf8.c flac-1.2.1\src\share\utf8\utf8.c
--- temp\flac-1.2.1\src\share\utf8\utf8.c	Tue Sep 11 06:47:40 2007
+++ flac-1.2.1\src\share\utf8\utf8.c	Wed Dec 29 14:49:39 2010
@@ -31,7 +31,7 @@
 #include <string.h>
 
 #include "share/alloc.h"
-#include "utf8.h"
+#include "share/utf8.h"
 #include "charset.h"
 
 
