diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
index ea01525c2a..b1d04d5e69 100644
--- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
+++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
@@ -221,7 +221,7 @@ public:
         {}
     }
 
-    juce_DeclareSingleton (SharedMessageThread, false);
+    juce_DeclareSingleton (SharedMessageThread, false)
 
 private:
     bool initialised;
diff --git a/modules/juce_events/native/juce_linux_Messaging.cpp b/modules/juce_events/native/juce_linux_Messaging.cpp
index 48e28a7395..046c462a78 100644
--- a/modules/juce_events/native/juce_linux_Messaging.cpp
+++ b/modules/juce_events/native/juce_linux_Messaging.cpp
@@ -131,7 +131,7 @@ public:
     }
 
     //==============================================================================
-    juce_DeclareSingleton_SingleThreaded_Minimal (InternalMessageQueue);
+    juce_DeclareSingleton_SingleThreaded_Minimal (InternalMessageQueue)
 
 private:
     CriticalSection lock;
@@ -209,7 +209,7 @@ private:
     }
 };
 
-juce_ImplementSingleton_SingleThreaded (InternalMessageQueue);
+juce_ImplementSingleton_SingleThreaded (InternalMessageQueue)
 
 
 //==============================================================================
diff --git a/modules/juce_graphics/fonts/juce_Font.cpp b/modules/juce_graphics/fonts/juce_Font.cpp
index 1b4fc04abf..f0668d1d7c 100644
--- a/modules/juce_graphics/fonts/juce_Font.cpp
+++ b/modules/juce_graphics/fonts/juce_Font.cpp
@@ -51,7 +51,7 @@ public:
         clearSingletonInstance();
     }
 
-    juce_DeclareSingleton (TypefaceCache, false);
+    juce_DeclareSingleton (TypefaceCache, false)
 
     void setSize (const int numToCache)
     {
diff --git a/modules/juce_graphics/images/juce_ImageCache.cpp b/modules/juce_graphics/images/juce_ImageCache.cpp
index 992ff328b9..a806e48d99 100644
--- a/modules/juce_graphics/images/juce_ImageCache.cpp
+++ b/modules/juce_graphics/images/juce_ImageCache.cpp
@@ -110,7 +110,7 @@ public:
 
     unsigned int cacheTimeout;
 
-    juce_DeclareSingleton_SingleThreaded_Minimal (ImageCache::Pimpl);
+    juce_DeclareSingleton_SingleThreaded_Minimal (ImageCache::Pimpl)
 
 private:
     OwnedArray<Item> images;
@@ -119,7 +119,7 @@ private:
     JUCE_DECLARE_NON_COPYABLE (Pimpl)
 };
 
-juce_ImplementSingleton_SingleThreaded (ImageCache::Pimpl);
+juce_ImplementSingleton_SingleThreaded (ImageCache::Pimpl)
 
 
 //==============================================================================
diff --git a/modules/juce_graphics/native/juce_freetype_Fonts.cpp b/modules/juce_graphics/native/juce_freetype_Fonts.cpp
index 43a6436e91..d124eafd97 100644
--- a/modules/juce_graphics/native/juce_freetype_Fonts.cpp
+++ b/modules/juce_graphics/native/juce_freetype_Fonts.cpp
@@ -224,7 +224,7 @@ public:
                 sansSerif.addIfNotAlreadyThere (faces.getUnchecked(i)->family);
     }
 
-    juce_DeclareSingleton_SingleThreaded_Minimal (FTTypefaceList);
+    juce_DeclareSingleton_SingleThreaded_Minimal (FTTypefaceList)
 
 private:
     FTLibWrapper::Ptr library;
diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
index a6e7b07116..12b81df06e 100644
--- a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
+++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp
@@ -89,7 +89,7 @@ ModalComponentManager::~ModalComponentManager()
     clearSingletonInstance();
 }
 
-juce_ImplementSingleton_SingleThreaded (ModalComponentManager);
+juce_ImplementSingleton_SingleThreaded (ModalComponentManager)
 
 
 //==============================================================================
diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.h b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
index b21421ebf0..1b927e121d 100644
--- a/modules/juce_gui_basics/components/juce_ModalComponentManager.h
+++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.h
@@ -120,7 +120,7 @@ public:
    #endif
 
     //==============================================================================
-    juce_DeclareSingleton_SingleThreaded_Minimal (ModalComponentManager);
+    juce_DeclareSingleton_SingleThreaded_Minimal (ModalComponentManager)
 
 protected:
     /** Creates a ModalComponentManager.
diff --git a/modules/juce_gui_basics/native/juce_mac_Windowing.mm b/modules/juce_gui_basics/native/juce_mac_Windowing.mm
index 3d09529f12..392ca162ff 100644
--- a/modules/juce_gui_basics/native/juce_mac_Windowing.mm
+++ b/modules/juce_gui_basics/native/juce_mac_Windowing.mm
@@ -332,13 +332,13 @@ public:
         const_cast <Desktop::Displays&> (Desktop::getInstance().getDisplays()).refresh();
     }
 
-    juce_DeclareSingleton_SingleThreaded_Minimal (DisplaySettingsChangeCallback);
+    juce_DeclareSingleton_SingleThreaded_Minimal (DisplaySettingsChangeCallback)
 
 private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DisplaySettingsChangeCallback)
 };
 
-juce_ImplementSingleton_SingleThreaded (DisplaySettingsChangeCallback);
+juce_ImplementSingleton_SingleThreaded (DisplaySettingsChangeCallback)
 
 static Rectangle<int> convertDisplayRect (NSRect r, CGFloat mainScreenBottom)
 {
diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
index 0207fa2382..db23268259 100644
--- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
+++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp
@@ -1226,7 +1226,7 @@ private:
 
         LPCTSTR getWindowClassName() const noexcept     { return (LPCTSTR) MAKELONG (atom, 0); }
 
-        juce_DeclareSingleton_SingleThreaded_Minimal (WindowClassHolder);
+        juce_DeclareSingleton_SingleThreaded_Minimal (WindowClassHolder)
 
     private:
         ATOM atom;
@@ -2939,7 +2939,7 @@ ComponentPeer* createNonRepaintingEmbeddedWindowsPeer (Component& component, voi
 }
 
 
-juce_ImplementSingleton_SingleThreaded (HWNDComponentPeer::WindowClassHolder);
+juce_ImplementSingleton_SingleThreaded (HWNDComponentPeer::WindowClassHolder)
 
 
 //==============================================================================
diff --git a/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp b/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp
index c7248dd9ae..446b175649 100644
--- a/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp
+++ b/modules/juce_gui_basics/windows/juce_TopLevelWindow.cpp
@@ -36,7 +36,7 @@ public:
         clearSingletonInstance();
     }
 
-    juce_DeclareSingleton_SingleThreaded_Minimal (TopLevelWindowManager);
+    juce_DeclareSingleton_SingleThreaded_Minimal (TopLevelWindowManager)
 
     void checkFocusAsync()
     {
diff --git a/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm b/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
index 4fd30aa078..655abb651c 100644
--- a/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
+++ b/modules/juce_gui_extra/native/juce_mac_NSViewComponent.mm
@@ -81,7 +81,7 @@ private:
                 target->viewResized();
         }
 
-        JUCE_DECLARE_NON_COPYABLE (ViewFrameChangeCallbackClass);
+        JUCE_DECLARE_NON_COPYABLE (ViewFrameChangeCallbackClass)
     };
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NSViewResizeWatcher)
diff --git a/modules/juce_video/native/juce_win32_DirectShowComponent.cpp b/modules/juce_video/native/juce_win32_DirectShowComponent.cpp
index 5762459547..e1489d8e57 100644
--- a/modules/juce_video/native/juce_win32_DirectShowComponent.cpp
+++ b/modules/juce_video/native/juce_win32_DirectShowComponent.cpp
@@ -530,7 +530,7 @@ private:
         bool isRegistered() const noexcept              { return atom != 0; }
         LPCTSTR getWindowClassName() const noexcept     { return (LPCTSTR) MAKELONG (atom, 0); }
 
-        juce_DeclareSingleton_SingleThreaded_Minimal (NativeWindowClass);
+        juce_DeclareSingleton_SingleThreaded_Minimal (NativeWindowClass)
 
     private:
         NativeWindowClass()
@@ -724,7 +724,7 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DirectShowContext)
 };
 
-juce_ImplementSingleton_SingleThreaded (DirectShowComponent::DirectShowContext::NativeWindowClass);
+juce_ImplementSingleton_SingleThreaded (DirectShowComponent::DirectShowContext::NativeWindowClass)
 
 
 //======================================================================