diff --git a/amalgamation/juce_amalgamated_template.cpp b/amalgamation/juce_amalgamated_template.cpp
index 7b2ded4aeb..39d4d85c69 100644
--- a/amalgamation/juce_amalgamated_template.cpp
+++ b/amalgamation/juce_amalgamated_template.cpp
@@ -316,6 +316,9 @@
  #include "../src/gui/components/windows/juce_ThreadWithProgressWindow.cpp"
  #include "../src/gui/components/windows/juce_TooltipWindow.cpp"
  #include "../src/gui/components/windows/juce_TopLevelWindow.cpp"
+#endif
+
+#if JUCE_BUILD_MISC  // (put these in misc to balance the file sizes and avoid problems in iphone build)
  #include "../src/gui/graphics/colour/juce_Colour.cpp"
  #include "../src/gui/graphics/colour/juce_ColourGradient.cpp"
  #include "../src/gui/graphics/colour/juce_Colours.cpp"
diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 0d6eac02f3..cfc1dc44bf 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -77777,6 +77777,9 @@ TopLevelWindow* TopLevelWindow::getActiveTopLevelWindow() throw()
 END_JUCE_NAMESPACE
 /*** End of inlined file: juce_TopLevelWindow.cpp ***/
 
+#endif
+
+#if JUCE_BUILD_MISC  // (put these in misc to balance the file sizes and avoid problems in iphone build)
 
 /*** Start of inlined file: juce_Colour.cpp ***/
 BEGIN_JUCE_NAMESPACE
@@ -78284,6 +78287,7 @@ END_JUCE_NAMESPACE
 /*** End of inlined file: juce_Colour.cpp ***/
 
 
+
 /*** Start of inlined file: juce_ColourGradient.cpp ***/
 BEGIN_JUCE_NAMESPACE
 
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 59abc10b04..999f0349de 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -3136,7 +3136,8 @@ private:
 	Atomic& operator= (const Atomic&);
 };
 
-#if JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))  //  Older Mac builds using gcc4.1 or earlier...
+#if (JUCE_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_2 || ! defined (__IPHONE_3_2))) \
+	  || (JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)))  //  Older OSX builds using gcc4.1 or earlier...
 
 	inline void  Atomic::increment (int32& variable)		{ OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }
 	inline int32 Atomic::incrementAndReturn (int32& variable)	   { return OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }
diff --git a/src/core/juce_Atomic.h b/src/core/juce_Atomic.h
index 7886bdfd28..3c8340cf4d 100644
--- a/src/core/juce_Atomic.h
+++ b/src/core/juce_Atomic.h
@@ -62,7 +62,8 @@ private:
 
 
 //==============================================================================
-#if JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))  //  Older Mac builds using gcc4.1 or earlier...
+#if (JUCE_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_3_2 || ! defined (__IPHONE_3_2))) \
+      || (JUCE_MAC && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2)))  //  Older OSX builds using gcc4.1 or earlier...
 
     inline void  Atomic::increment (int32& variable)                { OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }
     inline int32 Atomic::incrementAndReturn (int32& variable)       { return OSAtomicIncrement32 (static_cast <int32_t*> (&variable)); }