1 files changed, 5 insertions, 4 deletions
diff --git a/src/XpContext.c b/src/XpContext.c
index b50ba8b..9415b4b 100644
--- a/src/XpContext.c
+++ b/src/XpContext.c
@@ -34,12 +34,13 @@
  **
  ******************************************************************************
  *****************************************************************************/
+/* $XFree86: xc/lib/Xp/XpContext.c,v 1.7 2002/10/16 00:37:31 dawes Exp $ */
 
 #define NEED_REPLIES
 
-#include "Printstr.h"
-#include "Xlibint.h"
-#include "extutil.h"
+#include <X11/extensions/Printstr.h>
+#include <X11/Xlibint.h>
+#include "XpExtUtil.h"
 
 #define _XpPadOut(len) (((len) + 3) & ~3)
 
@@ -200,7 +201,7 @@ XpGetScreenOfContext (
     XExtDisplayInfo *info = (XExtDisplayInfo *) xp_find_display (dpy);
 
     int    i;
-    Screen *checkScr;
+    Screen *checkScr = NULL;
     int    ok;