diff --git a/Makefile.am b/Makefile.am
index 4f19dce4e..058c4518f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ kdvi_METASOURCES = USE_AUTOMOC
 BUILT_SOURCES = psheader.c
 
 # Which sources should be compiled for kdvi.
-kdvi_SOURCES	= dviwin.cpp kdvi.cpp marklist.cpp prefs.cpp print.cpp\
+kdvi_SOURCES	= kdvi.cpp dviwin.cpp marklist.cpp prefs.cpp print.cpp\
 	printData.cpp printSetup.cpp printSetupData.cpp pushbutton.cpp\
 	scrbox.cpp \
 	psheader.c dvi_draw.c dvi_init.c font-open.c gf.c new.c pk.c psgs.c\
diff --git a/dviwin.h b/dviwin.h
index 7b4aaba6f..5fb20051e 100644
--- a/dviwin.h
+++ b/dviwin.h
@@ -4,6 +4,9 @@
 // Widget for displaying TeX DVI files.
 //
 
+#ifndef _dviwin_h_
+#define _dviwin_h_
+
 #include "../config.h"
 #include <qwidget.h>
 #include <qpainter.h> 
@@ -110,3 +113,5 @@ private:
 	int		checkinterval;
 	QDateTime	changetime;
 };
+
+#endif
diff --git a/kdvi.h b/kdvi.h
index 03a9de3b7..74a36c5d6 100644
--- a/kdvi.h
+++ b/kdvi.h
@@ -6,6 +6,9 @@
 
 //#define KDVI_VERSION "0.4.1"
 
+#ifndef _kdvi_h_
+#define _kdvi_h_
+
 #include <qframe.h>
 #include <qlabel.h>
 #include <qcombobox.h>
@@ -162,3 +165,5 @@ private:
 	QLineEdit ed;
 	QPushButton ok, cancel;
 };
+
+#endif
diff --git a/print.cpp b/print.cpp
index b01975dc0..211822274 100644
--- a/print.cpp
+++ b/print.cpp
@@ -337,3 +337,5 @@ void print::readConfig()
 	
 	config->setGroup( "kdvi" );
 }
+
+#undef Inherited
diff --git a/printData.cpp b/printData.cpp
index a92ee6efd..0996fdb21 100644
--- a/printData.cpp
+++ b/printData.cpp
@@ -190,3 +190,5 @@ void printData::setupPressed()
 void printData::cancelPressed()
 {
 }
+
+#undef Inherited
diff --git a/printSetup.cpp b/printSetup.cpp
index 1aa5716bd..8bd67a891 100644
--- a/printSetup.cpp
+++ b/printSetup.cpp
@@ -92,3 +92,5 @@ void printSetup::readConfig()
 	
 	config->setGroup( "kdvi" );
 }
+
+#undef Inherited