diff --git a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h
index 89ab928087..036ef4fd57 100644
--- a/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h	
+++ b/extras/Introjucer/Source/Code Editor/jucer_SourceCodeEditor.h	
@@ -165,7 +165,7 @@ private:
     void updateColourScheme();
     void checkSaveState();
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SourceCodeEditor);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SourceCodeEditor)
 };
 
 
@@ -201,7 +201,7 @@ private:
     class FindPanel;
     ScopedPointer<FindPanel> findPanel;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GenericCodeEditorComponent);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GenericCodeEditorComponent)
 };
 
 //==============================================================================
@@ -215,7 +215,7 @@ public:
     void insertTextAtCaret (const String& newText);
 
 private:
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CppCodeEditorComponent);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (CppCodeEditorComponent)
 };
 
 
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
index c64d42c53e..4ccb52a6ad 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
@@ -648,7 +648,7 @@ private:
     }
 
     //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE (AndroidProjectExporter);
+    JUCE_DECLARE_NON_COPYABLE (AndroidProjectExporter)
 };
 
 
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h
index b8a0c411ac..60303d6525 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Make.h	
@@ -319,7 +319,7 @@ private:
                 + "_" + String::toHexString (file.toUnixStyle().hashCode()) + ".o";
     }
 
-    JUCE_DECLARE_NON_COPYABLE (MakefileProjectExporter);
+    JUCE_DECLARE_NON_COPYABLE (MakefileProjectExporter)
 };
 
 
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h
index 25c5995546..1bbe245d72 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExporter.h	
@@ -213,7 +213,7 @@ public:
     protected:
 
     private:
-        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BuildConfiguration);
+        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BuildConfiguration)
     };
 
     void addNewConfiguration (const BuildConfiguration* configToCopy);
@@ -235,7 +235,7 @@ public:
 
     private:
         ProjectExporter& exporter;
-        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConfigIterator);
+        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConfigIterator)
     };
 
     struct ConstConfigIterator
@@ -252,7 +252,7 @@ public:
 
     private:
         const ProjectExporter& exporter;
-        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConstConfigIterator);
+        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConstConfigIterator)
     };
 
     int getNumConfigurations() const;
@@ -334,7 +334,7 @@ protected:
     static Image rescaleImageForIcon (Image image, int iconSize);
 
 private:
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectExporter);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectExporter)
 };
 
 
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h
index 7f2e27fbcc..b4242446a5 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h	
@@ -63,7 +63,7 @@ public:
         ProjectSaver& saver;
         Result result;
 
-        JUCE_DECLARE_NON_COPYABLE (SaveThread);
+        JUCE_DECLARE_NON_COPYABLE (SaveThread)
     };
 
     Result save (bool showProgressBox)
@@ -593,11 +593,11 @@ private:
         ScopedPointer<ProjectExporter> exporter;
         const OwnedArray<LibraryModule>& modules;
 
-        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ExporterJob);
+        JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ExporterJob)
     };
 
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectSaver);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ProjectSaver)
 };
 
 
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h b/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h
index 8eb8503b4b..cbafbfd5c5 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ResourceFile.h	
@@ -65,7 +65,7 @@ private:
     bool writeCpp (MemoryOutputStream&, const File& headerFile, int& index);
     void addResourcesFromProjectItem (const Project::Item& node);
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ResourceFile);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ResourceFile)
 };
 
 
diff --git a/extras/audio plugin demo/Source/PluginProcessor.h b/extras/audio plugin demo/Source/PluginProcessor.h
index 8d06ba2e12..ac8929d34d 100644
--- a/extras/audio plugin demo/Source/PluginProcessor.h	
+++ b/extras/audio plugin demo/Source/PluginProcessor.h	
@@ -100,7 +100,7 @@ private:
     // the synth!
     Synthesiser synth;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceDemoPluginAudioProcessor);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JuceDemoPluginAudioProcessor)
 };
 
 #endif  // __PLUGINPROCESSOR_H_526ED7A9__
diff --git a/extras/audio plugin host/Source/FilterGraph.h b/extras/audio plugin host/Source/FilterGraph.h
index 97ffe470bc..8721036a04 100644
--- a/extras/audio plugin host/Source/FilterGraph.h	
+++ b/extras/audio plugin host/Source/FilterGraph.h	
@@ -135,7 +135,7 @@ private:
 
     void createNodeFromXml (const XmlElement& xml);
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilterGraph);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (FilterGraph)
 };
 
 
diff --git a/extras/audio plugin host/Source/GraphEditorPanel.cpp b/extras/audio plugin host/Source/GraphEditorPanel.cpp
index 7b2f1852c5..f6a74ff8ab 100644
--- a/extras/audio plugin host/Source/GraphEditorPanel.cpp	
+++ b/extras/audio plugin host/Source/GraphEditorPanel.cpp	
@@ -205,7 +205,7 @@ private:
         return findParentComponentOfClass<GraphEditorPanel>();
     }
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PinComponent);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PinComponent)
 };
 
 //==============================================================================
@@ -698,7 +698,7 @@ private:
         distanceFromEnd = juce_hypot (x - (x2 - getX()), y - (y2 - getY()));
     }
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConnectorComponent);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ConnectorComponent)
 };
 
 
@@ -1008,7 +1008,7 @@ public:
 private:
     String tip;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TooltipBar);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TooltipBar)
 };
 
 //==============================================================================
diff --git a/extras/audio plugin host/Source/GraphEditorPanel.h b/extras/audio plugin host/Source/GraphEditorPanel.h
index 62ef210685..b00d4a328e 100644
--- a/extras/audio plugin host/Source/GraphEditorPanel.h	
+++ b/extras/audio plugin host/Source/GraphEditorPanel.h	
@@ -69,7 +69,7 @@ private:
     FilterGraph& graph;
     ScopedPointer<ConnectorComponent> draggingConnector;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GraphEditorPanel);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GraphEditorPanel)
 };
 
 
@@ -106,7 +106,7 @@ private:
     Component* keyboardComp;
     Component* statusBar;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GraphDocumentComponent);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GraphDocumentComponent)
 };
 
 //==============================================================================
diff --git a/extras/audio plugin host/Source/MainHostWindow.cpp b/extras/audio plugin host/Source/MainHostWindow.cpp
index e1d3c858c7..7f23e655d7 100644
--- a/extras/audio plugin host/Source/MainHostWindow.cpp	
+++ b/extras/audio plugin host/Source/MainHostWindow.cpp	
@@ -68,7 +68,7 @@ public:
 private:
     MainHostWindow& owner;
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginListWindow);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginListWindow)
 };
 
 //==============================================================================
diff --git a/extras/audio plugin host/Source/MainHostWindow.h b/extras/audio plugin host/Source/MainHostWindow.h
index c87aa0e522..ea4e1ff784 100644
--- a/extras/audio plugin host/Source/MainHostWindow.h	
+++ b/extras/audio plugin host/Source/MainHostWindow.h	
@@ -99,7 +99,7 @@ private:
 
     void showAudioSettings();
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainHostWindow);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainHostWindow)
 };
 
 
diff --git a/extras/example projects/Source/MainComponent.h b/extras/example projects/Source/MainComponent.h
index 5bfe3c8c3a..c7055c39d9 100644
--- a/extras/example projects/Source/MainComponent.h	
+++ b/extras/example projects/Source/MainComponent.h	
@@ -65,7 +65,7 @@ private:
 
 
     //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainComponent)
 };
 
 
diff --git a/extras/the jucer/src/templates/jucer_ComponentTemplate.h b/extras/the jucer/src/templates/jucer_ComponentTemplate.h
index 88ee23b458..c95c93f3d2 100644
--- a/extras/the jucer/src/templates/jucer_ComponentTemplate.h	
+++ b/extras/the jucer/src/templates/jucer_ComponentTemplate.h	
@@ -57,7 +57,7 @@ private:
     %%privateMemberDeclarations%%
 
     //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%className%%);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (%%className%%)
 };
 
 //[EndFile] You can add extra defines here...
diff --git a/modules/juce_core/native/juce_win32_Files.cpp b/modules/juce_core/native/juce_win32_Files.cpp
index f220a04f3f..58202f91f8 100644
--- a/modules/juce_core/native/juce_win32_Files.cpp
+++ b/modules/juce_core/native/juce_win32_Files.cpp
@@ -911,7 +911,7 @@ private:
         return false;
     }
 
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Pimpl);
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Pimpl)
 };
 
 void NamedPipe::close()