diff --git a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
index e314fbe4a0..c34215233f 100644
--- a/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
+++ b/panda/src/cocoadisplay/cocoaGraphicsWindow.mm
@@ -38,6 +38,7 @@
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSImage.h>
 #import <AppKit/NSScreen.h>
+#import <AppKit/NSText.h>
 #import <OpenGL/OpenGL.h>
 //#import <Carbon/Carbon.h>
 
diff --git a/panda/src/cocoadisplay/cocoaPandaView.h b/panda/src/cocoadisplay/cocoaPandaView.h
index f892c6a685..05ac92bc81 100644
--- a/panda/src/cocoadisplay/cocoaPandaView.h
+++ b/panda/src/cocoadisplay/cocoaPandaView.h
@@ -12,7 +12,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "graphicsWindow.h"
+
 #import <AppKit/NSView.h>
+#import <AppKit/NSOpenGL.h>
 
 class CocoaGraphicsWindow;
 
diff --git a/panda/src/cocoadisplay/cocoaPandaView.mm b/panda/src/cocoadisplay/cocoaPandaView.mm
index 05c73213e5..bb7d03c832 100644
--- a/panda/src/cocoadisplay/cocoaPandaView.mm
+++ b/panda/src/cocoadisplay/cocoaPandaView.mm
@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "config_cocoadisplay.h"
 #import "cocoaPandaView.h"
 #import "cocoaGraphicsWindow.h"
 
diff --git a/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h b/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h
index 78c8c2eabe..fd7333bed0 100644
--- a/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h
+++ b/panda/src/cocoadisplay/cocoaPandaWindowDelegate.h
@@ -14,6 +14,8 @@
 
 #import <AppKit/NSWindow.h>
 
+#import "cocoaGraphicsWindow.h"
+
 class CocoaGraphicsWindow;
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060