diff --git a/PerlTQt/TQt.xs b/PerlTQt/TQt.xs
index 6a06b7d..6ff9437 100644
--- a/PerlTQt/TQt.xs
+++ b/PerlTQt/TQt.xs
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <tqglobal.h>
 #include <tqstring.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqmetaobject.h>
 #include <private/tqucomextra_p.h>
 #include "smoke.h"
diff --git a/PerlTQt/handlers.cpp b/PerlTQt/handlers.cpp
index bf95de1..774383c 100644
--- a/PerlTQt/handlers.cpp
+++ b/PerlTQt/handlers.cpp
@@ -1,6 +1,6 @@
 #include <tqstring.h>
 #include <tqregexp.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqmetaobject.h>
 #include <tqvaluelist.h>
 #include <tqwidgetlist.h>
diff --git a/acinclude.m4 b/acinclude.m4
index bfad197..559e27b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1019,7 +1019,7 @@ AC_REQUIRE([KDE_USE_TQT])
 cat > conftest.$ac_ext <<EOF
 #include "confdefs.h"
 #include <tqglobal.h>
-#include <ntqapplication.h>
+#include <tqapplication.h>
 EOF
 if test "$kde_qtver" = "2"; then
 cat >> conftest.$ac_ext <<EOF
diff --git a/puic/main.cpp b/puic/main.cpp
index 6c0b25f..513e4a5 100644
--- a/puic/main.cpp
+++ b/puic/main.cpp
@@ -31,7 +31,7 @@
 #include "parser.h"
 #include "widgetdatabase.h"
 #include "domtool.h"
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <tqdatetime.h>
diff --git a/puic/widgetdatabase.cpp b/puic/widgetdatabase.cpp
index 284023f..47947ee 100644
--- a/puic/widgetdatabase.cpp
+++ b/puic/widgetdatabase.cpp
@@ -27,7 +27,7 @@
 #include "widgetdatabase.h"
 #include "widgetinterface.h"
 
-#include <ntqapplication.h>
+#include <tqapplication.h>
 #define NO_STATIC_COLORS
 #include <globaldefs.h>
 #include <tqstrlist.h>
diff --git a/smoke/tqt/header_list b/smoke/tqt/header_list
index 0fa15d7..9ffa403 100644
--- a/smoke/tqt/header_list
+++ b/smoke/tqt/header_list
@@ -1,7 +1,7 @@
 tqaccel.h
 tqaccessible.h
 tqaction.h
-ntqapplication.h
+tqapplication.h
 tqasciicache.h
 tqasciidict.h
 tqassistantclient.h
@@ -25,7 +25,7 @@ tqcolor.h
 tqcombobox.h
 tqcommonstyle.h
 tqcompactstyle.h
-ntqconfig.h
+tqconfig.h
 tqconnection.h
 tqcstring.h
 tqcursor.h
@@ -120,7 +120,7 @@ tqmenudata.h
 tqmessagebox.h
 tqmetaobject.h
 tqmime.h
-ntqmodules.h
+tqmodules.h
 tqmotifplusstyle.h
 tqmotifstyle.h
 tqmovie.h
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index 37eaa90..46763da 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -130,7 +130,7 @@ sub preliminary_test
 	print $msg, " " x ($nspaces - length($msg) + 8);
 	open( OUT, ">${tmp}.cpp" ) or die "Failed to open temp file ${tmp}.cpp: $!\n";
 	my $simple=q£
-		#include <ntqapplication.h>
+		#include <tqapplication.h>
 		int main( int argc, char **argv )
 		{
 			TQApplication foo( argc, argv );
@@ -257,13 +257,13 @@ our %tests = (
  	"TQT_NO_BUTTONGROUP" =>		["tqbuttongroup.h", "TQButtonGroup foo( (TQWidget*)NULL );", 12],
  	"TQT_NO_CANVAS" =>		["tqcanvas.h", "TQCanvas foo( (TQObject*)NULL );", 10],
  	"TQT_NO_CHECKBOX" =>		["tqcheckbox.h", "TQCheckBox( (TQWidget*)NULL );", 10],
-	"TQT_NO_CLIPBOARD" => 		["ntqapplication.h, qclipboard.h", q£
+	"TQT_NO_CLIPBOARD" => 		["tqapplication.h, qclipboard.h", q£
 						TQApplication foo( argc, argv );
 						TQClipboard *baz= foo.clipboard();
 					£, 5],
  	"TQT_NO_COLORDIALOG" =>		["tqcolordialog.h", "TQColorDialog::customCount();", 12],
  	"TQT_NO_COMBOBOX" =>		["tqcombobox.h", "TQComboBox( (TQWidget*)NULL );", 10],
-	"TQT_NO_COMPONENT" =>		["ntqapplication.h", q£
+	"TQT_NO_COMPONENT" =>		["tqapplication.h", q£
  						TQApplication foo( argc, argv );
  						foo.addLibraryPath( TQString::null );
 					£, 5],
@@ -369,7 +369,7 @@ our %tests = (
 	"TQT_NO_MENUDATA" =>		["tqmenudata.h", "TQMenuData foo;", 9],
 	"TQT_NO_MESSAGEBOX" =>		["tqmessagebox.h", "TQMessageBox foo;", 13],
 	"TQT_NO_MIME" =>			["tqmime.h", "TQMimeSourceFactory foo;", 5],
- 	"TQT_NO_MIMECLIPBOARD" => 	["ntqapplication.h, qclipboard.h", q£
+ 	"TQT_NO_MIMECLIPBOARD" => 	["tqapplication.h, qclipboard.h", q£
  						TQApplication foo( argc, argv );
  						TQClipboard *baz= foo.clipboard();
 						baz->data();
@@ -401,7 +401,7 @@ our %tests = (
 						TQRegExp foo;
 						foo.wildcard();
 					£, 8],
-	"TQT_NO_REMOTE" =>		["ntqapplication.h", q£
+	"TQT_NO_REMOTE" =>		["tqapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.remoteControlEnabled();
 					£, 15],
@@ -409,7 +409,7 @@ our %tests = (
 	"TQT_NO_RICHTEXT" =>		["tqsimplerichtext.h, qstring.h, qfont.h", "TQSimpleRichText foo( TQString::null, TQFont() );", 10],
 	"TQT_NO_SCROLLBAR" =>		["tqscrollbar.h", "TQScrollBar foo( (TQWidget *) NULL );", 12],
 	"TQT_NO_SCROLLVIEW" =>		["tqscrollview.h", "TQScrollView foo;", 12],
-	"TQT_NO_SESSIONMANAGER" =>	["ntqapplication.h", q£
+	"TQT_NO_SESSIONMANAGER" =>	["tqapplication.h", q£
   						TQApplication foo( argc, argv );
   						foo.sessionId();
 					£, 15],
@@ -430,7 +430,7 @@ our %tests = (
 
 	"TQT_NO_SQL" =>			["tqsqlcursor.h", "TQSqlCursor foo;", 5],
 	"TQT_NO_STRINGLIST" =>		["tqstringlist.h", "TQStringList foo;", 0],
-	"TQT_NO_STYLE" =>		["ntqapplication.h", q£
+	"TQT_NO_STYLE" =>		["tqapplication.h", q£
    						TQApplication foo( argc, argv );
    						foo.style();
  					£, 15],