diff --git a/.gitignore b/.gitignore
index b9396551e..0c144dd6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@ include/xkb-config.h
 include/xorg-config.h
 include/xorg-server.h
 include/xwin-config.h
+hw/dmx/config/parser.c
+hw/dmx/config/parser.h
+hw/dmx/config/scanner.c
diff --git a/Xprint/AttrValid.h b/Xprint/AttrValid.h
index f2e53f6c5..fab3a7f5e 100644
--- a/Xprint/AttrValid.h
+++ b/Xprint/AttrValid.h
@@ -196,6 +196,9 @@ void XpPutTrayMediumListAttr(XpContextPtr pContext,
 			     XPAttributes pool,
 			     XpOid oid,
 			     const XpOidTrayMediumList* tm);
+void XpValidatePrinterMediaAttrs(XpContextPtr pContext,
+				 const XpOidList* valid_trays,
+				 const XpOidList* valid_sizes);
 /*
  * Attribute pool validation
  */
@@ -204,6 +207,7 @@ void XpValidateAttributePool(XpContextPtr pContext,
 			     const XpValidatePoolsRec* vpr);
 void XpValidatePrinterPool(XpContextPtr pContext,
 			   const XpValidatePoolsRec* vpr);
+void XpValidateNotificationProfile(XpContextPtr pContext);
 void XpValidateJobPool(XpContextPtr pContext,
 		       const XpValidatePoolsRec* vpr);
 void XpValidateDocumentPool(XpContextPtr pContext,
diff --git a/Xprint/Init.c b/Xprint/Init.c
index 0bc1cf39e..0f1be6791 100644
--- a/Xprint/Init.c
+++ b/Xprint/Init.c
@@ -288,10 +288,6 @@ static const char configFilePath[] =
 
 static const char printServerConfigDir[] = "XPSERVERCONFIGDIR";
 
-static int printScreenPrivIndex,
-	   printWindowPrivIndex,
-	   printGCPrivIndex;
-static unsigned long printGeneration = 0;
 static char *configFileName = (char *)NULL;
 static Bool freeDefaultFontPath = FALSE;
 static char *origFontPath = (char *)NULL;
@@ -304,8 +300,6 @@ static Bool xprintInitGlobalsCalled = FALSE;
  */
 void PrinterInitGlobals(void)
 {
-    extern char dispatchExceptionAtReset; /* defined in Xserver/dix/dispatch.c */
-
     xprintInitGlobalsCalled = TRUE;
 
 #ifdef DAMAGE
@@ -314,10 +308,7 @@ void PrinterInitGlobals(void)
      * https://bugs.freedesktop.org/show_bug.cgi?id=1660) ...
      * (you can enable the DAMAGE extension explicitly via
      * % X +extension DAMAGE ... #) ;-( */
-    {
-      extern Bool noDamageExtension;
-      noDamageExtension = TRUE;
-    }
+    noDamageExtension = TRUE;
 #endif /* DAMAGE */
 
 #ifdef SMART_SCHEDULE
@@ -382,7 +373,6 @@ PrinterOptions(
     char **argv,
     int i)
 {
-    extern void ddxUseMsg();
     if(strcmp(argv[i], "-XpFile") == 0)
     {
 	if ((i + 1) >= argc) {
@@ -697,7 +687,7 @@ StoreDriverNames(void)
  * from the printerDb is store in the attribute store for the printer.
  */
 static void
-StoreDescriptors()
+StoreDescriptors(void)
 {
     PrinterDbPtr pEntry;
 
@@ -806,7 +796,6 @@ GetConfigFileName(void)
 static PrinterDbPtr
 BuildPrinterDb(void)
 {
-    char *printerList, *augmentCmd = (char *)NULL;
     Bool defaultAugment = TRUE, freeConfigFileName;
 
     if(configFileName && access(configFileName, R_OK) != 0)
@@ -1156,8 +1145,8 @@ AddToFontPath(
 static void
 AugmentFontPath(void)
 {
-    char *newPath, *modelID, **allIDs = (char **)NULL;
-    PrinterDbPtr pDb, pDbEntry;
+    char *modelID, **allIDs = (char **)NULL;
+    PrinterDbPtr pDbEntry;
     int numModels, i;
 
     if(!origFontPath)
@@ -1612,7 +1601,7 @@ InitPrintDrivers(
 	    }
 	    if(callInit == TRUE)
 	    {
-	        Bool (*initFunc)();
+	        Bool (*initFunc)(BFuncArgs);
 	        initFunc = GetInitFunc(pDb->driverName);
 	        if(initFunc(index, pScreen, argc, argv) == FALSE)
 	        {
@@ -1649,10 +1638,9 @@ GenericScreenInit(
      int argc,
      char **argv)
 {
-    int i;
     float fWidth, fHeight, maxWidth, maxHeight;
     unsigned short width, height;
-    PrinterDbPtr pDb, pDb2;
+    PrinterDbPtr pDb;
     int res, maxRes;
     
     /*
@@ -1705,6 +1693,7 @@ GenericScreenInit(
 					   (unsigned short)(maxHeight + 0.5);
 }
 
+#if 0   /* No one uses this anymore... */
 /*
  * QualifyName - takes an unqualified file name such as X6printers and
  * a colon-separated list of directory path names such as 
@@ -1715,9 +1704,7 @@ GenericScreenInit(
  * freeing the associated memory.
  */
 static char *
-QualifyName(fileName, searchPath)
-    char *fileName;
-    char *searchPath;
+QualifyName(char *fileName, char *searchPath)
 {
     char * curPath = searchPath;
     char * nextPath;
@@ -1755,6 +1742,7 @@ QualifyName(fileName, searchPath)
     }
     return NULL;
 }
+#endif
 
 /*
  * FillPrinterListEntry fills in a single XpDiListEntry element with data
@@ -1799,7 +1787,7 @@ GetPrinterListInfo(
     int localeLen,
     char *locale)
 {
-    PrinterDbPtr pDb, pDb2;
+    PrinterDbPtr pDb;
 
     for(pDb = printerDb; pDb != (PrinterDbPtr)NULL; pDb = pDb->next)
     {
@@ -1848,7 +1836,7 @@ XpDiGetPrinterList(
     if(!nameLen || name == (char *)NULL)
     {
 	int i;
-        PrinterDbPtr pDb, pDb2;
+        PrinterDbPtr pDb;
 
         for(pDb = printerDb, i = 0; pDb != (PrinterDbPtr)NULL; 
 	    pDb = pDb->next, i++)
@@ -1898,7 +1886,6 @@ WindowPtr
 XpDiValidatePrinter(char *printerName, int printerNameLen)
 {
     PrinterDbPtr pCurEntry;
-    WindowPtr pWin;
 
     for(pCurEntry = printerDb;
 	pCurEntry != (PrinterDbPtr)NULL; pCurEntry = pCurEntry->next)
diff --git a/Xprint/Oid.c b/Xprint/Oid.c
index 7cb1230c7..e4dadd519 100644
--- a/Xprint/Oid.c
+++ b/Xprint/Oid.c
@@ -1655,8 +1655,6 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
 		       const XpOidMediumSS* msss)
 {
     int i_mss, i_ds, i_itm;
-    XpOidMediumDiscreteSizeList* ds_list;
-    int tray_count;
     XpOid current_tray, current_medium;
     XpOidMediumDiscreteSizeList* unspecified_tray_ds;
     XpOidMediumDiscreteSizeList* tray_ds;
diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 60f6803a3..8e4c811cb 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -158,7 +158,7 @@ static char NULL_STRING[] = "\0";
  * where the print server configuration directory is localed.
  */
 static
-char *XpGetConfigDirBase()
+char *XpGetConfigDirBase(void)
 {
     char *configDir;
 
@@ -342,7 +342,7 @@ BuildPrinterAttrs(
 
     if(systemAttributes.printers != (XrmDatabase)NULL)
     {
-        char *dirName, *fileName;
+        char *fileName;
         XrmDatabase modelDB = (XrmDatabase)NULL;
         XrmName xrm_name[5], xrm_class[2];
         XrmRepresentation rep_type;
@@ -642,7 +642,6 @@ XpGetOneAttribute(
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db = (XrmDatabase)NULL;
-    char *retVal;
     XrmName xrm_name[3];
     XrmRepresentation rep_type;
     XrmValue value;
@@ -895,7 +894,6 @@ XpGetAttributes(
 {
     ContextAttrPtr pCtxtAttrs;
     XrmDatabase db = (XrmDatabase)NULL;
-    char *retVal;
     StringDbStruct enumStruct;
     XrmQuark empty = NULLQUARK;
 
@@ -1536,8 +1534,8 @@ VectorizeCommand(
     char ***pVector,
     XpContextPtr pContext)
 {
-    char *cmdName, *curTok;
-    int i, numChars;
+    char *cmdName;
+    int numChars;
 
     if(command == (char *)NULL)
 	return (char *)NULL;
@@ -1563,7 +1561,7 @@ XpSubmitJob(fileName, pContext)
      char *fileName;
      XpContextPtr pContext;
 {
-    char **vector, *cmdNam, *cmdOpt, *command, *userName;
+    char **vector, *cmdNam, *command, *userName;
     int i;
 
     command = XpGetOneAttribute(pContext, XPPrinterAttr, "xp-spooler-command");
@@ -1689,7 +1687,6 @@ XpGetTrayMediumFromContext(XpContextPtr pCon,
 {
     char *defMedium, *defTray;
     char *t, *m;
-    char *pS, *pE, *pLast;
     
     defMedium = XpGetOneAttribute( pCon, XPPageAttr, 
 				  "default-medium" );
diff --git a/Xprint/ddxInit.c b/Xprint/ddxInit.c
index 67035e528..29e7c9814 100644
--- a/Xprint/ddxInit.c
+++ b/Xprint/ddxInit.c
@@ -76,8 +76,6 @@ InitOutput(
     char         **argv)
 
 {
-    int i;
-
     pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
     pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
     pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
@@ -179,7 +177,7 @@ InitInput(
      int       argc,
      char **argv)
 {
-    DevicePtr ptr, kbd;
+    DeviceIntPtr ptr, kbd;
 
     ptr = AddInputDevice((DeviceProc)PointerProc, TRUE);
     kbd = AddInputDevice((DeviceProc)KeyboardProc, TRUE);
@@ -239,11 +237,13 @@ OsVendorFatalError(void)
 }
 #endif
 
+#ifdef DDXBEFORERESET
 void
 ddxBeforeReset(void)
 {
     return;
 }
+#endif
 
 #ifdef DDXTIME
 CARD32
diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c
index 24f796954..efcaca457 100644
--- a/hw/dmx/dmxextension.c
+++ b/hw/dmx/dmxextension.c
@@ -374,9 +374,6 @@ void dmxUpdateScreenResources(ScreenPtr pScreen, int x, int y, int w, int h)
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"
 
-/* Defined in dix/events.c */
-extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
-
 /** Change the "screen" window attributes by resizing the actual window
  *  on the back-end display (if necessary). */
 static void dmxConfigureScreenWindow(int idx,
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 2cb47545b..36dde3031 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -67,6 +67,7 @@
 #include "xf86_OSlib.h"
 
 #include "globals.h"
+#include "extension.h"
 
 #ifdef XINPUT
 #include "xf86Xinput.h"
@@ -2524,9 +2525,6 @@ configDRI(XF86ConfDRIPtr drip)
 }
 #endif
 
-/* Extension enable/disable in miinitext.c */
-extern Bool EnableDisableExtension(char *name, Bool enable);
-
 static Bool
 configExtensions(XF86ConfExtensionsPtr conf_ext)
 {
diff --git a/include/dix.h b/include/dix.h
index 9fc5b07b3..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;
@@ -694,6 +695,9 @@ extern int TryClientEvents(
 
 extern void WindowsRestructured(void);
 
+#ifdef PANORAMIX
+extern void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff);
+#endif
 
 #ifdef RANDR
 void
diff --git a/include/extension.h b/include/extension.h
index 34750173b..613076dea 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -56,6 +56,10 @@ extern unsigned short StandardMinorOpcode(ClientPtr /*client*/);
 
 extern unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/);
 
+extern Bool EnableDisableExtension(char *name, Bool enable);
+
+extern void EnableDisableExtensionError(char *name, Bool enable);
+
 extern void InitExtensions(int argc, char **argv);
 
 extern void InitVisualWrap(void);
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 7626c8494..170efed93 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -85,6 +85,7 @@ SOFTWARE.
 #include "misc.h"
 #include "extension.h"
 #include "micmap.h"
+#include "globals.h"
 
 #if defined(QNX4) /* sleaze for Watcom on QNX4 ... */
 #undef GLXEXT
@@ -125,9 +126,6 @@ extern Bool noBigReqExtension;
 #ifdef COMPOSITE
 extern Bool noCompositeExtension;
 #endif
-#ifdef DAMAGE
-extern Bool noDamageExtension;
-#endif
 #ifdef DBE
 extern Bool noDbeExtension;
 #endif
diff --git a/os/utils.c b/os/utils.c
index bfbc367c5..43c6365a4 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -72,6 +72,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include "input.h"
 #include "dixfont.h"
 #include "osdep.h"
+#include "extension.h"
 #ifdef X_POSIX_C_SOURCE
 #define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <signal.h>
@@ -287,12 +288,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);
-
 OsSigHandlerPtr
 OsSignal(sig, handler)
     int sig;