diff --git a/juce_Config.h b/juce_Config.h
index 0723348a7d..e812b52b1e 100644
--- a/juce_Config.h
+++ b/juce_Config.h
@@ -297,15 +297,15 @@
   #define JUCE_QUICKTIME 0
   #undef  JUCE_OPENGL
   #define JUCE_OPENGL 0
-  #undef JUCE_USE_CDBURNER
+  #undef  JUCE_USE_CDBURNER
   #define JUCE_USE_CDBURNER 0
-  #undef JUCE_USE_CDREADER
+  #undef  JUCE_USE_CDREADER
   #define JUCE_USE_CDREADER 0
-  #undef JUCE_WEB_BROWSER
+  #undef  JUCE_WEB_BROWSER
   #define JUCE_WEB_BROWSER 0
-  #undef JUCE_PLUGINHOST_AU
+  #undef  JUCE_PLUGINHOST_AU
   #define JUCE_PLUGINHOST_AU 0
-  #undef JUCE_PLUGINHOST_VST
+  #undef  JUCE_PLUGINHOST_VST
   #define JUCE_PLUGINHOST_VST 0
 #endif
 
diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 418011d001..c90e20ceb6 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -444,15 +444,15 @@
   #define JUCE_QUICKTIME 0
   #undef  JUCE_OPENGL
   #define JUCE_OPENGL 0
-  #undef JUCE_USE_CDBURNER
+  #undef  JUCE_USE_CDBURNER
   #define JUCE_USE_CDBURNER 0
-  #undef JUCE_USE_CDREADER
+  #undef  JUCE_USE_CDREADER
   #define JUCE_USE_CDREADER 0
-  #undef JUCE_WEB_BROWSER
+  #undef  JUCE_WEB_BROWSER
   #define JUCE_WEB_BROWSER 0
-  #undef JUCE_PLUGINHOST_AU
+  #undef  JUCE_PLUGINHOST_AU
   #define JUCE_PLUGINHOST_AU 0
-  #undef JUCE_PLUGINHOST_VST
+  #undef  JUCE_PLUGINHOST_VST
   #define JUCE_PLUGINHOST_VST 0
 #endif
 
@@ -915,7 +915,7 @@ protected:
  #include <GLUT/glut.h>
 #endif
 
-#if ! CGFLOAT_DEFINED
+#if ! (CGFLOAT_DEFINED || defined (DOXYGEN))
   #define CGFloat float
 #endif
 
@@ -262413,9 +262413,11 @@ private:
  #define JUCE_ObjCExtraSuffix 3
 #endif
 
-#define appendMacro1(a, b, c, d, e) a ## _ ## b ## _ ## c ## _ ## d ## _ ## e
-#define appendMacro2(a, b, c, d, e) appendMacro1(a, b, c, d, e)
-#define MakeObjCClassName(rootName)  appendMacro2 (rootName, JUCE_MAJOR_VERSION, JUCE_MINOR_VERSION, JUCE_BUILDNUMBER, JUCE_ObjCExtraSuffix)
+#ifndef DOXYGEN
+ #define appendMacro1(a, b, c, d, e) a ## _ ## b ## _ ## c ## _ ## d ## _ ## e
+ #define appendMacro2(a, b, c, d, e) appendMacro1(a, b, c, d, e)
+ #define MakeObjCClassName(rootName)  appendMacro2 (rootName, JUCE_MAJOR_VERSION, JUCE_MINOR_VERSION, JUCE_BUILDNUMBER, JUCE_ObjCExtraSuffix)
+#endif
 /*** End of inlined file: juce_mac_ObjCSuffix.h ***/
 
 
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index 8a10c38243..17975d293b 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -483,15 +483,15 @@
   #define JUCE_QUICKTIME 0
   #undef  JUCE_OPENGL
   #define JUCE_OPENGL 0
-  #undef JUCE_USE_CDBURNER
+  #undef  JUCE_USE_CDBURNER
   #define JUCE_USE_CDBURNER 0
-  #undef JUCE_USE_CDREADER
+  #undef  JUCE_USE_CDREADER
   #define JUCE_USE_CDREADER 0
-  #undef JUCE_WEB_BROWSER
+  #undef  JUCE_WEB_BROWSER
   #define JUCE_WEB_BROWSER 0
-  #undef JUCE_PLUGINHOST_AU
+  #undef  JUCE_PLUGINHOST_AU
   #define JUCE_PLUGINHOST_AU 0
-  #undef JUCE_PLUGINHOST_VST
+  #undef  JUCE_PLUGINHOST_VST
   #define JUCE_PLUGINHOST_VST 0
 #endif
 
@@ -4103,8 +4103,10 @@ public:
 #ifndef __JUCE_CRITICALSECTION_JUCEHEADER__
 #define __JUCE_CRITICALSECTION_JUCEHEADER__
 
-class JUCE_API  ScopedLock;
-class JUCE_API  ScopedUnlock;
+#ifndef DOXYGEN
+ class JUCE_API  ScopedLock;
+ class JUCE_API  ScopedUnlock;
+#endif
 
 /**
 	Prevents multiple threads from accessing shared objects at the same time.
@@ -6040,7 +6042,9 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const NewLine&);
 #endif   // __JUCE_OUTPUTSTREAM_JUCEHEADER__
 /*** End of inlined file: juce_OutputStream.h ***/
 
-class JUCE_API  DynamicObject;
+#ifndef DOXYGEN
+ class JUCE_API  DynamicObject;
+#endif
 
 /**
 	A variant class, that can be used to hold a range of primitive values.
@@ -12284,12 +12288,14 @@ template <class ListenerClass,
 class ListenerList
 {
 	// Horrible macros required to support VC6/7..
-	#if JUCE_VC8_OR_EARLIER
-	  #define LL_TEMPLATE(a)   typename P##a, typename Q##a
-	  #define LL_PARAM(a)	  Q##a& param##a
-	#else
-	  #define LL_TEMPLATE(a)   typename P##a
-	  #define LL_PARAM(a)	  PARAMETER_TYPE(P##a) param##a
+	#ifndef DOXYGEN
+	 #if JUCE_VC8_OR_EARLIER
+	   #define LL_TEMPLATE(a)   typename P##a, typename Q##a
+	   #define LL_PARAM(a)	  Q##a& param##a
+	 #else
+	   #define LL_TEMPLATE(a)   typename P##a
+	   #define LL_PARAM(a)	  PARAMETER_TYPE(P##a) param##a
+	 #endif
 	#endif
 
 public:
@@ -14868,6 +14874,7 @@ public:
 
 private:
 
+   #ifndef DOXYGEN
 	union
 	{
 		uint8 asBytes [16];
@@ -14875,6 +14882,7 @@ private:
 		int64 asInt64[2];
 
 	} value;
+   #endif
 
 	JUCE_LEAK_DETECTOR (Uuid);
 };
@@ -15325,9 +15333,10 @@ private:
 /** Writes a BigInteger to an OutputStream as a UTF8 decimal string. */
 OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const BigInteger& value);
 
-/** For backwards compatibility, BitArray is defined to be an alias for BigInteger.
-*/
-typedef BigInteger BitArray;
+#ifndef DOXYGEN
+ // For backwards compatibility, BitArray is defined as an alias for BigInteger.
+ typedef BigInteger BitArray;
+#endif
 
 #endif   // __JUCE_BIGINTEGER_JUCEHEADER__
 /*** End of inlined file: juce_BigInteger.h ***/
@@ -16349,11 +16358,13 @@ public:
 	bool operator!= (const MACAddress& other) const throw();
 
 private:
+   #ifndef DOXYGEN
 	union
 	{
 		uint64 asInt64;
 		uint8 asBytes[6];
 	};
+   #endif
 };
 
 #endif   // __JUCE_MACADDRESS_JUCEHEADER__
@@ -18782,8 +18793,10 @@ private:
 	uint32 affinityMask_;
 	bool volatile threadShouldExit_;
 
+   #ifndef DOXYGEN
 	friend class MessageManager;
 	friend void JUCE_API juce_threadEntryPoint (void*);
+   #endif
 
 	void launchThread();
 	void closeThreadHandle();
@@ -23751,13 +23764,15 @@ private:
 #ifndef __JUCE_PIXELFORMATS_JUCEHEADER__
 #define __JUCE_PIXELFORMATS_JUCEHEADER__
 
-#if JUCE_MSVC
+#ifndef DOXYGEN
+ #if JUCE_MSVC
   #pragma pack (push, 1)
   #define PACKED
-#elif JUCE_GCC
+ #elif JUCE_GCC
   #define PACKED __attribute__((packed))
-#else
+ #else
   #define PACKED
+ #endif
 #endif
 
 class PixelRGB;
@@ -23978,15 +23993,18 @@ private:
 
 		struct
 		{
-#if JUCE_BIG_ENDIAN
+		  #if JUCE_BIG_ENDIAN
 			uint8 a : 8, r : 8, g : 8, b : 8;
-#else
+		  #else
 			uint8 b, g, r, a;
-#endif
+		  #endif
 		} PACKED components;
 	};
-
-} PACKED;
+}
+#ifndef DOXYGEN
+ PACKED
+#endif
+;
 
 /**
 	Represents a 24-bit RGB pixel, and can perform compositing operations on it.
@@ -24141,7 +24159,11 @@ private:
 	uint8 b, g, r;
 #endif
 
-} PACKED;
+}
+#ifndef DOXYGEN
+ PACKED
+#endif
+;
 
 forcedinline void PixelARGB::blend (const PixelRGB& src) throw()
 {
@@ -24268,7 +24290,11 @@ public:
 private:
 
 	uint8 a : 8;
-} PACKED;
+}
+#ifndef DOXYGEN
+ PACKED
+#endif
+;
 
 forcedinline void PixelRGB::blend (const PixelAlpha& src) throw()
 {
@@ -28540,6 +28566,7 @@ private:
 	friend class MouseInputSource;
 	friend class MouseInputSourceInternal;
 
+   #ifndef DOXYGEN
 	static Component* currentlyFocusedComponent;
 
 	String componentName_;
@@ -28652,6 +28679,7 @@ protected:
 	virtual void internalRepaint (int x, int y, int w, int h);
 	/** @internal */
 	virtual ComponentPeer* createNewPeer (int styleFlags, void* nativeWindowToAttachTo);
+   #endif
 };
 
 #endif   // __JUCE_COMPONENT_JUCEHEADER__
@@ -35735,11 +35763,13 @@ private:
 	uint8* data;
 	int size;
 
+   #ifndef DOXYGEN
 	union
 	{
 		uint8 asBytes[4];
 		uint32 asInt32;
 	} preallocatedData;
+   #endif
 };
 
 #endif   // __JUCE_MIDIMESSAGE_JUCEHEADER__
@@ -59044,12 +59074,14 @@ private:
 
 // (NB: This stuff mustn't go inside the "#if QUICKTIME" block, or it'll break the
 // amalgamated build)
-#if JUCE_WINDOWS
+#ifndef DOXYGEN
+ #if JUCE_WINDOWS
 
   typedef ActiveXControlComponent QTCompBaseClass;
-#elif JUCE_MAC
+ #elif JUCE_MAC
 
   typedef NSViewComponent QTCompBaseClass;
+ #endif
 #endif
 
 // this is used to disable QuickTime, and is defined in juce_Config.h
diff --git a/src/audio/midi/juce_MidiMessage.h b/src/audio/midi/juce_MidiMessage.h
index 5de9f074cf..fea4f2d667 100644
--- a/src/audio/midi/juce_MidiMessage.h
+++ b/src/audio/midi/juce_MidiMessage.h
@@ -896,12 +896,13 @@ private:
     uint8* data;
     int size;
 
+   #ifndef DOXYGEN
     union
     {
         uint8 asBytes[4];
         uint32 asInt32;
     } preallocatedData;
+   #endif
 };
 
-
 #endif   // __JUCE_MIDIMESSAGE_JUCEHEADER__
diff --git a/src/containers/juce_Variant.h b/src/containers/juce_Variant.h
index f0750b74d9..76ba85f585 100644
--- a/src/containers/juce_Variant.h
+++ b/src/containers/juce_Variant.h
@@ -30,8 +30,9 @@
 #include "../io/streams/juce_OutputStream.h"
 #include "../io/streams/juce_InputStream.h"
 
-class JUCE_API  DynamicObject;
-
+#ifndef DOXYGEN
+ class JUCE_API  DynamicObject;
+#endif
 
 //==============================================================================
 /**
diff --git a/src/core/juce_Uuid.h b/src/core/juce_Uuid.h
index 6994e7dc7d..3747ed468b 100644
--- a/src/core/juce_Uuid.h
+++ b/src/core/juce_Uuid.h
@@ -108,6 +108,7 @@ public:
 
 private:
     //==============================================================================
+   #ifndef DOXYGEN
     union
     {
         uint8 asBytes [16];
@@ -115,6 +116,7 @@ private:
         int64 asInt64[2];
 
     } value;
+   #endif
 
     JUCE_LEAK_DETECTOR (Uuid);
 };
diff --git a/src/events/juce_ListenerList.h b/src/events/juce_ListenerList.h
index 98f78e53fe..4ab95d6fd2 100644
--- a/src/events/juce_ListenerList.h
+++ b/src/events/juce_ListenerList.h
@@ -72,12 +72,14 @@ template <class ListenerClass,
 class ListenerList
 {
     // Horrible macros required to support VC6/7..
-    #if JUCE_VC8_OR_EARLIER
-      #define LL_TEMPLATE(a)   typename P##a, typename Q##a
-      #define LL_PARAM(a)      Q##a& param##a
-    #else
-      #define LL_TEMPLATE(a)   typename P##a
-      #define LL_PARAM(a)      PARAMETER_TYPE(P##a) param##a
+    #ifndef DOXYGEN
+     #if JUCE_VC8_OR_EARLIER
+       #define LL_TEMPLATE(a)   typename P##a, typename Q##a
+       #define LL_PARAM(a)      Q##a& param##a
+     #else
+       #define LL_TEMPLATE(a)   typename P##a
+       #define LL_PARAM(a)      PARAMETER_TYPE(P##a) param##a
+     #endif
     #endif
 
 public:
diff --git a/src/gui/components/juce_Component.h b/src/gui/components/juce_Component.h
index 29afe15fc6..a03be3fd94 100644
--- a/src/gui/components/juce_Component.h
+++ b/src/gui/components/juce_Component.h
@@ -2111,6 +2111,7 @@ private:
     friend class MouseInputSource;
     friend class MouseInputSourceInternal;
 
+   #ifndef DOXYGEN
     static Component* currentlyFocusedComponent;
 
     //==============================================================================
@@ -2226,6 +2227,7 @@ protected:
     virtual void internalRepaint (int x, int y, int w, int h);
     /** @internal */
     virtual ComponentPeer* createNewPeer (int styleFlags, void* nativeWindowToAttachTo);
+   #endif
 };
 
 
diff --git a/src/gui/components/special/juce_QuickTimeMovieComponent.h b/src/gui/components/special/juce_QuickTimeMovieComponent.h
index 868d23fddc..79c382efe2 100644
--- a/src/gui/components/special/juce_QuickTimeMovieComponent.h
+++ b/src/gui/components/special/juce_QuickTimeMovieComponent.h
@@ -30,12 +30,14 @@
 
 // (NB: This stuff mustn't go inside the "#if QUICKTIME" block, or it'll break the
 // amalgamated build)
-#if JUCE_WINDOWS
+#ifndef DOXYGEN
+ #if JUCE_WINDOWS
   #include "juce_ActiveXControlComponent.h"
   typedef ActiveXControlComponent QTCompBaseClass;
-#elif JUCE_MAC
+ #elif JUCE_MAC
   #include "juce_NSViewComponent.h"
   typedef NSViewComponent QTCompBaseClass;
+ #endif
 #endif
 
 // this is used to disable QuickTime, and is defined in juce_Config.h
diff --git a/src/gui/graphics/colour/juce_PixelFormats.h b/src/gui/graphics/colour/juce_PixelFormats.h
index 732a8d4c6b..089646ff09 100644
--- a/src/gui/graphics/colour/juce_PixelFormats.h
+++ b/src/gui/graphics/colour/juce_PixelFormats.h
@@ -28,13 +28,15 @@
 
 
 //==============================================================================
-#if JUCE_MSVC
+#ifndef DOXYGEN
+ #if JUCE_MSVC
   #pragma pack (push, 1)
   #define PACKED
-#elif JUCE_GCC
+ #elif JUCE_GCC
   #define PACKED __attribute__((packed))
-#else
+ #else
   #define PACKED
+ #endif
 #endif
 
 class PixelRGB;
@@ -258,15 +260,18 @@ private:
 
         struct
         {
-#if JUCE_BIG_ENDIAN
+          #if JUCE_BIG_ENDIAN
             uint8 a : 8, r : 8, g : 8, b : 8;
-#else
+          #else
             uint8 b, g, r, a;
-#endif
+          #endif
         } PACKED components;
     };
-
-} PACKED;
+}
+#ifndef DOXYGEN
+ PACKED
+#endif
+;
 
 
 //==============================================================================
@@ -424,7 +429,11 @@ private:
     uint8 b, g, r;
 #endif
 
-} PACKED;
+}
+#ifndef DOXYGEN
+ PACKED
+#endif
+;
 
 forcedinline void PixelARGB::blend (const PixelRGB& src) throw()
 {
@@ -553,7 +562,11 @@ public:
 private:
     //==============================================================================
     uint8 a : 8;
-} PACKED;
+}
+#ifndef DOXYGEN
+ PACKED
+#endif
+;
 
 forcedinline void PixelRGB::blend (const PixelAlpha& src) throw()
 {
diff --git a/src/io/network/juce_MACAddress.h b/src/io/network/juce_MACAddress.h
index d0c4728c41..6c4a0b5da3 100644
--- a/src/io/network/juce_MACAddress.h
+++ b/src/io/network/juce_MACAddress.h
@@ -79,11 +79,13 @@ public:
 
     //==============================================================================
 private:
+   #ifndef DOXYGEN
     union
     {
         uint64 asInt64;
         uint8 asBytes[6];
     };
+   #endif
 };
 
 
diff --git a/src/maths/juce_BigInteger.h b/src/maths/juce_BigInteger.h
index ae841f7bb6..04a33b747c 100644
--- a/src/maths/juce_BigInteger.h
+++ b/src/maths/juce_BigInteger.h
@@ -323,9 +323,10 @@ private:
 OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const BigInteger& value);
 
 //==============================================================================
-/** For backwards compatibility, BitArray is defined to be an alias for BigInteger.
-*/
-typedef BigInteger BitArray;
+#ifndef DOXYGEN
+ // For backwards compatibility, BitArray is defined as an alias for BigInteger.
+ typedef BigInteger BitArray;
+#endif
 
 
 #endif   // __JUCE_BIGINTEGER_JUCEHEADER__
diff --git a/src/native/mac/juce_mac_NativeIncludes.h b/src/native/mac/juce_mac_NativeIncludes.h
index e1102dd3d9..44fb8ec9cb 100644
--- a/src/native/mac/juce_mac_NativeIncludes.h
+++ b/src/native/mac/juce_mac_NativeIncludes.h
@@ -88,7 +88,7 @@
  #include <GLUT/glut.h>
 #endif
 
-#if ! CGFLOAT_DEFINED
+#if ! (CGFLOAT_DEFINED || defined (DOXYGEN))
   #define CGFloat float
 #endif
 
diff --git a/src/native/mac/juce_mac_ObjCSuffix.h b/src/native/mac/juce_mac_ObjCSuffix.h
index 7daeb62689..50c95d6c65 100644
--- a/src/native/mac/juce_mac_ObjCSuffix.h
+++ b/src/native/mac/juce_mac_ObjCSuffix.h
@@ -40,6 +40,8 @@
  #define JUCE_ObjCExtraSuffix 3
 #endif
 
-#define appendMacro1(a, b, c, d, e) a ## _ ## b ## _ ## c ## _ ## d ## _ ## e
-#define appendMacro2(a, b, c, d, e) appendMacro1(a, b, c, d, e)
-#define MakeObjCClassName(rootName)  appendMacro2 (rootName, JUCE_MAJOR_VERSION, JUCE_MINOR_VERSION, JUCE_BUILDNUMBER, JUCE_ObjCExtraSuffix)
+#ifndef DOXYGEN
+ #define appendMacro1(a, b, c, d, e) a ## _ ## b ## _ ## c ## _ ## d ## _ ## e
+ #define appendMacro2(a, b, c, d, e) appendMacro1(a, b, c, d, e)
+ #define MakeObjCClassName(rootName)  appendMacro2 (rootName, JUCE_MAJOR_VERSION, JUCE_MINOR_VERSION, JUCE_BUILDNUMBER, JUCE_ObjCExtraSuffix)
+#endif
\ No newline at end of file
diff --git a/src/threads/juce_CriticalSection.h b/src/threads/juce_CriticalSection.h
index 0502198f6b..668c0b80e6 100644
--- a/src/threads/juce_CriticalSection.h
+++ b/src/threads/juce_CriticalSection.h
@@ -26,8 +26,10 @@
 #ifndef __JUCE_CRITICALSECTION_JUCEHEADER__
 #define __JUCE_CRITICALSECTION_JUCEHEADER__
 
-class JUCE_API  ScopedLock;
-class JUCE_API  ScopedUnlock;
+#ifndef DOXYGEN
+ class JUCE_API  ScopedLock;
+ class JUCE_API  ScopedUnlock;
+#endif
 
 
 //==============================================================================
diff --git a/src/threads/juce_Thread.h b/src/threads/juce_Thread.h
index 35d3ddcb67..f0e6bd7578 100644
--- a/src/threads/juce_Thread.h
+++ b/src/threads/juce_Thread.h
@@ -283,8 +283,10 @@ private:
     uint32 affinityMask_;
     bool volatile threadShouldExit_;
 
+   #ifndef DOXYGEN
     friend class MessageManager;
     friend void JUCE_API juce_threadEntryPoint (void*);
+   #endif
 
     void launchThread();
     void closeThreadHandle();