diff --git a/src/lib/lib.mak b/src/lib/lib.mak
index 57140d0da4d..f9ba0fdbed0 100644
--- a/src/lib/lib.mak
+++ b/src/lib/lib.mak
@@ -389,7 +389,7 @@ $(OBJ)/libflac.a: $(LIBFLACOBJS)
 
 $(LIBOBJ)/libflac/%.o: $(LIBSRC)/libflac/libFLAC/%.c | $(OSPREBUILD)
 	@echo Compiling $<...
-	$(CC) $(CDEFS) $(CONLYFLAGS) $(CCOMFLAGS) $(FLACOPTS) -I$(LIBSRC)/libflac/include -c $< -o $@
+	$(CC) $(CDEFS) $(CONLYFLAGS) $(CCOMFLAGS) $(FLACOPTS) -I$(LIBSRC)/libflac/include -I$(LIBSRC)/libflac/LIBFLAC/include -c $< -o $@
 
 
 
diff --git a/src/lib/libflac/include/private/all.h b/src/lib/libflac/libFLAC/include/private/all.h
similarity index 100%
rename from src/lib/libflac/include/private/all.h
rename to src/lib/libflac/libFLAC/include/private/all.h
diff --git a/src/lib/libflac/include/private/bitmath.h b/src/lib/libflac/libFLAC/include/private/bitmath.h
similarity index 100%
rename from src/lib/libflac/include/private/bitmath.h
rename to src/lib/libflac/libFLAC/include/private/bitmath.h
diff --git a/src/lib/libflac/include/private/bitreader.h b/src/lib/libflac/libFLAC/include/private/bitreader.h
similarity index 100%
rename from src/lib/libflac/include/private/bitreader.h
rename to src/lib/libflac/libFLAC/include/private/bitreader.h
diff --git a/src/lib/libflac/include/private/bitwriter.h b/src/lib/libflac/libFLAC/include/private/bitwriter.h
similarity index 100%
rename from src/lib/libflac/include/private/bitwriter.h
rename to src/lib/libflac/libFLAC/include/private/bitwriter.h
diff --git a/src/lib/libflac/include/private/cpu.h b/src/lib/libflac/libFLAC/include/private/cpu.h
similarity index 100%
rename from src/lib/libflac/include/private/cpu.h
rename to src/lib/libflac/libFLAC/include/private/cpu.h
diff --git a/src/lib/libflac/include/private/crc.h b/src/lib/libflac/libFLAC/include/private/crc.h
similarity index 100%
rename from src/lib/libflac/include/private/crc.h
rename to src/lib/libflac/libFLAC/include/private/crc.h
diff --git a/src/lib/libflac/include/private/fixed.h b/src/lib/libflac/libFLAC/include/private/fixed.h
similarity index 100%
rename from src/lib/libflac/include/private/fixed.h
rename to src/lib/libflac/libFLAC/include/private/fixed.h
diff --git a/src/lib/libflac/include/private/float.h b/src/lib/libflac/libFLAC/include/private/float.h
similarity index 100%
rename from src/lib/libflac/include/private/float.h
rename to src/lib/libflac/libFLAC/include/private/float.h
diff --git a/src/lib/libflac/include/private/format.h b/src/lib/libflac/libFLAC/include/private/format.h
similarity index 100%
rename from src/lib/libflac/include/private/format.h
rename to src/lib/libflac/libFLAC/include/private/format.h
diff --git a/src/lib/libflac/include/private/lpc.h b/src/lib/libflac/libFLAC/include/private/lpc.h
similarity index 100%
rename from src/lib/libflac/include/private/lpc.h
rename to src/lib/libflac/libFLAC/include/private/lpc.h
diff --git a/src/lib/libflac/include/private/md5.h b/src/lib/libflac/libFLAC/include/private/md5.h
similarity index 100%
rename from src/lib/libflac/include/private/md5.h
rename to src/lib/libflac/libFLAC/include/private/md5.h
diff --git a/src/lib/libflac/include/private/memory.h b/src/lib/libflac/libFLAC/include/private/memory.h
similarity index 100%
rename from src/lib/libflac/include/private/memory.h
rename to src/lib/libflac/libFLAC/include/private/memory.h
diff --git a/src/lib/libflac/include/private/metadata.h b/src/lib/libflac/libFLAC/include/private/metadata.h
similarity index 100%
rename from src/lib/libflac/include/private/metadata.h
rename to src/lib/libflac/libFLAC/include/private/metadata.h
diff --git a/src/lib/libflac/include/private/stream_encoder_framing.h b/src/lib/libflac/libFLAC/include/private/stream_encoder_framing.h
similarity index 100%
rename from src/lib/libflac/include/private/stream_encoder_framing.h
rename to src/lib/libflac/libFLAC/include/private/stream_encoder_framing.h
diff --git a/src/lib/libflac/include/private/window.h b/src/lib/libflac/libFLAC/include/private/window.h
similarity index 100%
rename from src/lib/libflac/include/private/window.h
rename to src/lib/libflac/libFLAC/include/private/window.h
diff --git a/src/lib/libflac/include/protected/all.h b/src/lib/libflac/libFLAC/include/protected/all.h
similarity index 100%
rename from src/lib/libflac/include/protected/all.h
rename to src/lib/libflac/libFLAC/include/protected/all.h
diff --git a/src/lib/libflac/include/protected/stream_decoder.h b/src/lib/libflac/libFLAC/include/protected/stream_decoder.h
similarity index 100%
rename from src/lib/libflac/include/protected/stream_decoder.h
rename to src/lib/libflac/libFLAC/include/protected/stream_decoder.h
diff --git a/src/lib/libflac/include/protected/stream_encoder.h b/src/lib/libflac/libFLAC/include/protected/stream_encoder.h
similarity index 100%
rename from src/lib/libflac/include/protected/stream_encoder.h
rename to src/lib/libflac/libFLAC/include/protected/stream_encoder.h