diff --git a/juce_Config.h b/juce_Config.h
index c598481323..201a754472 100644
--- a/juce_Config.h
+++ b/juce_Config.h
@@ -274,12 +274,19 @@
 //=============================================================================
 // If only building the core classes, we can explicitly turn off some features to avoid including them:
 #if JUCE_ONLY_BUILD_CORE_LIBRARY
+  #undef  JUCE_QUICKTIME
   #define JUCE_QUICKTIME 0
+  #undef  JUCE_OPENGL
   #define JUCE_OPENGL 0
+  #undef JUCE_USE_CDBURNER
   #define JUCE_USE_CDBURNER 0
+  #undef JUCE_USE_CDREADER
   #define JUCE_USE_CDREADER 0
+  #undef JUCE_WEB_BROWSER
   #define JUCE_WEB_BROWSER 0
+  #undef JUCE_PLUGINHOST_AU
   #define JUCE_PLUGINHOST_AU 0
+  #undef JUCE_PLUGINHOST_VST
   #define JUCE_PLUGINHOST_VST 0
 #endif
 
diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index f15db7fb30..896d2b5a4f 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -408,12 +408,19 @@
 
 // If only building the core classes, we can explicitly turn off some features to avoid including them:
 #if JUCE_ONLY_BUILD_CORE_LIBRARY
+  #undef  JUCE_QUICKTIME
   #define JUCE_QUICKTIME 0
+  #undef  JUCE_OPENGL
   #define JUCE_OPENGL 0
+  #undef JUCE_USE_CDBURNER
   #define JUCE_USE_CDBURNER 0
+  #undef JUCE_USE_CDREADER
   #define JUCE_USE_CDREADER 0
+  #undef JUCE_WEB_BROWSER
   #define JUCE_WEB_BROWSER 0
+  #undef JUCE_PLUGINHOST_AU
   #define JUCE_PLUGINHOST_AU 0
+  #undef JUCE_PLUGINHOST_VST
   #define JUCE_PLUGINHOST_VST 0
 #endif
 
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 8a6d3cb271..66126a3ef1 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -442,12 +442,19 @@
 
 // If only building the core classes, we can explicitly turn off some features to avoid including them:
 #if JUCE_ONLY_BUILD_CORE_LIBRARY
+  #undef  JUCE_QUICKTIME
   #define JUCE_QUICKTIME 0
+  #undef  JUCE_OPENGL
   #define JUCE_OPENGL 0
+  #undef JUCE_USE_CDBURNER
   #define JUCE_USE_CDBURNER 0
+  #undef JUCE_USE_CDREADER
   #define JUCE_USE_CDREADER 0
+  #undef JUCE_WEB_BROWSER
   #define JUCE_WEB_BROWSER 0
+  #undef JUCE_PLUGINHOST_AU
   #define JUCE_PLUGINHOST_AU 0
+  #undef JUCE_PLUGINHOST_VST
   #define JUCE_PLUGINHOST_VST 0
 #endif
 
@@ -9318,8 +9325,8 @@ public:
 
         bool operator== (const identifier& other) const throw()
         {
-            return hashCode == other.hashCode;
             jassert (hashCode != other.hashCode || name == other.name); // check for name hash collisions
+            return hashCode == other.hashCode;
         }
 
         String name;
diff --git a/src/containers/juce_Variant.h b/src/containers/juce_Variant.h
index ece5cd5526..ea6b5ae31d 100644
--- a/src/containers/juce_Variant.h
+++ b/src/containers/juce_Variant.h
@@ -119,8 +119,8 @@ public:
 
         bool operator== (const identifier& other) const throw()
         {
-            return hashCode == other.hashCode;
             jassert (hashCode != other.hashCode || name == other.name); // check for name hash collisions
+            return hashCode == other.hashCode;
         }
 
         String name;