diff --git a/klib/src/platform/osx/AppKit.def b/klib/src/platform/osx/AppKit.def
index 05a795a98f2..98d40f0ae29 100644
--- a/klib/src/platform/osx/AppKit.def
+++ b/klib/src/platform/osx/AppKit.def
@@ -1,4 +1,4 @@
-depends = ApplicationServices CFNetwork CoreData CoreFoundation CoreGraphics CoreImage CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGL QuartzCore Security libkern osx posix
+depends = ApplicationServices CFNetwork CoreData CoreFoundation CoreGraphics CoreImage CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGLCommon QuartzCore Security libkern osx posix
 language = Objective-C
 package = platform.AppKit
 headers = AppKit/AppKit.h
diff --git a/klib/src/platform/osx/CoreImage.def b/klib/src/platform/osx/CoreImage.def
index 927664e9fd5..15d5499f241 100644
--- a/klib/src/platform/osx/CoreImage.def
+++ b/klib/src/platform/osx/CoreImage.def
@@ -1,4 +1,4 @@
-depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGL Security libkern osx posix
+depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGLCommon Security libkern osx posix
 language = Objective-C
 package = platform.CoreImage
 headers = CoreImage/CoreImage.h
diff --git a/klib/src/platform/osx/CoreVideo.def b/klib/src/platform/osx/CoreVideo.def
index 6881b033a3e..dbc112b6670 100644
--- a/klib/src/platform/osx/CoreVideo.def
+++ b/klib/src/platform/osx/CoreVideo.def
@@ -1,4 +1,4 @@
-depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGL Security libkern osx posix
+depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGLCommon Security libkern osx posix
 language = Objective-C
 package = platform.CoreVideo
 headers = CoreVideo/CoreVideo.h
diff --git a/klib/src/platform/osx/GLUT.def b/klib/src/platform/osx/GLUT.def
new file mode 100644
index 00000000000..cc1e24ea03a
--- /dev/null
+++ b/klib/src/platform/osx/GLUT.def
@@ -0,0 +1,9 @@
+depends = OpenGL OpenGLCommon posix
+language = Objective-C
+package = platform.GLUT
+headers = GLUT/glut.h
+
+headerFilter = GLUT/**
+
+compilerOpts = -framework GLUT
+linkerOpts = -framework GLUT
diff --git a/klib/src/platform/osx/OpenGL.def b/klib/src/platform/osx/OpenGL.def
index f80dd89f95e..b44d55bd793 100644
--- a/klib/src/platform/osx/OpenGL.def
+++ b/klib/src/platform/osx/OpenGL.def
@@ -1,9 +1,9 @@
-depends = osx posix
+depends = OpenGLCommon posix
 language = Objective-C
 package = platform.OpenGL
-headers = OpenGL/OpenGL.h
+headers = OpenGL/glu.h
 
-headerFilter = OpenGL/**
+headerFilter = OpenGL/gl.h OpenGL/glext.h OpenGL/glu.h
 
 compilerOpts = -framework OpenGL
 linkerOpts = -framework OpenGL
diff --git a/klib/src/platform/osx/OpenGL3.def b/klib/src/platform/osx/OpenGL3.def
new file mode 100644
index 00000000000..9d3b0480777
--- /dev/null
+++ b/klib/src/platform/osx/OpenGL3.def
@@ -0,0 +1,9 @@
+depends = OpenGLCommon posix
+language = Objective-C
+package = platform.OpenGL3
+headers = OpenGL/gl3.h OpenGL/gl3ext.h
+
+headerFilter = OpenGL/gl3.h OpenGL/gl3ext.h
+
+compilerOpts = -framework OpenGL
+linkerOpts = -framework OpenGL
diff --git a/klib/src/platform/osx/OpenGLCommon.def b/klib/src/platform/osx/OpenGLCommon.def
new file mode 100644
index 00000000000..1cc0606b023
--- /dev/null
+++ b/klib/src/platform/osx/OpenGLCommon.def
@@ -0,0 +1,9 @@
+depends = osx posix
+language = Objective-C
+package = platform.OpenGLCommon
+headers = OpenGL/OpenGL.h
+
+headerFilter = OpenGL/**
+
+compilerOpts = -framework OpenGL
+linkerOpts = -framework OpenGL
diff --git a/klib/src/platform/osx/QuartzCore.def b/klib/src/platform/osx/QuartzCore.def
index cc89e1412d0..e539f067bf0 100644
--- a/klib/src/platform/osx/QuartzCore.def
+++ b/klib/src/platform/osx/QuartzCore.def
@@ -1,4 +1,4 @@
-depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreImage CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGL Security libkern osx posix
+depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreImage CoreServices CoreText CoreVideo DiskArbitration Foundation IOKit IOSurface ImageIO Metal OpenGLCommon Security libkern osx posix
 language = Objective-C
 package = platform.QuartzCore
 headers = QuartzCore/QuartzCore.h QuartzCore/CIImage.h QuartzCore/CIColor.h