diff --git a/autobuild.xml b/autobuild.xml
index 1e1ed028d438077189c5f279b3b89d0b9b2c3ea5..f17e9e69a9ddc0faf98a67d8c2f3fc31a736428a 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -657,38 +657,6 @@
         <key>version</key>
         <string>2.10.4</string>
       </map>
-      <key>glh_linear</key>
-      <map>
-        <key>copyright</key>
-        <string>Copyright (c) 2000 Cass Everitt</string>
-        <key>description</key>
-        <string>glh - is a platform-indepenedent C++ OpenGL helper library</string>
-        <key>license</key>
-        <string>BSD</string>
-        <key>license_file</key>
-        <string>LICENSES/glh-linear.txt</string>
-        <key>name</key>
-        <string>glh_linear</string>
-        <key>platforms</key>
-        <map>
-          <key>common</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>3bf5067722ac60db75c600e8a4e15c7be1147329847eb373971f1a90be76cbf71499ed14c5b91e175a221bd6b02d4ec9fc172930e34666cb2ffd24efedba87f9</string>
-              <key>hash_algorithm</key>
-              <string>blake2b</string>
-              <key>url</key>
-              <string>https://git.alchemyviewer.org/api/v4/projects/139/packages/generic/glh_linear/0.0.1.1174/glh_linear-0.0.1-common-1174.tar.zst</string>
-            </map>
-            <key>name</key>
-            <string>common</string>
-          </map>
-        </map>
-        <key>version</key>
-        <string>0.0.1</string>
-      </map>
       <key>glod</key>
       <map>
         <key>copyright</key>
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 2d97e2ae469035013ffdd0a2d4e9d0afc585aa3f..a362ebf0d1a241967ddbb87b849f98b8b4157cbb 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -25,7 +25,6 @@ set(cmake_SOURCE_FILES
     FindAPR.cmake
     FindAutobuild.cmake
     FindFMODSTUDIO.cmake
-    FindGLH.cmake
     FindHUNSPELL.cmake
     FindNDOF.cmake
     FindOpenJPEG.cmake
@@ -34,7 +33,6 @@ set(cmake_SOURCE_FILES
     FMODSTUDIO.cmake
     FreeType.cmake
     GLEXT.cmake
-    GLH.cmake
     GLOD.cmake
     GStreamer010Plugin.cmake
     Hunspell.cmake
diff --git a/indra/cmake/FindGLH.cmake b/indra/cmake/FindGLH.cmake
deleted file mode 100644
index 3d16adaf03d399784f6bb1478472ead07d9b1dd4..0000000000000000000000000000000000000000
--- a/indra/cmake/FindGLH.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- cmake -*-
-
-# - Find GLH
-# Find the Graphic Library Helper includes.
-# This module defines
-#  GLH_INCLUDE_DIR, where to find glh/glh_linear.h.
-#  GLH_FOUND, If false, do not try to use GLH.
-
-find_path(GLH_INCLUDE_DIR glh/glh_linear.h
-    NO_SYSTEM_ENVIRONMENT_PATH
-    )
-
-if (GLH_INCLUDE_DIR)
-  set(GLH_FOUND "YES")
-else (GLH_INCLUDE_DIR)
-  set(GLH_FOUND "NO")
-endif (GLH_INCLUDE_DIR)
-
-if (GLH_FOUND)
-  if (NOT GLH_FIND_QUIETLY)
-    message(STATUS "Found GLH: ${GLH_INCLUDE_DIR}")
-    set(GLH_FIND_QUIETLY TRUE) # Only alert us the first time
-  endif (NOT GLH_FIND_QUIETLY)
-else (GLH_FOUND)
-  if (GLH_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find GLH")
-  endif (GLH_FIND_REQUIRED)
-endif (GLH_FOUND)
-
-mark_as_advanced(GLH_INCLUDE_DIR)
diff --git a/indra/cmake/GLEXT.cmake b/indra/cmake/GLEXT.cmake
index 4dc5ed19c82e11953bc4abe3a3f3800554be1993..a8abe8489d3d74cb9a469ad6e56a0ef585e1a19d 100644
--- a/indra/cmake/GLEXT.cmake
+++ b/indra/cmake/GLEXT.cmake
@@ -2,6 +2,5 @@
 include(Prebuilt)
 
 if (NOT USESYSTEMLIBS)
-  use_prebuilt_binary(glh_linear)
   set(GLEXT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include)
 endif (NOT USESYSTEMLIBS)
diff --git a/indra/cmake/GLH.cmake b/indra/cmake/GLH.cmake
deleted file mode 100644
index d5262f2efa79acafca6fa6661a2bd81d6dcbbdd1..0000000000000000000000000000000000000000
--- a/indra/cmake/GLH.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- cmake -*-
-include(Prebuilt)
-
-set(GLH_FIND_REQUIRED TRUE)
-set(GLH_FIND_QUIETLY TRUE)
-
-if (USESYSTEMLIBS)
-  include(FindGLH)
-else (USESYSTEMLIBS)
-  use_prebuilt_binary(glh_linear)
-endif (USESYSTEMLIBS)
diff --git a/indra/cmake/LLRender.cmake b/indra/cmake/LLRender.cmake
index 868922451f0008135f92ce7f97abdea9ef53fcbe..4f53dd5cc163f0a55751d99c6ecefa690bd074e4 100644
--- a/indra/cmake/LLRender.cmake
+++ b/indra/cmake/LLRender.cmake
@@ -2,11 +2,9 @@
 
 include(Variables)
 include(FreeType)
-include(GLH)
 
 set(LLRENDER_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llrender
-    ${GLH_INCLUDE_DIR}
     )
 
 if (BUILD_HEADLESS)
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 75fdbe00569f3237c5ff1b2f9176e1af04a900dc..fe75f98eb0ca585cce64d0fff45e92551c1d91ab 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -57,14 +57,6 @@
 #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 dc3d4ba902259b9ba63a4b2929529cc839c347b2..8a3fc19c1f467f8e2faf2b7994a7ac3d16d0f199 100644
--- a/indra/llprimitive/llmodelloader.cpp
+++ b/indra/llprimitive/llmodelloader.cpp
@@ -30,14 +30,6 @@
 #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 c11aa237cf12b4c8388417b59753397553780924..b7edf69f73418cbaed15741103d0d298017e578a 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -44,14 +44,6 @@
 #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 8926ff34d007b85b97202459fd54b47da7ff1671..076b68cd6b19016a7acad9f00fffb91c3e5aef60 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -45,14 +45,6 @@
 #include "llmatrix4a.h"
 #include "llvector4a.h"
 #include <boost/align/aligned_allocator.hpp>
-#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;