diff --git a/panda/src/chat/chat_headers.h b/panda/src/chat/chat_headers.h
index 6c075796ab..2c8cfd1b69 100644
--- a/panda/src/chat/chat_headers.h
+++ b/panda/src/chat/chat_headers.h
@@ -16,7 +16,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include <pandabase.h>
+#include "chatInput.h"
 
 #pragma hdrstop
 
diff --git a/panda/src/chat/config_chat.cxx b/panda/src/chat/config_chat.cxx
index fd5e411218..6f41020cf3 100644
--- a/panda/src/chat/config_chat.cxx
+++ b/panda/src/chat/config_chat.cxx
@@ -16,13 +16,13 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#ifdef WIN32_VC
+#if defined(WIN32_VC) && !defined(NO_PCH)
 #include "chat_headers.h"
 #endif
 
 #pragma hdrstop
 
-#ifndef WIN32_VC
+#if !defined(WIN32_VC) || defined(NO_PCH)
 #include "chatInput.h"
 #endif