diff --git a/extras/Projucer/Source/Application/Windows/jucer_GlobalPathsWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_GlobalPathsWindowComponent.h
index 18d165388e..e35adf7070 100644
--- a/extras/Projucer/Source/Application/Windows/jucer_GlobalPathsWindowComponent.h
+++ b/extras/Projucer/Source/Application/Windows/jucer_GlobalPathsWindowComponent.h
@@ -144,6 +144,9 @@ public:
     }
 
 private:
+    ValueWithDefault jucePathValue, juceModulePathValue, userModulePathValue, vst3PathValue, rtasPathValue, aaxPathValue,
+                     androidSDKPathValue, androidNDKPathValue, clionExePathValue, androidStudioExePathValue;
+
     OwnedArray<Label> pathPropertyLabels;
     OwnedArray<PropertyComponent> pathPropertyComponents;
     TextButton rescanJUCEPathButton { "Re-scan" },
@@ -156,9 +159,6 @@ private:
     float flashAlpha = 0.0f;
     bool hasFlashed = false;
 
-    ValueWithDefault jucePathValue, juceModulePathValue, userModulePathValue, vst3PathValue, rtasPathValue, aaxPathValue,
-                     androidSDKPathValue, androidNDKPathValue, clionExePathValue, androidStudioExePathValue;
-
     //==============================================================================
     void timerCallback() override
     {
diff --git a/extras/Projucer/Source/Application/Windows/jucer_PIPCreatorWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_PIPCreatorWindowComponent.h
index 814bc37c5e..2a3fc65e68 100644
--- a/extras/Projucer/Source/Application/Windows/jucer_PIPCreatorWindowComponent.h
+++ b/extras/Projucer/Source/Application/Windows/jucer_PIPCreatorWindowComponent.h
@@ -307,13 +307,6 @@ private:
     }
 
     //==============================================================================
-    std::unique_ptr<LookAndFeel> lf;
-
-    Viewport propertyViewport;
-    PropertyGroupComponent propertyGroup  { "PIP Creator", { getIcons().juceLogo, Colours::transparentBlack } };
-
-    TextButton createButton  { "Create PIP" };
-
     ValueTree pipTree  { "PIPSettings" };
     ValueWithDefault nameValue          { pipTree, Ids::name,          nullptr, "MyComponentPIP" },
                      versionValue       { pipTree, Ids::version,       nullptr },
@@ -329,6 +322,13 @@ private:
                      mainClassValue     { pipTree, Ids::mainClass,     nullptr, "MyComponent" },
                      useLocalCopyValue  { pipTree, Ids::useLocalCopy,  nullptr, false };
 
+    std::unique_ptr<LookAndFeel> lf;
+
+    Viewport propertyViewport;
+    PropertyGroupComponent propertyGroup  { "PIP Creator", { getIcons().juceLogo, Colours::transparentBlack } };
+
+    TextButton createButton  { "Create PIP" };
+
     //==============================================================================
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PIPCreatorWindowComponent)
 };
diff --git a/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h b/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h
index 29c0d101ef..096b7ddb8a 100644
--- a/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h
+++ b/extras/Projucer/Source/Project/UI/Sidebar/jucer_ModuleTreeItems.h
@@ -244,6 +244,9 @@ private:
         void timerCallback() override          { stopTimer(); refresh(); }
 
         //==============================================================================
+        Array<ValueWithDefault> exporterModulePathValues;
+        Value globalPathValue;
+
         PropertyGroupComponent group;
         Project& project;
         SafePointer<TreeView> modulesTree;
@@ -251,9 +254,6 @@ private:
 
         OwnedArray <Project::ConfigFlag> configFlags;
 
-        Array<ValueWithDefault> exporterModulePathValues;
-        Value globalPathValue;
-
         //==============================================================================
         class ModuleInfoComponent  : public PropertyComponent,
                                      private Value::Listener