diff --git a/extras/juce demo/src/demos/OpenGLDemo.cpp b/extras/juce demo/src/demos/OpenGLDemo.cpp
index 1b2da240a3..dde289c785 100644
--- a/extras/juce demo/src/demos/OpenGLDemo.cpp	
+++ b/extras/juce demo/src/demos/OpenGLDemo.cpp	
@@ -43,10 +43,6 @@
 #ifdef _WIN32
  #include <gl/gl.h>
  #include <gl/glu.h>
- #ifdef _MSC_VER
-  #pragma comment(lib, "OpenGL32.Lib")
-  #pragma comment(lib, "GlU32.Lib")
- #endif
 #elif defined (LINUX)
  #include <GL/gl.h>
  #include <GL/glut.h>
diff --git a/src/juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp b/src/juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp
index 563da3c6f6..4170ba299a 100644
--- a/src/juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp
+++ b/src/juce_appframework/audio/audio_file_formats/juce_AiffAudioFormat.cpp
@@ -39,11 +39,12 @@ BEGIN_JUCE_NAMESPACE
 #include "../../../juce_core/text/juce_LocalisedStrings.h"
 
 
+#undef chunkName
 #define chunkName(a) (int)littleEndianInt(a)
 
 //==============================================================================
-#define formatName                          TRANS("AIFF file")
-static const tchar* const extensions[] =    { T(".aiff"), T(".aif"), 0 };
+#define aiffFormatName                          TRANS("AIFF file")
+static const tchar* const aiffExtensions[] =    { T(".aiff"), T(".aif"), 0 };
 
 
 //==============================================================================
@@ -56,7 +57,7 @@ public:
 
     //==============================================================================
     AiffAudioFormatReader (InputStream* in)
-        : AudioFormatReader (in, formatName)
+        : AudioFormatReader (in, aiffFormatName)
     {
         if (input->readInt() == chunkName ("FORM"))
         {
@@ -624,7 +625,7 @@ public:
                            const unsigned int chans,
                            const int bits)
         : AudioFormatWriter (out,
-                             formatName,
+                             aiffFormatName,
                              sampleRate,
                              chans,
                              bits),
@@ -767,7 +768,7 @@ public:
 
 //==============================================================================
 AiffAudioFormat::AiffAudioFormat()
-    : AudioFormat (formatName, (const tchar**) extensions)
+    : AudioFormat (aiffFormatName, (const tchar**) aiffExtensions)
 {
 }
 
diff --git a/src/juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp b/src/juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp
index 3b7f17e70f..82b5a14539 100644
--- a/src/juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp
+++ b/src/juce_appframework/audio/audio_file_formats/juce_WavAudioFormat.cpp
@@ -39,8 +39,8 @@ BEGIN_JUCE_NAMESPACE
 
 
 //==============================================================================
-#define formatName                          TRANS("WAV file")
-static const tchar* const extensions[] =    { T(".wav"), T(".bwf"), 0 };
+#define wavFormatName                          TRANS("WAV file")
+static const tchar* const wavExtensions[] =    { T(".wav"), T(".bwf"), 0 };
 
 
 //==============================================================================
@@ -156,6 +156,7 @@ struct BWAVChunk
 
 #undef PACKED
 
+#undef chunkName
 #define chunkName(a) ((int) littleEndianInt(a))
 
 //==============================================================================
@@ -170,7 +171,7 @@ class WavAudioFormatReader  : public AudioFormatReader
 public:
     //==============================================================================
     WavAudioFormatReader (InputStream* const in)
-        : AudioFormatReader (in, formatName),
+        : AudioFormatReader (in, wavFormatName),
           dataLength (0)
     {
         if (input->readInt() == chunkName ("RIFF"))
@@ -543,7 +544,7 @@ public:
                           const int bits,
                           const StringPairArray& metadataValues)
         : AudioFormatWriter (out,
-                             formatName,
+                             wavFormatName,
                              sampleRate,
                              numChannels_,
                              bits),
@@ -686,7 +687,7 @@ public:
 
 //==============================================================================
 WavAudioFormat::WavAudioFormat()
-    : AudioFormat (formatName, (const tchar**) extensions)
+    : AudioFormat (wavFormatName, (const tchar**) wavExtensions)
 {
 }