diff --git a/extras/AudioPerformanceTest/Source/Main.cpp b/extras/AudioPerformanceTest/Source/Main.cpp
index 292f9efe33..c893b151f5 100644
--- a/extras/AudioPerformanceTest/Source/Main.cpp
+++ b/extras/AudioPerformanceTest/Source/Main.cpp
@@ -62,7 +62,7 @@ public:
             : DocumentWindow (name, Colours::lightgrey, DocumentWindow::allButtons)
         {
             setUsingNativeTitleBar (true);
-            setContentOwned (createMainContentComponent(), true);
+            setContentOwned (new MainContentComponent(), true);
             setResizable (false, false);
 
            #if JUCE_IOS || JUCE_ANDROID
diff --git a/extras/AudioPerformanceTest/Source/MainComponent.h b/extras/AudioPerformanceTest/Source/MainComponent.h
index 8785b1cd6d..28dbcdbf96 100644
--- a/extras/AudioPerformanceTest/Source/MainComponent.h
+++ b/extras/AudioPerformanceTest/Source/MainComponent.h
@@ -271,7 +271,3 @@ private:
     //==============================================================================
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainContentComponent)
 };
-
-
-// (This function is called by the app startup code to create our main component)
-Component* createMainContentComponent()     { return new MainContentComponent(); }
diff --git a/extras/NetworkGraphicsDemo/Source/Demos.h b/extras/NetworkGraphicsDemo/Source/Demos.h
index 3f68326619..4a368ef6d5 100644
--- a/extras/NetworkGraphicsDemo/Source/Demos.h
+++ b/extras/NetworkGraphicsDemo/Source/Demos.h
@@ -490,7 +490,7 @@ struct MultiLogo  : public BackgroundLogo
 };
 
 //==============================================================================
-void createAllDemos (OwnedArray<AnimatedContent>& demos)
+inline void createAllDemos (OwnedArray<AnimatedContent>& demos)
 {
     demos.add (new FlockDemo());
     demos.add (new FlockWithText());