diff --git a/kpacman/bitfont.h b/kpacman/bitfont.h
index 5976a51..029383e 100644
--- a/kpacman/bitfont.h
+++ b/kpacman/bitfont.h
@@ -1,10 +1,10 @@
 #ifndef BITFONT_H
 #define BITFONT_H
 
-#include <ntqstring.h>
-#include <ntqbitmap.h>
-#include <ntqpixmap.h>
-#include <ntqrect.h>
+#include <tqstring.h>
+#include <tqbitmap.h>
+#include <tqpixmap.h>
+#include <tqrect.h>
 
 #include "colors.h"
 
@@ -28,4 +28,3 @@ private:
 };
 
 #endif // BITFONT_H
-
diff --git a/kpacman/board.cpp b/kpacman/board.cpp
index b08928e..618838d 100644
--- a/kpacman/board.cpp
+++ b/kpacman/board.cpp
@@ -1,11 +1,12 @@
 #include <kapp.h>
+
 #include <tdelocale.h>
 
-#include <ntqrect.h>
-#include <ntqregexp.h>
-#include <ntqmessagebox.h>
-#include <ntqfile.h>
-#include <ntqtextstream.h>
+#include <tqrect.h>
+#include <tqregexp.h>
+#include <tqmessagebox.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
 
 #include "board.h"
 #include "bitmaps.h"
diff --git a/kpacman/board.h b/kpacman/board.h
index f2758d5..6780f4c 100644
--- a/kpacman/board.h
+++ b/kpacman/board.h
@@ -1,10 +1,9 @@
 #ifndef BOARD_H
 #define BOARD_H
 
-#include <ntqarray.h>
-#include <ntqstring.h>
-
-#include <ntqrect.h>
+#include <tqarray.h>
+#include <tqstring.h>
+#include <tqrect.h>
 
 #define OUT -1
 
diff --git a/kpacman/colors.h b/kpacman/colors.h
index dd32b18..33beae2 100644
--- a/kpacman/colors.h
+++ b/kpacman/colors.h
@@ -1,7 +1,7 @@
 #ifndef COLORS_H
 #define COLORS_H
 
-#include <ntqcolor.h>
+#include <tqcolor.h>
 
 #define BLACK TQColor(TQt::black)
 #define RED TQColor(TQt::red)
diff --git a/kpacman/keys.cpp b/kpacman/keys.cpp
index 780e895..5ec37c8 100644
--- a/kpacman/keys.cpp
+++ b/kpacman/keys.cpp
@@ -1,17 +1,17 @@
 #include <kapp.h>
-#include <tdeconfig.h>
-#include <tdelocale.h>
 #include <kstddirs.h>
 
-#include <keys.h>
-
+#include <tdeconfig.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
-#include <ntqpushbt.h>
-#include <ntqlabel.h>
-#include <ntqframe.h>
-#include <ntqkeycode.h>
-#include <ntqpixmap.h>
-#include <ntqstring.h>
+#include <tqpushbt.h>
+#include <tqlabel.h>
+#include <tqframe.h>
+#include <tqkeycode.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
+
+#include "keys.h"
 
 PKeys::PKeys( TQWidget *parent, const char *name)
     : TQDialog( parent, name, TRUE, 0 )
diff --git a/kpacman/keys.h b/kpacman/keys.h
index d7ba8ae..f1c822a 100644
--- a/kpacman/keys.h
+++ b/kpacman/keys.h
@@ -2,15 +2,14 @@
 #define KEYS_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <kapp.h>
 
-#include <ntqdialog.h>
-#include <ntqlabel.h>
-#include <ntqstring.h>
-
+#include <tqdialog.h>
+#include <tqlabel.h>
+#include <tqstring.h>
 #include <tdeaccel.h>
 
 class PKeys : public TQDialog
diff --git a/kpacman/kpacman.cpp b/kpacman/kpacman.cpp
index 08f23cf..7ae55e2 100644
--- a/kpacman/kpacman.cpp
+++ b/kpacman/kpacman.cpp
@@ -16,10 +16,10 @@
  ***************************************************************************/
 
 // include files for TQt
-#include <ntqkeycode.h>
-#include <ntqcolor.h>
-#include <ntqstring.h>
-#include <ntqmsgbox.h>
+#include <tqkeycode.h>
+#include <tqcolor.h>
+#include <tqstring.h>
+#include <tqmsgbox.h>
 
 // include files for KDE
 #include <kcolordlg.h>
diff --git a/kpacman/kpacman.h b/kpacman/kpacman.h
index c6f9133..f2d4778 100644
--- a/kpacman/kpacman.h
+++ b/kpacman/kpacman.h
@@ -20,13 +20,13 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 // include files for TQt
 
-#include <ntqfileinf.h>
-#include <ntqregexp.h>
+#include <tqfileinf.h>
+#include <tqregexp.h>
 
 //include files for KDE
 #include <kapp.h>
diff --git a/kpacman/kpacmanview.cpp b/kpacman/kpacmanview.cpp
index 1999c41..e2a48da 100644
--- a/kpacman/kpacmanview.cpp
+++ b/kpacman/kpacmanview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // include files for TQt
-#include <ntqmessagebox.h>
+#include <tqmessagebox.h>
 
 // include files for KDE
 #include <kapp.h>
diff --git a/kpacman/kpacmanview.h b/kpacman/kpacmanview.h
index 9108bc9..c94349f 100644
--- a/kpacman/kpacmanview.h
+++ b/kpacman/kpacmanview.h
@@ -19,12 +19,12 @@
 #define KPACMANVIEW_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 //include files for TQt
-#include <ntqwidget.h>
-#include <ntqregexp.h>
+#include <tqwidget.h>
+#include <tqregexp.h>
 
 // application specific includes
 #include "score.h"
diff --git a/kpacman/monster.h b/kpacman/monster.h
index 4f508b0..385c513 100644
--- a/kpacman/monster.h
+++ b/kpacman/monster.h
@@ -2,8 +2,8 @@
 #define MONSTER_H
 
 #include <stdlib.h>
-#include <ntqpixmap.h>
-#include <ntqwidget.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
 
 #include "board.h"
 
diff --git a/kpacman/pacman.h b/kpacman/pacman.h
index b951ee4..6f1a7c1 100644
--- a/kpacman/pacman.h
+++ b/kpacman/pacman.h
@@ -2,8 +2,8 @@
 #define PACMAN_H
 
 #include <stdlib.h>
-#include <ntqpixmap.h>
-#include <ntqwidget.h>
+#include <tqpixmap.h>
+#include <tqwidget.h>
 
 #include "board.h"
 
diff --git a/kpacman/painter.cpp b/kpacman/painter.cpp
index 7df62c2..256afe0 100644
--- a/kpacman/painter.cpp
+++ b/kpacman/painter.cpp
@@ -1,16 +1,15 @@
 #include <kapp.h>
-#include <tdeconfig.h>
 #include <kstddirs.h>
 
-#include <ntqcolor.h>
-#include <ntqpainter.h>
-#include <ntqpixmap.h>
-#include <ntqbitmap.h>
-#include <ntqrect.h>
-#include <ntqstring.h>
-
-#include <ntqmessagebox.h>
-#include <ntqfileinfo.h>
+#include <tdeconfig.h>
+#include <tqcolor.h>
+#include <tqpainter.h>
+#include <tqpixmap.h>
+#include <tqbitmap.h>
+#include <tqrect.h>
+#include <tqstring.h>
+#include <tqmessagebox.h>
+#include <tqfileinfo.h>
 
 #include "painter.h"
 #include "board.h"
diff --git a/kpacman/painter.h b/kpacman/painter.h
index fa84ede..07cadea 100644
--- a/kpacman/painter.h
+++ b/kpacman/painter.h
@@ -2,15 +2,14 @@
 #define PAINTER_H
 
 #include <kapp.h>
-#include <tdelocale.h>
-
-#include <ntqpixmap.h>
-#include <ntqbitmap.h>
-#include <ntqlabel.h>
-#include <ntqcolor.h>
 
-#include <ntqstrlist.h>
-#include <ntqregexp.h>
+#include <tdelocale.h>
+#include <tqpixmap.h>
+#include <tqbitmap.h>
+#include <tqlabel.h>
+#include <tqcolor.h>
+#include <tqstrlist.h>
+#include <tqregexp.h>
 
 #include "board.h"
 #include "bitfont.h"
diff --git a/kpacman/referee.cpp b/kpacman/referee.cpp
index 959745e..dbdeca7 100644
--- a/kpacman/referee.cpp
+++ b/kpacman/referee.cpp
@@ -1,18 +1,18 @@
+#include <stdlib.h>
+
 #include <kapp.h>
-#include <tdeconfig.h>
 #include <kstddirs.h>
 
-#include "referee.h"   
-
-#include <ntqdatetm.h>
-#include <stdlib.h>
-#include <ntqtimer.h>
-#include <ntqevent.h>
-#include <ntqcolor.h>
-#include <ntqkeycode.h>
-#include <ntqfileinfo.h>
+#include <tdeconfig.h>
+#include <tqdatetm.h>
+#include <tqtimer.h>
+#include <tqevent.h>
+#include <tqcolor.h>
+#include <tqkeycode.h>
+#include <tqfileinfo.h>
 #include <tdeaccel.h>
 
+#include "referee.h"
 #include "board.h"
 #include "pacman.h"
 #include "monster.h"
diff --git a/kpacman/referee.h b/kpacman/referee.h
index cbc00a9..cdd20ad 100644
--- a/kpacman/referee.h
+++ b/kpacman/referee.h
@@ -2,15 +2,15 @@
 #define REFEREE_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <kapp.h>
-#include <ntqwidget.h>
 
-#include <ntqstrlist.h>
-#include <ntqarray.h>
-#include <ntqbitarry.h>
+#include <tqwidget.h>
+#include <tqstrlist.h>
+#include <tqarray.h>
+#include <tqbitarray.h>
 
 #include "board.h"
 #include "pacman.h"
diff --git a/kpacman/score.cpp b/kpacman/score.cpp
index ffa4ecc..9706966 100644
--- a/kpacman/score.cpp
+++ b/kpacman/score.cpp
@@ -1,22 +1,21 @@
-#include <score.h>
-
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <tdeaccel.h>
-
 #include <kapp.h>
-#include <tdeconfig.h>
 #include <kstddirs.h>
+
+#include <tdeaccel.h>
+#include <tdeconfig.h>
 #include <tdemessagebox.h>
-#include <ntqpixmap.h>
-#include <ntqstring.h>
-#include <ntqdstream.h>
-#include <ntqkeycode.h>
-#include <ntqtimer.h>
-#include <ntqfileinfo.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
+#include <tqdstream.h>
+#include <tqkeycode.h>
+#include <tqtimer.h>
+#include <tqfileinfo.h>
 
 #include "bitfont.h"
+#include "score.h"
 
 Score::Score(TQWidget *parent, const char *name, int Scheme, int Mode, Bitfont *font) : TQWidget(parent, name)
 {
diff --git a/kpacman/score.h b/kpacman/score.h
index d26af2e..fc0da45 100644
--- a/kpacman/score.h
+++ b/kpacman/score.h
@@ -2,18 +2,18 @@
 #define SCORE_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <kapp.h>
-#include <ntqwidget.h>
-#include <ntqstring.h>
-#include <ntqpoint.h>
-#include <ntqrect.h>
-#include <ntqfile.h>
-
-#include <ntqfileinfo.h>
-#include <ntqdatetime.h>
+
+#include <tqwidget.h>
+#include <tqstring.h>
+#include <tqpoint.h>
+#include <tqrect.h>
+#include <tqfile.h>
+#include <tqfileinfo.h>
+#include <tqdatetime.h>
 
 #include "painter.h"
 #include "bitfont.h"
diff --git a/kpacman/status.cpp b/kpacman/status.cpp
index 1a43f5c..7ec7ebb 100644
--- a/kpacman/status.cpp
+++ b/kpacman/status.cpp
@@ -1,14 +1,13 @@
 #include <kapp.h>
-#include <tdelocale.h>
 #include <kstddirs.h>
 
-#include "status.h"
+#include <tdelocale.h>
+#include <tqbitmap.h>
+#include <tqstring.h>
+#include <tqmsgbox.h>
+#include <tqfileinfo.h>
 
-#include <ntqpixmap.h>
-#include <ntqbitmap.h>
-#include <ntqstring.h>
-#include <ntqmsgbox.h>
-#include <ntqfileinfo.h>
+#include "status.h"
 
 Status::Status( TQWidget *parent, const char *name, int Scheme, int Mode ) :
     TQWidget( parent, name )
diff --git a/kpacman/status.h b/kpacman/status.h
index 94fd09e..3059ddc 100644
--- a/kpacman/status.h
+++ b/kpacman/status.h
@@ -2,19 +2,18 @@
 #define STATUS_H
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #include <kapp.h>
-#include <tdeconfig.h>
-
-#include <ntqwidget.h>
-#include <ntqpixmap.h>
-#include <ntqstring.h>
-#include <ntqarray.h>
 
-#include <ntqstrlist.h>
-#include <ntqregexp.h>
+#include <tdeconfig.h>
+#include <tqwidget.h>
+#include <tqpixmap.h>
+#include <tqstring.h>
+#include <tqarray.h>
+#include <tqstrlist.h>
+#include <tqregexp.h>
 
 class Status : public TQWidget
 {