diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h
index 884d07116..abeaf84ce 100644
--- a/indra/llimage/llimagejpeg.h
+++ b/indra/llimage/llimagejpeg.h
@@ -35,8 +35,6 @@
 
 #include <csetjmp>
 
-#include "llimage.h"
-
 extern "C" {
 #ifdef LL_STANDALONE
 # include <jpeglib.h>
@@ -47,6 +45,8 @@ extern "C" {
 #endif
 }
 
+#include "llimage.h"
+
 class LLImageJPEG : public LLImageFormatted
 {
 protected:
diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 2670ae2a8..359c8a19c 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -32,6 +32,7 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llimagejpeg.h"
 #include "llfloatercustomize.h"
 #include "llfontgl.h"
 #include "llbutton.h"
@@ -71,7 +72,6 @@
 #include "llglheaders.h"
 #include "llui.h"
 #include "llviewermessage.h"
-#include "llimagejpeg.h"
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
 
diff --git a/indra/newview/llfloaterpostcard.h b/indra/newview/llfloaterpostcard.h
index d294cfca5..f9e1b50cb 100644
--- a/indra/newview/llfloaterpostcard.h
+++ b/indra/newview/llfloaterpostcard.h
@@ -33,12 +33,12 @@
 #ifndef LL_LLFLOATERPOSTCARD_H
 #define LL_LLFLOATERPOSTCARD_H
 
+#include "llimagegl.h"
+#include "llimagejpeg.h"
 #include "llfloater.h"
 #include "llcheckboxctrl.h"
 
 #include "llmemory.h"
-#include "llimagegl.h"
-#include "llimagejpeg.h"
 
 class LLTextEditor;
 class LLLineEditor;
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 596dee9e9..a706b02ab 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -37,6 +37,10 @@
 // project includes
 #include "llagent.h"
 
+#include "llimagejpeg.h"
+#include "llimagepng.h"
+#include "llimagebmp.h"
+
 #include "llfilepicker.h"
 #include "llfloateranimpreview.h"
 #include "llfloaterbuycurrency.h"
@@ -81,10 +85,6 @@
 #include "lluuid.h"
 #include "llvorbisencode.h"
 
-#include "llimagejpeg.h"
-#include "llimagepng.h"
-#include "llimagebmp.h"
-
 // system libraries
 #include <boost/tokenizer.hpp>
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a37cffd26..77ad620f6 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -37,6 +37,7 @@
 
 #include <deque>
 
+#include "llimagejpeg.h"
 #include "llaudioengine.h" 
 #include "llavatarnamecache.h"
 #include "indra_constants.h"