diff --git a/tools/dbusxml2qt3/classgen.cpp b/tools/dbusxml2qt3/classgen.cpp
index af2de88..577053a 100644
--- a/tools/dbusxml2qt3/classgen.cpp
+++ b/tools/dbusxml2qt3/classgen.cpp
@@ -24,7 +24,7 @@
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // local includes
 #include "classgen.h"
@@ -945,13 +945,13 @@ bool ClassGenerator::finishStreams(const TQString& baseName,
     writeFileFooter(headerStream);
     writeFileFooter(sourceStream);
 
-    TQIODevice* tqdevice = headerStream.tqdevice();
+    TQIODevice* device = headerStream.device();
     headerStream.unsetDevice();
-    delete tqdevice;
+    delete device;
 
-    tqdevice = sourceStream.tqdevice();
+    device = sourceStream.device();
     sourceStream.unsetDevice();
-    delete tqdevice;
+    delete device;
 
     return true;
 }
diff --git a/tools/dbusxml2qt3/main.cpp b/tools/dbusxml2qt3/main.cpp
index cdc0a98..b58f5cf 100644
--- a/tools/dbusxml2qt3/main.cpp
+++ b/tools/dbusxml2qt3/main.cpp
@@ -28,7 +28,7 @@
 #include <tqdom.h>
 #include <tqfile.h>
 #include <tqmap.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // local includes
 #include "classgen.h"
diff --git a/tools/dbusxml2qt3/methodgen.cpp b/tools/dbusxml2qt3/methodgen.cpp
index ec569ab..475d5e4 100644
--- a/tools/dbusxml2qt3/methodgen.cpp
+++ b/tools/dbusxml2qt3/methodgen.cpp
@@ -22,7 +22,7 @@
 
 // TQt includes
 #include <tqdom.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 // local includes
 #include "methodgen.h"
diff --git a/tqdbusconnection.cpp b/tqdbusconnection.cpp
index 4727549..a755610 100644
--- a/tqdbusconnection.cpp
+++ b/tqdbusconnection.cpp
@@ -63,7 +63,7 @@ TQT_DBusConnectionManager* manager() {
 
 TQT_DBusConnectionPrivate *TQT_DBusConnectionManager::connection(const TQString &name) const
 {
-    if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name))
+    if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name))
         return default_connection;
 
     ConnectionHash::const_iterator it = connectionHash.find(name);
@@ -74,7 +74,7 @@ TQT_DBusConnectionPrivate *TQT_DBusConnectionManager::connection(const TQString
 void TQT_DBusConnectionManager::removeConnection(const TQString &name)
 {
     TQT_DBusConnectionPrivate *d = 0;
-    if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name)) {
+    if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name)) {
         d = default_connection;
         default_connection = 0;
     } else {
@@ -132,7 +132,7 @@ void qDBusBindToApplication()
 
 void TQT_DBusConnectionManager::setConnection(const TQString &name, TQT_DBusConnectionPrivate *c)
 {
-    if (name == TQString::tqfromLatin1(TQT_DBusConnection::default_connection_name))
+    if (name == TQString::fromLatin1(TQT_DBusConnection::default_connection_name))
         default_connection = c;
     else
         connectionHash[name] = c;