diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h
index fca52b379a..743109d616 100644
--- a/extras/Introjucer/Source/Application/jucer_Application.h
+++ b/extras/Introjucer/Source/Application/jucer_Application.h
@@ -28,7 +28,7 @@
 #include "../jucer_Headers.h"
 #include "jucer_MainWindow.h"
 #include "jucer_CommandLine.h"
-#include "jucer_Module.h"
+#include "../project/jucer_Module.h"
 #include "jucer_AutoUpdater.h"
 #include "../Code Editor/jucer_SourceCodeEditor.h"
 
diff --git a/extras/Introjucer/Source/Application/jucer_AutoUpdater.h b/extras/Introjucer/Source/Application/jucer_AutoUpdater.h
index 20cbfa90a7..af17b27ece 100644
--- a/extras/Introjucer/Source/Application/jucer_AutoUpdater.h
+++ b/extras/Introjucer/Source/Application/jucer_AutoUpdater.h
@@ -109,8 +109,6 @@ public:
 
         bool isDifferentVersionToCurrent() const
         {
-JUCE_COMPILER_WARNING("testing")
-return true;
             return version != JUCE_STRINGIFY(JUCE_MAJOR_VERSION)
                                "." JUCE_STRINGIFY(JUCE_MINOR_VERSION)
                                "." JUCE_STRINGIFY(JUCE_BUILDNUMBER)
@@ -298,7 +296,7 @@ private:
                     if (threadShouldExit())
                         return Result::fail ("cancel");
 
-                    size_t written = mo.writeFromInputStream (*in, 8192);
+                    int64 written = mo.writeFromInputStream (*in, 8192);
 
                     if (written == 0)
                         break;
diff --git a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
index d3932ebd98..576d1353d9 100644
--- a/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
+++ b/extras/Introjucer/Source/Project/jucer_ProjectContentComponent.cpp
@@ -30,7 +30,7 @@
 #include "../Project Saving/jucer_ProjectExporter.h"
 #include "../Utility/jucer_TranslationTool.h"
 #include "../Utility/jucer_JucerTreeViewBase.h"
-#include "jucer_NewFileWizard.h"
+#include "../Wizards/jucer_NewFileWizard.h"
 #include "jucer_GroupInformationComponent.h"
 
 //==============================================================================
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h b/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h
index c1d0d7166e..b97328e0ad 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h
+++ b/extras/Introjucer/Source/Wizards/jucer_NewFileWizard.h
@@ -26,7 +26,7 @@
 #define __JUCER_NEWFILEWIZARD_JUCEHEADER__
 
 #include "../jucer_Headers.h"
-#include "jucer_Project.h"
+#include "../Project/jucer_Project.h"
 
 
 //==============================================================================
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
index d9399866e6..33dbcd5eb7 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
+++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardClasses.cpp
@@ -24,8 +24,8 @@
 
 #include "../jucer_Headers.h"
 #include "jucer_NewProjectWizardClasses.h"
-#include "jucer_ProjectType.h"
-#include "jucer_Module.h"
+#include "../Project/jucer_ProjectType.h"
+#include "../Project/jucer_Module.h"
 #include "../Project Saving/jucer_ProjectExporter.h"
 #include "../Application/jucer_Application.h"
 #include "../Application/jucer_MainWindow.h"
diff --git a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h
index 49a93874b2..a27e077b64 100644
--- a/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_NewProjectWizardComponent.h
@@ -48,7 +48,7 @@ public:
         listBox.setOpaque (false);
         listBox.setMultipleSelectionEnabled (true);
         listBox.setClickingTogglesRowSelection (true);
-        listBox.setColour (ListBox::ColourIds::backgroundColourId, Colours::white.withAlpha (0.0f));
+        listBox.setColour (ListBox::backgroundColourId, Colours::white.withAlpha (0.0f));
         addAndMakeVisible (listBox);
 
         selectDefaultExporterIfNoneSelected();
@@ -97,7 +97,7 @@ public:
             if (rowIsSelected)
                 g.fillAll (Colour (0x99f29000));
 
-            Rectangle<float> dotSelect (height, height);
+            Rectangle<float> dotSelect ((float) height, (float) height);
             dotSelect.reduce (12, 12);
 
             g.setColour (Colour (0x33ffffff));
diff --git a/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h b/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
index 7c6f713bed..d4de897678 100644
--- a/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
+++ b/extras/Introjucer/Source/Wizards/jucer_TemplateThumbnailsComponent.h
@@ -38,13 +38,13 @@ public:
     {
         // svg for thumbnail icon
         ScopedPointer<XmlElement> svg (XmlDocument::parse (thumbSvg));
-        assert (svg != nullptr);
+        jassert (svg != nullptr);
 
         thumb = Drawable::createFromSVG (*svg);
 
         // svg for thumbnail background highlight
         ScopedPointer<XmlElement> backSvg (XmlDocument::parse (BinaryData::wizard_Highlight_svg));
-        assert (backSvg != nullptr);
+        jassert (backSvg != nullptr);
 
         hoverBackground = Drawable::createFromSVG (*backSvg);
 
@@ -60,7 +60,7 @@ public:
 
         if (isMouseOverButton)
         {
-            if (getStyle() == ButtonStyle::ImageFitted)
+            if (getStyle() == ImageFitted)
             {
                 hoverBackground->drawWithin (g, bounds, RectanglePlacement::centred, 1.0);
                 thumb->drawWithin (g, bounds, RectanglePlacement::centred, 1.0);
@@ -75,7 +75,7 @@ public:
         }
         else
         {
-            if (getStyle() == ButtonStyle::ImageFitted)
+            if (getStyle() == ImageFitted)
             {
                 thumb->drawWithin (g, bounds, RectanglePlacement::centred, 1.0);
             }
@@ -89,7 +89,7 @@ public:
         Rectangle<float> textTarget;
 
         // center the text for the text buttons or position the text in the image buttons
-        if (getStyle() != ButtonStyle::ImageFitted)
+        if (getStyle() != ImageFitted)
         {
             textTarget = getLocalBounds().toFloat();
         }
@@ -145,7 +145,7 @@ public:
             ScopedPointer<NewProjectWizard> wizard (createWizardType (i));
 
             TemplateOptionButton* b = new TemplateOptionButton (wizard->getName(),
-                                                                TemplateOptionButton::ButtonStyle::ImageFitted,
+                                                                TemplateOptionButton::ImageFitted,
                                                                 wizard->getIcon());
             optionButtons.add (b);
             addAndMakeVisible (b);
@@ -156,9 +156,9 @@ public:
         // Handle Open Project button functionality
         ApplicationCommandManager& commandManager = IntrojucerApp::getCommandManager();
 
-        addAndMakeVisible (blankProjectButton   = new TemplateOptionButton ("Create Blank Project",  TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
-        addAndMakeVisible (exampleProjectButton = new TemplateOptionButton ("Open Example Project",  TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
-        addAndMakeVisible (openProjectButton    = new TemplateOptionButton ("Open Existing Project", TemplateOptionButton::ButtonStyle::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
+        addAndMakeVisible (blankProjectButton   = new TemplateOptionButton ("Create Blank Project",  TemplateOptionButton::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
+        addAndMakeVisible (exampleProjectButton = new TemplateOptionButton ("Open Example Project",  TemplateOptionButton::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
+        addAndMakeVisible (openProjectButton    = new TemplateOptionButton ("Open Existing Project", TemplateOptionButton::ImageOnButtonBackground, BinaryData::wizard_Openfile_svg));
 
         blankProjectButton->addListener (this);
         exampleProjectButton->addListener (this);
@@ -191,7 +191,7 @@ public:
     void resized() override
     {
         Rectangle<int> allOpts = getLocalBounds().reduced (40, 60);
-        allOpts.removeFromBottom (allOpts.getHeight() * 0.25);
+        allOpts.removeFromBottom (allOpts.getHeight() / 4);
 
         const int numHorizIcons = 4;
         const int optStep = allOpts.getWidth() / numHorizIcons;