diff --git a/Xprint/attributes.c b/Xprint/attributes.c
index 4e6d63f60..2a37e6b57 100644
--- a/Xprint/attributes.c
+++ b/Xprint/attributes.c
@@ -54,6 +54,7 @@ copyright holders.
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <pwd.h>
+#include <grp.h>
 #if (defined(sun) && defined(SVR4)) || (defined(SCO))
 #include <wchar.h>
 #endif
@@ -154,7 +155,7 @@ static char NULL_STRING[] = "\0";
 static
 char *XpGetConfigDirBase()
 {
-    char **configDir;
+    char *configDir;
 
     /*
      * If the XPCONFIGDIR environment variable is not set, then use the
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 8d74fc808..d73e9ddbe 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -299,6 +299,7 @@ Bool xf86GetAllowMouseOpenFail(void);
 Bool xf86IsPc98(void);
 void xf86DisableRandR(void);
 CARD32 xf86GetVersion(void);
+CARD32 xorgGetVersion(void);
 CARD32 xf86GetModuleVersion(pointer module);
 pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name);
 pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name);