diff --git a/dviwin.cpp b/dviwin.cpp
index e240b2a5b..33162849a 100644
--- a/dviwin.cpp
+++ b/dviwin.cpp
@@ -74,7 +74,7 @@ extern unsigned int	page_w, page_h;
 Window                  mainwin;
 
 void 	draw_page(void);
-extern "C" void 	kpse_set_progname(char*);
+extern "C" void 	kpse_set_progname(const char*);
 
 void 	reset_fonts();
 extern "C" {
diff --git a/dviwin.h b/dviwin.h
index de067e180..820907170 100644
--- a/dviwin.h
+++ b/dviwin.h
@@ -210,4 +210,6 @@ struct drawinf {
   int                   dir;
 };
 
+#undef Unsorted
+
 #endif
diff --git a/dviwin_draw.cpp b/dviwin_draw.cpp
index bdbce6215..085ed4741 100644
--- a/dviwin_draw.cpp
+++ b/dviwin_draw.cpp
@@ -68,7 +68,7 @@
 #include <qfileinfo.h>
 
 extern char *xmalloc (unsigned, const char *);
-extern FILE *xfopen(char *filename, char *type);
+extern FILE *xfopen(const char *filename, char *type);
 
 struct frame	frame0;	/* dummy head of list */
 
diff --git a/kdvi_multipage.cpp b/kdvi_multipage.cpp
index 7228d675b..575c0502b 100644
--- a/kdvi_multipage.cpp
+++ b/kdvi_multipage.cpp
@@ -22,8 +22,6 @@
 #include "optiondialog.h"
 #include "kdvi_multipage.moc"
 
-#define DEBUG
-
 extern "C"
 {
   void *init_libkdvi()
diff --git a/psgs.cpp b/psgs.cpp
index bdb99dba1..f8eefb7c5 100644
--- a/psgs.cpp
+++ b/psgs.cpp
@@ -8,8 +8,8 @@
 
 extern const char psheader[];
 
-pageInfo::pageInfo(QString PS) {
-  PostScriptString = new QString(PS);
+pageInfo::pageInfo(QString _PostScriptString) {
+  PostScriptString = new QString(_PostScriptString);
   Gfx              = NULL;
 }
 
diff --git a/psgs.h b/psgs.h
index be752360e..8a44f62f5 100644
--- a/psgs.h
+++ b/psgs.h
@@ -1,3 +1,6 @@
+#ifndef _PSGS_H_
+#define _PSGS_H_
+
 #include <qstring.h>
 #include <qintdict.h>
 #include <qintcache.h>
@@ -8,7 +11,7 @@
 class pageInfo
 {
 public:
-  pageInfo(QString PS);
+  pageInfo(QString _PostScriptString);
 
   QString   *PostScriptString;
   KTempFile *Gfx;
@@ -61,3 +64,5 @@ private:
   int                   pixel_page_w; // in pixels
   int                   pixel_page_h; // in pixels
 };
+
+#endif
diff --git a/xdvi.h b/xdvi.h
index 9ead92e15..852e2f870 100644
--- a/xdvi.h
+++ b/xdvi.h
@@ -24,14 +24,13 @@ extern "C" {
 #include <X11/Xlib.h>	/* include Xfuncs.h, if available */
 #include <X11/Xutil.h>	/* needed for XDestroyImage */
 #include <X11/Xos.h>
+#include <X11/Intrinsic.h>
 #undef wchar_t
 
-
-#define	XtNumber(arr)	(sizeof(arr)/sizeof(arr[0]))
 typedef	unsigned long	Pixel;
 typedef	char		Boolean;
-typedef	unsigned int	Dimension;
 #undef	BUTTONS
+#undef	Unsorted
 
 #define	True	1
 #define	False	0