diff --git a/Xprint/Init.c b/Xprint/Init.c
index 9fba6c558..50fa4716c 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -300,8 +300,6 @@ static Bool xprintInitGlobalsCalled = FALSE;
  */
 void PrinterInitGlobals(void)
 {
-    extern char dispatchExceptionAtReset; /* defined in Xserver/dix/dispatch.c */
-
     xprintInitGlobalsCalled = TRUE;
 
 #ifdef DAMAGE
diff --git a/include/dix.h b/include/dix.h
index 7a4f49d4a..01777213d 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -294,6 +294,7 @@ extern ClientPtr requestingClient;
 extern ClientPtr *clients;
 extern ClientPtr serverClient;
 extern int currentMaxClients;
+extern char dispatchExceptionAtReset;
 
 typedef int HWEventQueueType;
 typedef HWEventQueueType* HWEventQueuePtr;
diff --git a/os/utils.c b/os/utils.c
index bfbc367c5..8655c3e49 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -287,8 +287,6 @@ int userdefinedfontpath = 0;
 
 char *dev_tty_from_init = NULL;		/* since we need to parse it anyway */
 
-extern char dispatchExceptionAtReset;
-
 /* Extension enable/disable in miinitext.c */
 extern Bool EnableDisableExtension(char *name, Bool enable);
 extern void EnableDisableExtensionError(char *name, Bool enable);