diff --git a/build/unix/module.modulemap b/build/unix/module.modulemap
index be329224fb794e2062bdf905c1e0d5cb0d750603..3867ab7a4f03e5ec65969fd28b2a16fb7f228d20 100644
--- a/build/unix/module.modulemap
+++ b/build/unix/module.modulemap
@@ -60,10 +60,14 @@ module ROOT_Core_Config_C {
 // this module as part of the ROOT. The only way is either by outlining it here
 // or relying on fragile module ordering (eg. order before things such as Cocoa.h
 // including gltypes.h.
-module ROOT_Glew {
-  umbrella "GL"
-  module * { export * }
-  link "lib/libGLEW.so"
-}
+// FIXME: We can switch back to using umbrella folder and submodules once
+// https://llvm.org/bugs/show_bug.cgi?id=30508 gets resolved.
+// module ROOT_Glew {
+  // Depending on the platform we get some of these three installed.
+  module "glew.h" { header "GL/glew.h" export * }
+  module "wglew.h" { header "GL/wglew.h" export * }
+  module "glxew.h" { header "GL/glxew.h" export * }
+//  link "lib/libGLEW.so"
+//}
 
 // From this point on the contents of this file are automatically generated.