diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.cpp b/extras/Projucer/JuceLibraryCode/BinaryData.cpp
index 07bb73dcfb..09ef27251a 100644
--- a/extras/Projucer/JuceLibraryCode/BinaryData.cpp
+++ b/extras/Projucer/JuceLibraryCode/BinaryData.cpp
@@ -595,7 +595,10 @@ static const unsigned char temp_binary_data_7[] =
 "#define %%headerGuard%%\r\n"
 "\r\n"
 "//[Headers]     -- You can add your own extra header files here --\r\n"
-"#include \"../../JuceLibraryCode/JuceHeader.h\"\r\n"
+"\r\n"
+"#include \"JuceHeader.h\" // you may want to edit this path to\r\n"
+"                        // something more appropriate for your app.\r\n"
+"\r\n"
 "//[/Headers]\r\n"
 "\r\n"
 "%%includeFilesH%%\r\n"
@@ -4024,7 +4027,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes) throw
         case 0x51b49ac5:  numBytes = 4255; return jucer_AudioPluginFilterTemplate_cpp;
         case 0x488afa0a:  numBytes = 2114; return jucer_AudioPluginFilterTemplate_h;
         case 0xabad7041:  numBytes = 2151; return jucer_ComponentTemplate_cpp;
-        case 0xfc72fe86:  numBytes = 2155; return jucer_ComponentTemplate_h;
+        case 0xfc72fe86:  numBytes = 2243; return jucer_ComponentTemplate_h;
         case 0x0b66646c:  numBytes = 886; return jucer_ContentCompTemplate_cpp;
         case 0x6fa10171:  numBytes = 924; return jucer_ContentCompTemplate_h;
         case 0x28d496ad:  numBytes = 1161; return jucer_InlineComponentTemplate_h;
diff --git a/extras/Projucer/JuceLibraryCode/BinaryData.h b/extras/Projucer/JuceLibraryCode/BinaryData.h
index a3f56a0696..2979936fea 100644
--- a/extras/Projucer/JuceLibraryCode/BinaryData.h
+++ b/extras/Projucer/JuceLibraryCode/BinaryData.h
@@ -31,7 +31,7 @@ namespace BinaryData
     const int            jucer_ComponentTemplate_cppSize = 2151;
 
     extern const char*   jucer_ComponentTemplate_h;
-    const int            jucer_ComponentTemplate_hSize = 2155;
+    const int            jucer_ComponentTemplate_hSize = 2243;
 
     extern const char*   jucer_ContentCompTemplate_cpp;
     const int            jucer_ContentCompTemplate_cppSize = 886;
diff --git a/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h b/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h
index 4f839603a1..53225bd343 100644
--- a/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h
+++ b/extras/Projucer/Source/BinaryData/jucer_ComponentTemplate.h
@@ -21,7 +21,10 @@
 #define %%headerGuard%%
 
 //[Headers]     -- You can add your own extra header files here --
-#include "../../JuceLibraryCode/JuceHeader.h"
+
+#include "JuceHeader.h" // you may want to edit this path to
+                        // something more appropriate for your app.
+
 //[/Headers]
 
 %%includeFilesH%%
diff --git a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h
index 27004dfeb3..53cf1d70fa 100644
--- a/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h
+++ b/extras/Projucer/Source/ComponentEditor/jucer_GeneratedCode.h
@@ -73,7 +73,7 @@ public:
         bool hasPrePostUserSections;
     };
 
-    OwnedArray <CallbackMethod> callbacks;
+    OwnedArray<CallbackMethod> callbacks;
 
     String& getCallbackCode (const String& requiredParentClass,
                              const String& returnType,
diff --git a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
index 2eb68a3746..31b493b43d 100644
--- a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
+++ b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp
@@ -712,10 +712,10 @@ OpenDocumentManager::DocumentType* createGUIDocumentType()
 }
 
 //==============================================================================
-class JucerFileWizard  : public NewFileWizard::Type
+class NewGUIComponentWizard  : public NewFileWizard::Type
 {
 public:
-    JucerFileWizard() {}
+    NewGUIComponentWizard() {}
 
     String getName() override  { return "GUI Component"; }
 
@@ -723,13 +723,13 @@ public:
     {
         const File newFile (askUserToChooseNewFile (String (defaultClassName) + ".h", "*.h;*.cpp", parent));
 
-        if (newFile != File::nonexistent)
+        if (newFile != File())
         {
             const File headerFile (newFile.withFileExtension (".h"));
             const File cppFile (newFile.withFileExtension (".cpp"));
 
-            headerFile.replaceWithText (String::empty);
-            cppFile.replaceWithText (String::empty);
+            headerFile.replaceWithText (String());
+            cppFile.replaceWithText (String());
 
             OpenDocumentManager& odm = ProjucerApplication::getApp().openDocumentManager;
 
@@ -762,5 +762,5 @@ public:
 
 NewFileWizard::Type* createGUIComponentWizard()
 {
-    return new JucerFileWizard();
+    return new NewGUIComponentWizard();
 }