diff --git a/src/common/console/c_bind.cpp b/src/common/console/c_bind.cpp
index 740b5f88cd..90ceaedcef 100644
--- a/src/common/console/c_bind.cpp
+++ b/src/common/console/c_bind.cpp
@@ -49,8 +49,6 @@
 
 #include "d_eventbase.h"
 
-extern int chatmodeon;
-
 const char *KeyNames[NUM_KEYS] =
 {
 	// We use the DirectInput codes and assume a qwerty keyboard layout.
diff --git a/src/common/console/c_console.cpp b/src/common/console/c_console.cpp
index 5904913ec7..928c026f2b 100644
--- a/src/common/console/c_console.cpp
+++ b/src/common/console/c_console.cpp
@@ -71,6 +71,7 @@
 #define BOTTOMARGIN 12
 
 extern bool AppActive;
+int chatmodeon;
 
 CUSTOM_CVAR(Int, con_buffersize, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 {
@@ -95,7 +96,6 @@ static FTextureID conflat;
 static uint32_t conshade;
 static bool conline;
 
-extern int chatmodeon;
 extern FBaseCVar *CVars;
 extern FConsoleCommand *Commands[FConsoleCommand::HASH_SIZE];
 
diff --git a/src/common/console/c_console.h b/src/common/console/c_console.h
index 8fff823b46..bae857f7dd 100644
--- a/src/common/console/c_console.h
+++ b/src/common/console/c_console.h
@@ -85,5 +85,6 @@ extern double NotifyFontScale;
 void C_SetNotifyFontScale(double scale);
 
 extern const char *console_bar;
+extern int chatmodeon;
 
 #endif
diff --git a/src/common/menu/menu.cpp b/src/common/menu/menu.cpp
index 89017d67b3..53af25406e 100644
--- a/src/common/menu/menu.cpp
+++ b/src/common/menu/menu.cpp
@@ -59,7 +59,6 @@ void M_StartControlPanel(bool makeSound, bool scaleoverride = false);
 
 int DMenu::InMenu;
 static ScaleOverrider *CurrentScaleOverrider;
-extern int chatmodeon;
 //
 // Todo: Move these elsewhere
 //
diff --git a/src/common/platform/posix/cocoa/i_input.mm b/src/common/platform/posix/cocoa/i_input.mm
index 79f9d037c1..46b380431e 100644
--- a/src/common/platform/posix/cocoa/i_input.mm
+++ b/src/common/platform/posix/cocoa/i_input.mm
@@ -55,7 +55,7 @@ CVAR(Bool, use_mouse,    true,  CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
 CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
-extern int paused, chatmodeon;
+extern int paused;
 extern bool ToggleFullscreen;
 bool GUICapture;
 
diff --git a/src/common/platform/posix/sdl/i_input.cpp b/src/common/platform/posix/sdl/i_input.cpp
index 933423e624..02cf31e45f 100644
--- a/src/common/platform/posix/sdl/i_input.cpp
+++ b/src/common/platform/posix/sdl/i_input.cpp
@@ -56,7 +56,7 @@ static bool NativeMouse = true;
 CVAR (Bool,  use_mouse,				true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
 
-extern int WaitingForKey, chatmodeon;
+extern int WaitingForKey;
 
 static const SDL_Keycode DIKToKeySym[256] =
 {
diff --git a/src/common/platform/win32/i_input.cpp b/src/common/platform/win32/i_input.cpp
index f8b2c429b3..5196133e5d 100644
--- a/src/common/platform/win32/i_input.cpp
+++ b/src/common/platform/win32/i_input.cpp
@@ -125,8 +125,6 @@ static bool EventHandlerResultForNativeMouse;
 
 CVAR (Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
 
-extern int chatmodeon;
-
 static void I_CheckGUICapture ()
 {
 	bool wantCapt = sysCallbacks.WantGuiCapture && sysCallbacks.WantGuiCapture();
diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp
index ddb8a34427..3e68d8adac 100644
--- a/src/ct_chat.cpp
+++ b/src/ct_chat.cpp
@@ -65,8 +65,6 @@ void CT_Drawer ();
 bool CT_Responder (event_t *ev);
 void CT_PasteChat(const char *clip);
 
-int chatmodeon;
-
 // Private data
 
 static void CT_ClearChatMessage ();
diff --git a/src/hu_stuff.h b/src/hu_stuff.h
index cdaed2e9b1..5c6fe4b026 100644
--- a/src/hu_stuff.h
+++ b/src/hu_stuff.h
@@ -40,8 +40,6 @@ void CT_Init (void);
 bool CT_Responder (event_t* ev);
 void CT_Drawer (void);
 
-extern int chatmodeon;
-
 // [RH] Draw deathmatch scores
 
 void HU_DrawScores (player_t *me);