diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h
index 87c3dda686..ec5237f4ac 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_CodeBlocks.h
@@ -493,15 +493,11 @@ private:
             if (target.isDynamicLibrary())
                 flags.add ("-shared");
 
-            if (target.type == ProjectType::Target::StandalonePlugIn
-             || target.type == ProjectType::Target::GUIApp)
-                flags.add ("-no-pie");
-
             if (packages.size() > 0)
             {
                 String pkgconfigLibs ("`pkg-config --libs");
 
-                for (auto p : packages)
+                for (auto& p : packages)
                     pkgconfigLibs << " " << p;
 
                 pkgconfigLibs << "`";
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
index 931eaa6758..dfb1e495d9 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h
@@ -113,10 +113,6 @@ public:
                 if (getTargetFileType() == pluginBundle)
                     result.add ("-Wl,--no-undefined");
             }
-            else if (type == GUIApp || type == StandalonePlugIn)
-            {
-                result.add ("-no-pie");
-            }
 
             return result;
         }
@@ -149,19 +145,19 @@ public:
 
             StringArray s;
 
-            const String cppflagsVarName = String ("JUCE_CPPFLAGS_") + getTargetVarName();
+            const String cppflagsVarName ("JUCE_CPPFLAGS_" + getTargetVarName());
 
-            s.add (cppflagsVarName + String (" := ") + defines.joinIntoString (" "));
+            s.add (cppflagsVarName + " := " + defines.joinIntoString (" "));
 
             auto cflags = getCompilerFlags();
 
             if (! cflags.isEmpty())
-                s.add (String ("JUCE_CFLAGS_") + getTargetVarName() + " := " + cflags.joinIntoString (" "));
+                s.add ("JUCE_CFLAGS_" + getTargetVarName() + " := " + cflags.joinIntoString (" "));
 
             auto ldflags = getLinkerFlags();
 
             if (! ldflags.isEmpty())
-                s.add (String ("JUCE_LDFLAGS_") + getTargetVarName() + " := " + ldflags.joinIntoString (" "));
+                s.add ("JUCE_LDFLAGS_" + getTargetVarName() + " := " + ldflags.joinIntoString (" "));
 
             String targetName (owner.replacePreprocessorTokens (config, config.getTargetBinaryNameString()));
 
@@ -172,7 +168,7 @@ public:
             else
                 targetName = targetName.upToLastOccurrenceOf (".", false, false) + getTargetFileSuffix();
 
-            s.add (String ("JUCE_TARGET_") + getTargetVarName() + String (" := ") + escapeSpaces (targetName));
+            s.add ("JUCE_TARGET_" + getTargetVarName() + String (" := ") + escapeSpaces (targetName));
 
             return s;
         }