diff --git a/juce.h b/juce.h
index 7cd5c89bd8..5d390e24f9 100644
--- a/juce.h
+++ b/juce.h
@@ -194,7 +194,7 @@ END_JUCE_NAMESPACE
   #define START_JUCE_APPLICATION(AppClass) \
     int main (int argc, char* argv[]) \
     { \
-        return JUCEApplication::main (argc, argv, new AppClass()); \
+        return JUCE_NAMESPACE::JUCEApplication::main (argc, argv, new AppClass()); \
     }
 
 #elif JUCE_WIN32
diff --git a/src/juce_core/basics/juce_Singleton.h b/src/juce_core/basics/juce_Singleton.h
index bac50c2c9c..8c5b6b303f 100644
--- a/src/juce_core/basics/juce_Singleton.h
+++ b/src/juce_core/basics/juce_Singleton.h
@@ -95,13 +95,13 @@
 #define juce_DeclareSingleton(classname, allowOnlyOneInstance) \
 \
     static classname* _singletonInstance;  \
-    static CriticalSection _singletonLock; \
+    static JUCE_NAMESPACE::CriticalSection _singletonLock; \
 \
     static classname* getInstance() \
     { \
         if (_singletonInstance == 0) \
         {\
-            const ScopedLock sl (_singletonLock); \
+            const JUCE_NAMESPACE::ScopedLock sl (_singletonLock); \
 \
             if (_singletonInstance == 0) \
             { \
@@ -132,7 +132,7 @@
 \
     static void deleteInstance() \
     { \
-        const ScopedLock sl (_singletonLock); \
+        const JUCE_NAMESPACE::ScopedLock sl (_singletonLock); \
         if (_singletonInstance != 0) \
         { \
             classname* const old = _singletonInstance; \
@@ -157,7 +157,7 @@
 #define juce_ImplementSingleton(classname) \
 \
     classname* classname::_singletonInstance = 0; \
-    CriticalSection classname::_singletonLock;
+    JUCE_NAMESPACE::CriticalSection classname::_singletonLock;
 
 
 //==============================================================================