diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 36ad8b3da450be3c6dd90d5719300c0efb5cdea4..5a3fb98ba344e6481fddd2cdc3a7f7ab10407b2f 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -59,7 +59,14 @@
 #include "llsdserialize.h"
 #include "lljoint.h"
 
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 #include "llmatrix4a.h"
 
 #include <boost/regex.hpp>
diff --git a/indra/llprimitive/llmodelloader.cpp b/indra/llprimitive/llmodelloader.cpp
index b0833c1e3d7df6e21ae75fa865c983e042194b0f..d653fe70b9f5397b0969d89b1532e42ef587a329 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -30,7 +30,14 @@
 #include "llcallbacklist.h"
 #include "lltimer.h"
 
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 #include "llmatrix4a.h"
 #include <boost/bind.hpp>
 
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 30fe5e3f6790ce4db82615e283af948ab6c4b158..7f6fffef87779f654e20a119844c5602b2e18587 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -43,7 +43,14 @@
 #include "llinstancetracker.h"
 
 #include "llglheaders.h"
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 
 extern BOOL gDebugGL;
 extern BOOL gDebugSession;
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 41f4fe40176620087a214303dd732498ed7b0e06..db37db80e1bfcf2d538a284aea88f56061602a17 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -42,7 +42,14 @@
 #include "llpointer.h"
 #include "llglheaders.h"
 #include "llmatrix4a.h"
+#if LL_GNUC
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+#endif
 #include "glh/glh_linear.h"
+#if LL_GNUC
+#pragma GCC diagnostic pop
+#endif
 
 class LLVertexBuffer;
 class LLCubeMap;