diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 4f52f535f0..5c316964bf 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -187900,8 +187900,6 @@ namespace jpeglibNamespace
   #if JUCE_MINGW
 	typedef unsigned char boolean;
   #endif
-  extern "C"
-  {
 	#define JPEG_INTERNALS
 	#undef FAR
 
@@ -211268,11 +211266,10 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
 }
 /*** End of inlined file: transupp.c ***/
 
-  }
 #else
-  #define JPEG_INTERNALS
-  #undef FAR
-  #include <jpeglib.h>
+	#define JPEG_INTERNALS
+	#undef FAR
+	#include <jpeglib.h>
 #endif
 }
 
diff --git a/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp b/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
index 755d4bbd04..f560d4a59e 100644
--- a/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
+++ b/src/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp
@@ -35,8 +35,6 @@ namespace jpeglibNamespace
   #if JUCE_MINGW
     typedef unsigned char boolean;
   #endif
-  extern "C"
-  {
     #define JPEG_INTERNALS
     #undef FAR
     #include "jpglib/jpeglib.h"
@@ -109,11 +107,10 @@ namespace jpeglibNamespace
     #include "jpglib/jquant2.c"
     #include "jpglib/jutils.c"
     #include "jpglib/transupp.c"
-  }
 #else
-  #define JPEG_INTERNALS
-  #undef FAR
-  #include <jpeglib.h>
+    #define JPEG_INTERNALS
+    #undef FAR
+    #include <jpeglib.h>
 #endif
 }