diff --git a/extras/Build/juce_build_tools/utils/juce_BinaryResourceFile.cpp b/extras/Build/juce_build_tools/utils/juce_BinaryResourceFile.cpp
index 04d68f12d8..fc9a7fbfa3 100644
--- a/extras/Build/juce_build_tools/utils/juce_BinaryResourceFile.cpp
+++ b/extras/Build/juce_build_tools/utils/juce_BinaryResourceFile.cpp
@@ -135,7 +135,9 @@ namespace build_tools
 
         cpp << "/* ==================================== " << resourceFileIdentifierString << " ====================================";
         writeComment (cpp);
-        cpp << "namespace " << className << newLine
+        cpp << "#include <cstring>" << newLine
+            << newLine
+            << "namespace " << className << newLine
             << "{" << newLine;
 
         while (i < files.size())
@@ -221,10 +223,8 @@ namespace build_tools
                 << "const char* getNamedResourceOriginalFilename (const char* resourceNameUTF8)"                         << newLine
                 << "{"                                                                                                   << newLine
                 << "    for (unsigned int i = 0; i < (sizeof (namedResourceList) / sizeof (namedResourceList[0])); ++i)" << newLine
-                << "    {"                                                                                               << newLine
-                << "        if (namedResourceList[i] == resourceNameUTF8)"                                               << newLine
+                << "        if (strcmp (namedResourceList[i], resourceNameUTF8) == 0)"                                   << newLine
                 << "            return originalFilenames[i];"                                                            << newLine
-                << "    }"                                                                                               << newLine
                 <<                                                                                                          newLine
                 << "    return nullptr;"                                                                                 << newLine
                 << "}"                                                                                                   << newLine
diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp
index 5dc2057b27..bd5684427c 100644
--- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp
+++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp
@@ -4,6 +4,8 @@
 
 */
 
+#include <string>
+
 namespace BinaryData
 {
 
@@ -8442,7 +8444,7 @@ const char* getNamedResourceOriginalFilename (const char* resourceNameUTF8)
 {
     for (unsigned int i = 0; i < (sizeof (namedResourceList) / sizeof (namedResourceList[0])); ++i)
     {
-        if (namedResourceList[i] == resourceNameUTF8)
+        if (std::string (namedResourceList[i]) == std::string (resourceNameUTF8))
             return originalFilenames[i];
     }