diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 6a04c4df6d..938c0dbe80 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -230684,13 +230684,13 @@ static Atom specialId;
 static Atom broadcastId;
 static Atom specialCallbackId;
 
-// This is referenced from WindowDriver.cpp
+// This is referenced from Windowing.cpp
 XContext improbableNumber;
 
-// Defined in WindowDriver.cpp
+// Defined in Windowing.cpp
 extern void juce_windowMessageReceive (XEvent* event);
 
-// Defined in ClipboardDriver.cpp
+// Defined in Clipboard.cpp
 extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt);
 
 class InternalMessageQueue
@@ -245238,7 +245238,7 @@ END_JUCE_NAMESPACE
 - (void) keyDown: (NSEvent*) ev;
 - (void) keyUp: (NSEvent*) ev;
 - (void) flagsChanged: (NSEvent*) ev;
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 - (BOOL) performKeyEquivalent: (NSEvent*) ev;
 #endif
 
@@ -245331,7 +245331,7 @@ public:
 	virtual bool redirectKeyDown (NSEvent* ev);
 	virtual bool redirectKeyUp (NSEvent* ev);
 	virtual void redirectModKeyChange (NSEvent* ev);
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 	virtual bool redirectPerformKeyEquivalent (NSEvent* ev);
 #endif
 
@@ -245552,7 +245552,7 @@ END_JUCE_NAMESPACE
 		owner->redirectModKeyChange (ev);
 }
 
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 - (BOOL) performKeyEquivalent: (NSEvent*) ev
 {
 	if (owner != 0 && owner->redirectPerformKeyEquivalent (ev))
@@ -246345,7 +246345,7 @@ void NSViewComponentPeer::redirectModKeyChange (NSEvent* ev)
 	handleModifierKeysChange();
 }
 
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 bool NSViewComponentPeer::redirectPerformKeyEquivalent (NSEvent* ev)
 {
 	if ([ev type] == NSKeyDown)
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index f0e432f124..afafc7eaae 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -574,8 +574,9 @@ extern bool JUCE_PUBLIC_FUNCTION juce_isRunningUnderDebugger();
   #if ! defined (_AFXDLL)
 	#define juce_UseDebuggingNewOperator \
 	  static void* operator new (size_t sz)	   { void* const p = juce_malloc ((int) sz); return (p != 0) ? p : ::operator new (sz); } \
-	  static void* operator new (size_t sz, void* p)  { return ::operator new (sz, p); } \
-	  static void operator delete (void* p)	   { juce_free (p); }
+	  static void* operator new (size_t, void* p)	 { return p; } \
+	  static void operator delete (void* p)	   { juce_free (p); } \
+	  static void operator delete (void*, void*)	  { }
   #endif
 
 #elif defined (JUCE_DLL)
@@ -599,8 +600,9 @@ extern bool JUCE_PUBLIC_FUNCTION juce_isRunningUnderDebugger();
 
   #define juce_UseDebuggingNewOperator \
 	static void* operator new (size_t sz)	   { void* const p = juce_malloc ((int) sz); return (p != 0) ? p : ::operator new (sz); } \
-	static void* operator new (size_t sz, void* p)  { return ::operator new (sz, p); } \
-	static void operator delete (void* p)	   { juce_free (p); }
+	static void* operator new (size_t, void* p)	 { return p; } \
+	static void operator delete (void* p)	   { juce_free (p); } \
+	static void operator delete (void*, void*)	  { }
 
 #else
 
diff --git a/src/core/juce_Memory.h b/src/core/juce_Memory.h
index f853377bca..7538e4a75b 100644
--- a/src/core/juce_Memory.h
+++ b/src/core/juce_Memory.h
@@ -96,8 +96,9 @@
     */
     #define juce_UseDebuggingNewOperator \
       static void* operator new (size_t sz)           { void* const p = juce_malloc ((int) sz); return (p != 0) ? p : ::operator new (sz); } \
-      static void* operator new (size_t sz, void* p)  { return ::operator new (sz, p); } \
-      static void operator delete (void* p)           { juce_free (p); }
+      static void* operator new (size_t, void* p)     { return p; } \
+      static void operator delete (void* p)           { juce_free (p); } \
+      static void operator delete (void*, void*)      { }
   #endif
 
 #elif defined (JUCE_DLL)
@@ -133,8 +134,9 @@
 
   #define juce_UseDebuggingNewOperator \
     static void* operator new (size_t sz)           { void* const p = juce_malloc ((int) sz); return (p != 0) ? p : ::operator new (sz); } \
-    static void* operator new (size_t sz, void* p)  { return ::operator new (sz, p); } \
-    static void operator delete (void* p)           { juce_free (p); }
+    static void* operator new (size_t, void* p)     { return p; } \
+    static void operator delete (void* p)           { juce_free (p); } \
+    static void operator delete (void*, void*)      { }
 
 #else
 
diff --git a/src/events/juce_MessageManager.h b/src/events/juce_MessageManager.h
index cb00eb9b9a..1954582a48 100644
--- a/src/events/juce_MessageManager.h
+++ b/src/events/juce_MessageManager.h
@@ -29,6 +29,7 @@
 #include "../utilities/juce_DeletedAtShutdown.h"
 #include "../containers/juce_SortedSet.h"
 #include "../containers/juce_VoidArray.h"
+#include "../containers/juce_ScopedPointer.h"
 #include "../threads/juce_Thread.h"
 #include "../threads/juce_ThreadPool.h"
 #include "juce_ActionListenerList.h"
diff --git a/src/native/linux/juce_linux_Messaging.cpp b/src/native/linux/juce_linux_Messaging.cpp
index bcab453db6..e905a44a14 100644
--- a/src/native/linux/juce_linux_Messaging.cpp
+++ b/src/native/linux/juce_linux_Messaging.cpp
@@ -43,13 +43,13 @@ static Atom specialId;
 static Atom broadcastId;
 static Atom specialCallbackId;
 
-// This is referenced from WindowDriver.cpp
+// This is referenced from Windowing.cpp
 XContext improbableNumber;
 
-// Defined in WindowDriver.cpp
+// Defined in Windowing.cpp
 extern void juce_windowMessageReceive (XEvent* event);
 
-// Defined in ClipboardDriver.cpp
+// Defined in Clipboard.cpp
 extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt);
 
 //==============================================================================
diff --git a/src/native/mac/juce_mac_NSViewComponentPeer.mm b/src/native/mac/juce_mac_NSViewComponentPeer.mm
index 68d1bf50a4..058f8fac34 100644
--- a/src/native/mac/juce_mac_NSViewComponentPeer.mm
+++ b/src/native/mac/juce_mac_NSViewComponentPeer.mm
@@ -69,7 +69,7 @@ END_JUCE_NAMESPACE
 - (void) keyDown: (NSEvent*) ev;
 - (void) keyUp: (NSEvent*) ev;
 - (void) flagsChanged: (NSEvent*) ev;
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 - (BOOL) performKeyEquivalent: (NSEvent*) ev;
 #endif
 
@@ -175,7 +175,7 @@ public:
     virtual bool redirectKeyDown (NSEvent* ev);
     virtual bool redirectKeyUp (NSEvent* ev);
     virtual void redirectModKeyChange (NSEvent* ev);
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
     virtual bool redirectPerformKeyEquivalent (NSEvent* ev);
 #endif
 
@@ -403,7 +403,7 @@ END_JUCE_NAMESPACE
         owner->redirectModKeyChange (ev);
 }
 
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 - (BOOL) performKeyEquivalent: (NSEvent*) ev
 {
     if (owner != 0 && owner->redirectPerformKeyEquivalent (ev))
@@ -1204,7 +1204,7 @@ void NSViewComponentPeer::redirectModKeyChange (NSEvent* ev)
     handleModifierKeysChange();
 }
 
-#if MACOS_10_4_OR_EARLIER
+#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 bool NSViewComponentPeer::redirectPerformKeyEquivalent (NSEvent* ev)
 {
     if ([ev type] == NSKeyDown)