diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
index ee244aeef2..bcad89d10f 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
@@ -591,17 +591,17 @@ private:
         overwriteFileIfDifferentOrThrow (file, mo);
     }
 
+    struct ShouldFileBeCompiledPredicate
+    {
+        bool operator() (const Project::Item& projectItem) const  { return projectItem.shouldBeCompiled(); }
+    };
+
     void writeAndroidMk (const File& file) const
     {
         Array<RelativePath> files;
 
-        struct Predicate
-        {
-            bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeCompiled(); }
-        };
-
         for (int i = 0; i < getAllGroups().size(); ++i)
-            findAllProjectItemsWithPredicate (getAllGroups().getReference(i), files, Predicate());
+            findAllProjectItemsWithPredicate (getAllGroups().getReference(i), files, ShouldFileBeCompiledPredicate());
 
         MemoryOutputStream mo;
         writeAndroidMk (mo, files);
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h
index 5b0d4c7586..b8b86f0c9a 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_AndroidStudio.h	
@@ -247,7 +247,7 @@ private:
     {
         if (path.startsWith ("~"))
         {
-            const String homeFolder (File::getSpecialLocation (File::SpecialLocationType::userHomeDirectory).getFullPathName());
+            const String homeFolder (File::getSpecialLocation (File::userHomeDirectory).getFullPathName());
 
             path = path.replaceSection (0, 1, homeFolder);
         }
@@ -366,6 +366,11 @@ private:
         return result;
     }
 
+    struct ShouldBeAddedToProjectPredicate
+    {
+        bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeAddedToTargetProject(); }
+    };
+
     StringArray getCPPFlags() const
     {
         StringArray result;
@@ -401,13 +406,8 @@ private:
             Array<RelativePath> cppFiles;
             const Array<Project::Item>& groups = getAllGroups();
 
-            struct Predicate
-            {
-                bool operator() (const Project::Item& projectItem) const { return projectItem.shouldBeAddedToTargetProject(); }
-            };
-
             for (int i = 0; i < groups.size(); ++i)
-                findAllProjectItemsWithPredicate (groups.getReference (i), cppFiles, Predicate());
+                findAllProjectItemsWithPredicate (groups.getReference (i), cppFiles, ShouldBeAddedToProjectPredicate());
 
             for (int i = 0; i < cppFiles.size(); ++i)
             {