diff --git a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
index 2196400b83..510f060e79 100644
--- a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
+++ b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
@@ -436,17 +436,24 @@ namespace
     }
 
     //==============================================================================
-    static File findSimilarlyNamedHeader (const Array<File>& allFiles, const String& name)
+    static File findSimilarlyNamedHeader (const Array<File>& allFiles, const String& name, const File& sourceFile)
     {
+        File result;
+
         for (int i = 0; i < allFiles.size(); ++i)
         {
             const File& f = allFiles.getReference(i);
 
-            if (f.getFileName().equalsIgnoreCase (name))
-                return f;
+            if (f.getFileName().equalsIgnoreCase (name) && f != sourceFile)
+            {
+                if (result.exists())
+                    return File(); // multiple possible results, so don't change it!
+
+                result = f;
+            }
         }
 
-        return File();
+        return result;
     }
 
     static void fixIncludes (const File& file, const Array<File>& allFiles)
@@ -472,7 +479,7 @@ namespace
 
                 if (! target.exists())
                 {
-                    File header = findSimilarlyNamedHeader (allFiles, target.getFileName());
+                    File header = findSimilarlyNamedHeader (allFiles, target.getFileName(), file);
 
                     if (header.exists())
                     {
diff --git a/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/metadata.h b/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/metadata.h
index 29c73e0fd1..06c6d98f94 100644
--- a/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/metadata.h
+++ b/modules/juce_audio_formats/codecs/flac/libFLAC/include/private/metadata.h
@@ -33,7 +33,7 @@
 #ifndef FLAC__PRIVATE__METADATA_H
 #define FLAC__PRIVATE__METADATA_H
 
-#include "FLAC/metadata.h"
+#include "../../../metadata.h"
 
 /* WATCHOUT: all malloc()ed data in the block is free()ed; this may not
  * be a consistent state (e.g. PICTURE) or equivalent to the initial