diff --git a/dcopjava/dcopidl2java/main.cpp b/dcopjava/dcopidl2java/main.cpp
index 913b7e7a..b13a92dc 100644
--- a/dcopjava/dcopidl2java/main.cpp
+++ b/dcopjava/dcopidl2java/main.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 #include <string.h>
diff --git a/dcopjava/dcopidl2java/skel.cpp b/dcopjava/dcopidl2java/skel.cpp
index 4b4a3fd0..2c6293d6 100644
--- a/dcopjava/dcopidl2java/skel.cpp
+++ b/dcopjava/dcopidl2java/skel.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
diff --git a/dcopjava/dcopidl2java/stubimpl.cpp b/dcopjava/dcopidl2java/stubimpl.cpp
index 55e474c9..9edb0273 100644
--- a/dcopjava/dcopidl2java/stubimpl.cpp
+++ b/dcopjava/dcopidl2java/stubimpl.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 #include <tqdom.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqregexp.h>
 
diff --git a/dcoppython/shell/pcop.cpp b/dcoppython/shell/pcop.cpp
index 88e26cc1..0e81bb26 100644
--- a/dcoppython/shell/pcop.cpp
+++ b/dcoppython/shell/pcop.cpp
@@ -17,7 +17,7 @@
 #include <tqcstring.h>
 #include <tqdatastream.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 
 #include <dcopclient.h>
diff --git a/kdejava/koala/kdejava/KApplication.cpp b/kdejava/koala/kdejava/KApplication.cpp
index ff735cf2..27834a44 100644
--- a/kdejava/koala/kdejava/KApplication.cpp
+++ b/kdejava/koala/kdejava/KApplication.cpp
@@ -5,7 +5,7 @@
 #include <tqsessionmanager.h>
 #include <kinstance.h>
 #include <kurl.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqnamespace.h>
 #include <tqcstring.h>
 #include <tqpixmap.h>
diff --git a/kdejava/koala/kdejava/KDE.cpp b/kdejava/koala/kdejava/KDE.cpp
index 08c15047..3486e6d5 100644
--- a/kdejava/koala/kdejava/KDE.cpp
+++ b/kdejava/koala/kdejava/KDE.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kprinter.h>
 #include <kurl.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KIconViewItem.cpp b/kdejava/koala/kdejava/KIconViewItem.cpp
index 135e6432..667befae 100644
--- a/kdejava/koala/kdejava/KIconViewItem.cpp
+++ b/kdejava/koala/kdejava/KIconViewItem.cpp
@@ -4,7 +4,7 @@
 #include <tqsize.h>
 #include <tqpixmap.h>
 #include <tqstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KListViewItem.cpp b/kdejava/koala/kdejava/KListViewItem.cpp
index 7ee9d8bd..a7945a55 100644
--- a/kdejava/koala/kdejava/KListViewItem.cpp
+++ b/kdejava/koala/kdejava/KListViewItem.cpp
@@ -2,7 +2,7 @@
 #include <tqstring.h>
 #include <klistview.h>
 #include <tqcolor.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KTextEdit.cpp b/kdejava/koala/kdejava/KTextEdit.cpp
index ac2cbac2..10174ef1 100644
--- a/kdejava/koala/kdejava/KTextEdit.cpp
+++ b/kdejava/koala/kdejava/KTextEdit.cpp
@@ -2,7 +2,7 @@
 #include <ktextedit.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <kdejava/KDESupport.h>
diff --git a/kdejava/koala/kdejava/KToolBarButton.cpp b/kdejava/koala/kdejava/KToolBarButton.cpp
index 88e94af4..b706e83b 100644
--- a/kdejava/koala/kdejava/KToolBarButton.cpp
+++ b/kdejava/koala/kdejava/KToolBarButton.cpp
@@ -4,7 +4,7 @@
 #include <tqiconset.h>
 #include <tqstring.h>
 #include <ktoolbarbutton.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kdejava/koala/kdejava/KURLBar.cpp b/kdejava/koala/kdejava/KURLBar.cpp
index 3af2fca7..f325ff4a 100644
--- a/kdejava/koala/kdejava/KURLBar.cpp
+++ b/kdejava/koala/kdejava/KURLBar.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <kurl.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/kjsembed/bindings/brush_imp.cpp b/kjsembed/bindings/brush_imp.cpp
index ab2eee3f..30a4a652 100644
--- a/kjsembed/bindings/brush_imp.cpp
+++ b/kjsembed/bindings/brush_imp.cpp
@@ -23,7 +23,7 @@
 #include <kjsembed/jsvalueproxy.h>
 #include <kjsembed/jsbinding.h>
 #include <tqvariant.h>
-#include <tqbrush.h>
+#include <brush.h>
 
 #include "brush_imp.h"
 
diff --git a/kjsembed/bindings/dcop_imp.cpp b/kjsembed/bindings/dcop_imp.cpp
index 9dfaf4be..f5ba0c37 100644
--- a/kjsembed/bindings/dcop_imp.cpp
+++ b/kjsembed/bindings/dcop_imp.cpp
@@ -35,7 +35,7 @@
 #include <tqmap.h>
 #include <tqfont.h>
 #include <tqpixmap.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqrect.h>
 #include <tqsize.h>
 #include <tqcolor.h>
diff --git a/kjsembed/builtins/qfile_imp.cpp b/kjsembed/builtins/qfile_imp.cpp
index 7f3d2b5b..cb33f9fa 100644
--- a/kjsembed/builtins/qfile_imp.cpp
+++ b/kjsembed/builtins/qfile_imp.cpp
@@ -1,7 +1,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/builtins/textstream_imp.cpp b/kjsembed/builtins/textstream_imp.cpp
index d28bb46c..7e80bac5 100644
--- a/kjsembed/builtins/textstream_imp.cpp
+++ b/kjsembed/builtins/textstream_imp.cpp
@@ -17,7 +17,7 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqiodevice.h>
 
 #include <kjsembed/global.h>
diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp
index 74f58c2f..91b68d2b 100644
--- a/kjsembed/customobject_imp.cpp
+++ b/kjsembed/customobject_imp.cpp
@@ -24,7 +24,7 @@
 #include <tqpopupmenu.h>
 #include <tqdialog.h>
 #include <tqhbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqmetaobject.h>
diff --git a/kjsembed/global.h b/kjsembed/global.h
index e2e4a652..426e3cec 100644
--- a/kjsembed/global.h
+++ b/kjsembed/global.h
@@ -53,7 +53,7 @@ KJSEMBED_EXPORT void RedirectIOToConsole();
 char *itoa(int num, char *str, int radix = 10);
 #endif
 
-#include <tqtextstream.h>
+#include <textstream.h>
 namespace KJSEmbed {
 KJSEMBED_EXPORT TQTextStream *conin();
 KJSEMBED_EXPORT TQTextStream *conout();
diff --git a/kjsembed/jsbuiltin_imp.cpp b/kjsembed/jsbuiltin_imp.cpp
index 7cf96082..b87da413 100644
--- a/kjsembed/jsbuiltin_imp.cpp
+++ b/kjsembed/jsbuiltin_imp.cpp
@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #ifndef QT_ONLY
 
diff --git a/kjsembed/jsconsolewidget.cpp b/kjsembed/jsconsolewidget.cpp
index d2978a84..bf400cf2 100644
--- a/kjsembed/jsconsolewidget.cpp
+++ b/kjsembed/jsconsolewidget.cpp
@@ -20,7 +20,7 @@
 #include <tqfile.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
diff --git a/kjsembed/jsfactory.cpp b/kjsembed/jsfactory.cpp
index 5e6a22a7..af8d6589 100644
--- a/kjsembed/jsfactory.cpp
+++ b/kjsembed/jsfactory.cpp
@@ -31,14 +31,14 @@
 #include <tqmainwindow.h>
 //#include <tqpainter.h>
 #include <tqprogressdialog.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqwidget.h>
 #include <tqwidgetfactory.h>
 #include <tqsplitter.h>
 #include <tqscrollview.h>
 #include <tqcanvas.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsplashscreen.h>
 
 #ifndef QT_ONLY
diff --git a/kjsembed/jsopaqueproxy.cpp b/kjsembed/jsopaqueproxy.cpp
index 5abd9558..f1d33823 100644
--- a/kjsembed/jsopaqueproxy.cpp
+++ b/kjsembed/jsopaqueproxy.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <tqevent.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "global.h"
 
diff --git a/kjsembed/kjsembedpart.cpp b/kjsembed/kjsembedpart.cpp
index b39b8813..4046968f 100644
--- a/kjsembed/kjsembedpart.cpp
+++ b/kjsembed/kjsembedpart.cpp
@@ -24,7 +24,7 @@
 #include <tqobject.h>
 #include <tqdialog.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqwidget.h>
 #include <tqwidgetfactory.h>
 
diff --git a/kjsembed/plugins/customobject_plugin.cpp b/kjsembed/plugins/customobject_plugin.cpp
index b883ff66..cd22f169 100644
--- a/kjsembed/plugins/customobject_plugin.cpp
+++ b/kjsembed/plugins/customobject_plugin.cpp
@@ -27,7 +27,7 @@
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/customobject_imp.h>
 #include <tqvariant.h>
-#include <tqbrush.h>
+#include <brush.h>
 
 #include "customobject_plugin.h"
 
diff --git a/kjsembed/plugins/imagefx_plugin.cpp b/kjsembed/plugins/imagefx_plugin.cpp
index ef3d0ed0..5ca4a6a4 100644
--- a/kjsembed/plugins/imagefx_plugin.cpp
+++ b/kjsembed/plugins/imagefx_plugin.cpp
@@ -28,7 +28,7 @@
 #include <kjsembed/kjsembedpart.h>
 #include <kjsembed/customobject_imp.h>
 #include <tqvariant.h>
-#include <tqbrush.h>
+#include <brush.h>
 
 #include "imagefx_plugin.h"
 
diff --git a/kjsembed/qtbindings/qcanvas_imp.cpp b/kjsembed/qtbindings/qcanvas_imp.cpp
index 22e8c40b..1805cac8 100644
--- a/kjsembed/qtbindings/qcanvas_imp.cpp
+++ b/kjsembed/qtbindings/qcanvas_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasellipse_imp.cpp b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
index 3f4d53a5..981cc129 100644
--- a/kjsembed/qtbindings/qcanvasellipse_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasellipse_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasitem_imp.cpp b/kjsembed/qtbindings/qcanvasitem_imp.cpp
index 68c73667..85d7add7 100644
--- a/kjsembed/qtbindings/qcanvasitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitem_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
index f92f0d33..6ac69116 100644
--- a/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasitemlist_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasline_imp.cpp b/kjsembed/qtbindings/qcanvasline_imp.cpp
index 907573f0..528a5d81 100644
--- a/kjsembed/qtbindings/qcanvasline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasline_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
index 9fcf2718..a1204908 100644
--- a/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmap_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
index 8d5a8b79..77bf2743 100644
--- a/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspixmaparray_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
index 9af85744..d6d5027d 100644
--- a/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygon_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
index 4f09509d..6e1942f7 100644
--- a/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
+++ b/kjsembed/qtbindings/qcanvaspolygonalitem_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
index 55f1f14d..13c9ae6a 100644
--- a/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasrectangle_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasspline_imp.cpp b/kjsembed/qtbindings/qcanvasspline_imp.cpp
index 7809002c..1faae121 100644
--- a/kjsembed/qtbindings/qcanvasspline_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasspline_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvassprite_imp.cpp b/kjsembed/qtbindings/qcanvassprite_imp.cpp
index 98a4a428..d68aaaa1 100644
--- a/kjsembed/qtbindings/qcanvassprite_imp.cpp
+++ b/kjsembed/qtbindings/qcanvassprite_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvastext_imp.cpp b/kjsembed/qtbindings/qcanvastext_imp.cpp
index d0528647..3dec0bfa 100644
--- a/kjsembed/qtbindings/qcanvastext_imp.cpp
+++ b/kjsembed/qtbindings/qcanvastext_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcanvasview_imp.cpp b/kjsembed/qtbindings/qcanvasview_imp.cpp
index f32faef7..368b7d72 100644
--- a/kjsembed/qtbindings/qcanvasview_imp.cpp
+++ b/kjsembed/qtbindings/qcanvasview_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qchecklistitem_imp.cpp b/kjsembed/qtbindings/qchecklistitem_imp.cpp
index 9aa28e41..bc2545b7 100644
--- a/kjsembed/qtbindings/qchecklistitem_imp.cpp
+++ b/kjsembed/qtbindings/qchecklistitem_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qcombobox_imp.cpp b/kjsembed/qtbindings/qcombobox_imp.cpp
index 6ee231b8..1adf380a 100644
--- a/kjsembed/qtbindings/qcombobox_imp.cpp
+++ b/kjsembed/qtbindings/qcombobox_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qlistview_imp.cpp b/kjsembed/qtbindings/qlistview_imp.cpp
index 2536351c..6c868d54 100644
--- a/kjsembed/qtbindings/qlistview_imp.cpp
+++ b/kjsembed/qtbindings/qlistview_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 #include <tqiconset.h>
diff --git a/kjsembed/qtbindings/qlistviewitem_imp.cpp b/kjsembed/qtbindings/qlistviewitem_imp.cpp
index f1ed55c2..56beef23 100644
--- a/kjsembed/qtbindings/qlistviewitem_imp.cpp
+++ b/kjsembed/qtbindings/qlistviewitem_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qmenudata_imp.cpp b/kjsembed/qtbindings/qmenudata_imp.cpp
index 22b16d3e..8fd95887 100644
--- a/kjsembed/qtbindings/qmenudata_imp.cpp
+++ b/kjsembed/qtbindings/qmenudata_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 #include <tqkeysequence.h>
diff --git a/kjsembed/qtbindings/qmenuitem_imp.cpp b/kjsembed/qtbindings/qmenuitem_imp.cpp
index f65fa910..0092095b 100644
--- a/kjsembed/qtbindings/qmenuitem_imp.cpp
+++ b/kjsembed/qtbindings/qmenuitem_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qpopupmenu_imp.cpp b/kjsembed/qtbindings/qpopupmenu_imp.cpp
index 1c94776a..7f11cc2c 100644
--- a/kjsembed/qtbindings/qpopupmenu_imp.cpp
+++ b/kjsembed/qtbindings/qpopupmenu_imp.cpp
@@ -4,7 +4,7 @@
 #include <tqcstring.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/qtbindings/qt_imp.cpp b/kjsembed/qtbindings/qt_imp.cpp
index 0f6bf134..cad225fd 100644
--- a/kjsembed/qtbindings/qt_imp.cpp
+++ b/kjsembed/qtbindings/qt_imp.cpp
@@ -2,7 +2,7 @@
 
 
 #include <tqcstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 #include <tqfont.h>
 
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index bdf46d83..e57b9d15 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -42,7 +42,7 @@
 #include "tqscrollview.h"
 #include "tqpixmap.h"
 #include "tqptrlist.h"
-#include "tqbrush.h"
+#include "brush.h"
 #include "tqpen.h"
 #include "tqvaluelist.h"
 #include "tqpointarray.h"
diff --git a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
index bc1114bb..f4777554 100644
--- a/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
+++ b/korundum/rubylib/rbkconfig_compiler/rbkconfig_compiler.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdom.h>
 #include <tqregexp.h>
 
diff --git a/qtjava/javalib/examples/textedit/example.html b/qtjava/javalib/examples/textedit/example.html
index 90df139e..8815f9d8 100644
--- a/qtjava/javalib/examples/textedit/example.html
+++ b/qtjava/javalib/examples/textedit/example.html
@@ -103,7 +103,7 @@ the other widget (called the TQLabel's "buddy"). Example:
 (the <a href="tqlineedit.html">TQLineEdit</a>) when the user presses <dfn>Alt-P.</dfn> You can also
 use the <a href="#191701">setBuddy</a>() function to accomplish the same.
 <p>
-<p>See also  <a href="tqlineedit.html">TQLineEdit</a>, <a href="tqtextview.html">TQTextView</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqmovie.html">TQMovie</a> and <a href="guibooks.html#fowler">GUI Design Handbook: Label</a>
+<p>See also  <a href="tqlineedit.html">TQLineEdit</a>, <a href="textview.html">TQTextView</a>, <a href="tqpixmap.html">TQPixmap</a>, <a href="tqmovie.html">TQMovie</a> and <a href="guibooks.html#fowler">GUI Design Handbook: Label</a>
 <p>Examples:
  <a href="cursor-cursor-cpp.html#TQLabel">cursor/cursor.cpp</a>
  <a href="layout-layout-cpp.html#TQLabel">layout/layout.cpp</a>
@@ -208,7 +208,7 @@ Enables auto-resizing if <em>enable</em> is TRUE, or disables it if <em>enable</
 <p>When auto-resizing is enabled, the label will resize itself to fit
 the contents whenever the contents change. The top left corner is
 not moved. This is useful for TQLabel widgets that are not managed by
-a <a href="tqlayout.html">TQLayout</a> (e.g. top-level widgets).
+a <a href="layout.html">TQLayout</a> (e.g. top-level widgets).
 <p>Auto-resizing is disabled by default.
 <p>See also  <a href="#75b2a1">autoResize</a>(), <a href="tqwidget.html#ab3108">adjustSize</a>() and <a href="#614dd5">sizeHint</a>().
 <h3 class="fn">void <a name="191701"></a>TQLabel::setBuddy ( <a href="tqwidget.html">TQWidget</a> * buddy ) <code>[virtual]</code></h3>
@@ -294,7 +294,7 @@ the format of <em>text.</em>
 the buddy accelerator key is updated from the new text.
 <p>The label resizes itself if auto-resizing is enabled.
 <p>Note that Qlabel is well suited to display small rich text documents
-only. For large documents, use <a href="tqtextview.html">TQTextView</a> instead. It will flicker
+only. For large documents, use <a href="textview.html">TQTextView</a> instead. It will flicker
 less on resize and can also provide a scrollbar if necessary.
 <p>See also  <a href="#72cf09">text</a>(), <a href="#5de3f9">setTextFormat</a>(), <a href="#191701">setBuddy</a>() and <a href="#1f406e">setAlignment</a>().
 <p>Examples:
diff --git a/qtjava/javalib/qtjava/JavaSlot.h b/qtjava/javalib/qtjava/JavaSlot.h
index 47a827f2..d5e16236 100644
--- a/qtjava/javalib/qtjava/JavaSlot.h
+++ b/qtjava/javalib/qtjava/JavaSlot.h
@@ -38,7 +38,7 @@
 #include <tqlibrary.h>
 #include <tqhttp.h>
 #include <tqdir.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 
 class JavaSlotFactory;
 class TQMetaObject;
diff --git a/qtjava/javalib/qtjava/Qt.cpp b/qtjava/javalib/qtjava/Qt.cpp
index 6ee67238..b10c8da1 100644
--- a/qtjava/javalib/qtjava/Qt.cpp
+++ b/qtjava/javalib/qtjava/Qt.cpp
@@ -15,17 +15,17 @@
 #include <tqstringlist.h>
 #include <tqdom.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpaintdevice.h>
 #include <tqpicture.h>
 #include <tqsplitter.h>
 #include <tqsize.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqregion.h>
 #include <tqcursor.h>
 #include <tqwindowdefs.h>
 #include <tqpixmap.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfont.h>
 #include <tqimage.h>
 #include <tqmainwindow.h>
diff --git a/qtjava/javalib/qtjava/TQApplication.cpp b/qtjava/javalib/qtjava/TQApplication.cpp
index 85dddeee..dd9ff61a 100644
--- a/qtjava/javalib/qtjava/TQApplication.cpp
+++ b/qtjava/javalib/qtjava/TQApplication.cpp
@@ -10,7 +10,7 @@
 #include <tqpoint.h>
 #include <tqfontmetrics.h>
 #include <tqcolor.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqnamespace.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQBoxLayout.cpp b/qtjava/javalib/qtjava/TQBoxLayout.cpp
index ccd4f3ce..73744223 100644
--- a/qtjava/javalib/qtjava/TQBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQBoxLayout.cpp
@@ -2,7 +2,7 @@
 #include <tqsizepolicy.h>
 #include <tqsize.h>
 #include <tqrect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQBrush.cpp b/qtjava/javalib/qtjava/TQBrush.cpp
index 5afc1645..f18f553b 100644
--- a/qtjava/javalib/qtjava/TQBrush.cpp
+++ b/qtjava/javalib/qtjava/TQBrush.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqpixmap.h>
 #include <tqcolor.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
index 59307c27..76c2d40d 100644
--- a/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
+++ b/qtjava/javalib/qtjava/TQCanvasPolygonalItem.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqrect.h>
 #include <tqcanvas.h>
 #include <tqpointarray.h>
diff --git a/qtjava/javalib/qtjava/TQCheckListItem.cpp b/qtjava/javalib/qtjava/TQCheckListItem.cpp
index 08f8ec75..1f717240 100644
--- a/qtjava/javalib/qtjava/TQCheckListItem.cpp
+++ b/qtjava/javalib/qtjava/TQCheckListItem.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <tqfontmetrics.h>
 #include <tqlistview.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCheckListItem.h>
diff --git a/qtjava/javalib/qtjava/TQCheckTableItem.cpp b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
index 26da3e80..0f85846c 100644
--- a/qtjava/javalib/qtjava/TQCheckTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQCheckTableItem.cpp
@@ -3,7 +3,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqtable.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCheckTableItem.h>
diff --git a/qtjava/javalib/qtjava/TQClipboard.cpp b/qtjava/javalib/qtjava/TQClipboard.cpp
index b390c9ea..4fedcc2c 100644
--- a/qtjava/javalib/qtjava/TQClipboard.cpp
+++ b/qtjava/javalib/qtjava/TQClipboard.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqstring.h>
diff --git a/qtjava/javalib/qtjava/TQColorGroup.cpp b/qtjava/javalib/qtjava/TQColorGroup.cpp
index 66c9e966..a26b2a1b 100644
--- a/qtjava/javalib/qtjava/TQColorGroup.cpp
+++ b/qtjava/javalib/qtjava/TQColorGroup.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqcolor.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQColorGroup.h>
diff --git a/qtjava/javalib/qtjava/TQComboBox.cpp b/qtjava/javalib/qtjava/TQComboBox.cpp
index 4a0dc900..a55b4c98 100644
--- a/qtjava/javalib/qtjava/TQComboBox.cpp
+++ b/qtjava/javalib/qtjava/TQComboBox.cpp
@@ -7,7 +7,7 @@
 #include <tqfont.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQComboBox.h>
diff --git a/qtjava/javalib/qtjava/TQComboTableItem.cpp b/qtjava/javalib/qtjava/TQComboTableItem.cpp
index 6a0d9280..7b4761e0 100644
--- a/qtjava/javalib/qtjava/TQComboTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQComboTableItem.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqtable.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQComboTableItem.h>
diff --git a/qtjava/javalib/qtjava/TQCustomMenuItem.cpp b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
index 9f869f98..60dafe65 100644
--- a/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
+++ b/qtjava/javalib/qtjava/TQCustomMenuItem.cpp
@@ -2,7 +2,7 @@
 #include <tqsize.h>
 #include <tqmenudata.h>
 #include <tqfont.h>
-#include <tqpalette.h>
+#include <palette.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQCustomMenuItem.h>
diff --git a/qtjava/javalib/qtjava/TQDataTable.cpp b/qtjava/javalib/qtjava/TQDataTable.cpp
index 88068513..40f22812 100644
--- a/qtjava/javalib/qtjava/TQDataTable.cpp
+++ b/qtjava/javalib/qtjava/TQDataTable.cpp
@@ -8,7 +8,7 @@
 #include <tqsqlindex.h>
 #include <tqvariant.h>
 #include <tqstringlist.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqdatatable.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQDomNode.cpp b/qtjava/javalib/qtjava/TQDomNode.cpp
index 108d592e..dd0d70a1 100644
--- a/qtjava/javalib/qtjava/TQDomNode.cpp
+++ b/qtjava/javalib/qtjava/TQDomNode.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqdom.h>
 
diff --git a/qtjava/javalib/qtjava/TQGridLayout.cpp b/qtjava/javalib/qtjava/TQGridLayout.cpp
index 74a6d7b3..eb18a554 100644
--- a/qtjava/javalib/qtjava/TQGridLayout.cpp
+++ b/qtjava/javalib/qtjava/TQGridLayout.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqsize.h>
 
diff --git a/qtjava/javalib/qtjava/TQHBoxLayout.cpp b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
index 54587967..f12983d2 100644
--- a/qtjava/javalib/qtjava/TQHBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQHBoxLayout.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQIconView.cpp b/qtjava/javalib/qtjava/TQIconView.cpp
index 6917393b..5b22a9b1 100644
--- a/qtjava/javalib/qtjava/TQIconView.cpp
+++ b/qtjava/javalib/qtjava/TQIconView.cpp
@@ -4,9 +4,9 @@
 #include <tqiconview.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqfont.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQIconViewItem.cpp b/qtjava/javalib/qtjava/TQIconViewItem.cpp
index 55b57d3e..254a6cc3 100644
--- a/qtjava/javalib/qtjava/TQIconViewItem.cpp
+++ b/qtjava/javalib/qtjava/TQIconViewItem.cpp
@@ -3,7 +3,7 @@
 #include <tqiconview.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpicture.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
diff --git a/qtjava/javalib/qtjava/TQLayout.cpp b/qtjava/javalib/qtjava/TQLayout.cpp
index 5d219272..26009f47 100644
--- a/qtjava/javalib/qtjava/TQLayout.cpp
+++ b/qtjava/javalib/qtjava/TQLayout.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqsize.h>
 
diff --git a/qtjava/javalib/qtjava/TQLayoutItem.cpp b/qtjava/javalib/qtjava/TQLayoutItem.cpp
index 499a3ac9..0ad300f3 100644
--- a/qtjava/javalib/qtjava/TQLayoutItem.cpp
+++ b/qtjava/javalib/qtjava/TQLayoutItem.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQLineEdit.cpp b/qtjava/javalib/qtjava/TQLineEdit.cpp
index 5995598c..37e4207e 100644
--- a/qtjava/javalib/qtjava/TQLineEdit.cpp
+++ b/qtjava/javalib/qtjava/TQLineEdit.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqlineedit.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqfont.h>
 
diff --git a/qtjava/javalib/qtjava/TQListView.cpp b/qtjava/javalib/qtjava/TQListView.cpp
index 9e3e693a..ccd94c50 100644
--- a/qtjava/javalib/qtjava/TQListView.cpp
+++ b/qtjava/javalib/qtjava/TQListView.cpp
@@ -4,7 +4,7 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqlistview.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqfont.h>
 #include <tqiconset.h>
diff --git a/qtjava/javalib/qtjava/TQListViewItem.cpp b/qtjava/javalib/qtjava/TQListViewItem.cpp
index 33857c08..956b6222 100644
--- a/qtjava/javalib/qtjava/TQListViewItem.cpp
+++ b/qtjava/javalib/qtjava/TQListViewItem.cpp
@@ -4,7 +4,7 @@
 #include <tqpoint.h>
 #include <tqfontmetrics.h>
 #include <tqlistview.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqpixmap.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQPainter.cpp b/qtjava/javalib/qtjava/TQPainter.cpp
index d85341ad..5fe46ed9 100644
--- a/qtjava/javalib/qtjava/TQPainter.cpp
+++ b/qtjava/javalib/qtjava/TQPainter.cpp
@@ -6,7 +6,7 @@
 #include <tqfontmetrics.h>
 #include <tqpainter.h>
 #include <tqpicture.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqregion.h>
 #include <tqfontinfo.h>
 #include <tqpixmap.h>
diff --git a/qtjava/javalib/qtjava/TQPalette.cpp b/qtjava/javalib/qtjava/TQPalette.cpp
index cdb7d59f..76e63609 100644
--- a/qtjava/javalib/qtjava/TQPalette.cpp
+++ b/qtjava/javalib/qtjava/TQPalette.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqpalette.h>
-#include <tqbrush.h>
+#include <palette.h>
+#include <brush.h>
 #include <tqcolor.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQScrollBar.cpp b/qtjava/javalib/qtjava/TQScrollBar.cpp
index c56a3453..661473d5 100644
--- a/qtjava/javalib/qtjava/TQScrollBar.cpp
+++ b/qtjava/javalib/qtjava/TQScrollBar.cpp
@@ -5,7 +5,7 @@
 #include <tqstring.h>
 #include <tqscrollbar.h>
 #include <tqrangecontrol.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqnamespace.h>
 
diff --git a/qtjava/javalib/qtjava/TQSimpleRichText.cpp b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
index 13026fba..dd8a3ff8 100644
--- a/qtjava/javalib/qtjava/TQSimpleRichText.cpp
+++ b/qtjava/javalib/qtjava/TQSimpleRichText.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqregion.h>
 #include <tqsimplerichtext.h>
 #include <tqfont.h>
diff --git a/qtjava/javalib/qtjava/TQSlider.cpp b/qtjava/javalib/qtjava/TQSlider.cpp
index f96f435e..adb5a951 100644
--- a/qtjava/javalib/qtjava/TQSlider.cpp
+++ b/qtjava/javalib/qtjava/TQSlider.cpp
@@ -4,7 +4,7 @@
 #include <tqstyle.h>
 #include <tqstring.h>
 #include <tqrangecontrol.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqslider.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQSpacerItem.cpp b/qtjava/javalib/qtjava/TQSpacerItem.cpp
index ec8ab0df..0203ce48 100644
--- a/qtjava/javalib/qtjava/TQSpacerItem.cpp
+++ b/qtjava/javalib/qtjava/TQSpacerItem.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQStyle.cpp b/qtjava/javalib/qtjava/TQStyle.cpp
index 836fde0d..eac72f49 100644
--- a/qtjava/javalib/qtjava/TQStyle.cpp
+++ b/qtjava/javalib/qtjava/TQStyle.cpp
@@ -3,7 +3,7 @@
 #include <tqstyle.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQStyleSheet.cpp b/qtjava/javalib/qtjava/TQStyleSheet.cpp
index 9afa5cfe..73435fa3 100644
--- a/qtjava/javalib/qtjava/TQStyleSheet.cpp
+++ b/qtjava/javalib/qtjava/TQStyleSheet.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
 #include <tqfont.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqmime.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQStyleSheetItem.cpp b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
index 95ff6d7f..3dc2b323 100644
--- a/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
+++ b/qtjava/javalib/qtjava/TQStyleSheetItem.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqcolor.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTable.cpp b/qtjava/javalib/qtjava/TQTable.cpp
index dc74d32a..fa9aafc9 100644
--- a/qtjava/javalib/qtjava/TQTable.cpp
+++ b/qtjava/javalib/qtjava/TQTable.cpp
@@ -4,7 +4,7 @@
 #include <tqpoint.h>
 #include <tqstringlist.h>
 #include <tqtable.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQTableItem.cpp b/qtjava/javalib/qtjava/TQTableItem.cpp
index 60dfa7d8..be41d333 100644
--- a/qtjava/javalib/qtjava/TQTableItem.cpp
+++ b/qtjava/javalib/qtjava/TQTableItem.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqtable.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqpixmap.h>
 
diff --git a/qtjava/javalib/qtjava/TQTextBrowser.cpp b/qtjava/javalib/qtjava/TQTextBrowser.cpp
index 544977a7..b4b2274e 100644
--- a/qtjava/javalib/qtjava/TQTextBrowser.cpp
+++ b/qtjava/javalib/qtjava/TQTextBrowser.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqtextbrowser.h>
+#include <textbrowser.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextBrowser.h>
diff --git a/qtjava/javalib/qtjava/TQTextCodec.cpp b/qtjava/javalib/qtjava/TQTextCodec.cpp
index ae9b384b..5115d759 100644
--- a/qtjava/javalib/qtjava/TQTextCodec.cpp
+++ b/qtjava/javalib/qtjava/TQTextCodec.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextDecoder.cpp b/qtjava/javalib/qtjava/TQTextDecoder.cpp
index 63339de3..db1f73c1 100644
--- a/qtjava/javalib/qtjava/TQTextDecoder.cpp
+++ b/qtjava/javalib/qtjava/TQTextDecoder.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextDecoder.h>
diff --git a/qtjava/javalib/qtjava/TQTextEdit.cpp b/qtjava/javalib/qtjava/TQTextEdit.cpp
index 56ae8149..7b930a3f 100644
--- a/qtjava/javalib/qtjava/TQTextEdit.cpp
+++ b/qtjava/javalib/qtjava/TQTextEdit.cpp
@@ -2,12 +2,12 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
-#include <tqbrush.h>
-#include <tqtextedit.h>
+#include <brush.h>
+#include <textedit.h>
 #include <tqfont.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 #include <tqcolor.h>
 #include <tqcstring.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQTextEncoder.cpp b/qtjava/javalib/qtjava/TQTextEncoder.cpp
index 1fe136ce..dc66be81 100644
--- a/qtjava/javalib/qtjava/TQTextEncoder.cpp
+++ b/qtjava/javalib/qtjava/TQTextEncoder.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextIStream.cpp b/qtjava/javalib/qtjava/TQTextIStream.cpp
index 6348ea45..315bcfc3 100644
--- a/qtjava/javalib/qtjava/TQTextIStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextIStream.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextOStream.cpp b/qtjava/javalib/qtjava/TQTextOStream.cpp
index 9d1dad60..bd3eb33b 100644
--- a/qtjava/javalib/qtjava/TQTextOStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextOStream.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextStream.cpp b/qtjava/javalib/qtjava/TQTextStream.cpp
index d7ef6b29..024261fe 100644
--- a/qtjava/javalib/qtjava/TQTextStream.cpp
+++ b/qtjava/javalib/qtjava/TQTextStream.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQTextView.cpp b/qtjava/javalib/qtjava/TQTextView.cpp
index da6c858a..9acc9915 100644
--- a/qtjava/javalib/qtjava/TQTextView.cpp
+++ b/qtjava/javalib/qtjava/TQTextView.cpp
@@ -1,6 +1,6 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqstring.h>
-#include <tqtextview.h>
+#include <textview.h>
 
 #include <qtjava/QtSupport.h>
 #include <qtjava/TQTextView.h>
diff --git a/qtjava/javalib/qtjava/TQToolButton.cpp b/qtjava/javalib/qtjava/TQToolButton.cpp
index c4cb619a..d2651f79 100644
--- a/qtjava/javalib/qtjava/TQToolButton.cpp
+++ b/qtjava/javalib/qtjava/TQToolButton.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqtoolbutton.h>
 #include <tqstring.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
 #include <tqiconset.h>
 #include <tqnamespace.h>
diff --git a/qtjava/javalib/qtjava/TQToolTip.cpp b/qtjava/javalib/qtjava/TQToolTip.cpp
index 79d95bc3..0956f398 100644
--- a/qtjava/javalib/qtjava/TQToolTip.cpp
+++ b/qtjava/javalib/qtjava/TQToolTip.cpp
@@ -2,7 +2,7 @@
 #include <tqrect.h>
 #include <tqstring.h>
 #include <tqpoint.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqtooltip.h>
 #include <tqfont.h>
 
diff --git a/qtjava/javalib/qtjava/TQVBoxLayout.cpp b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
index e4172991..eb98676c 100644
--- a/qtjava/javalib/qtjava/TQVBoxLayout.cpp
+++ b/qtjava/javalib/qtjava/TQVBoxLayout.cpp
@@ -1,5 +1,5 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQVariant.cpp b/qtjava/javalib/qtjava/TQVariant.cpp
index 4c713dc7..529c0b3f 100644
--- a/qtjava/javalib/qtjava/TQVariant.cpp
+++ b/qtjava/javalib/qtjava/TQVariant.cpp
@@ -7,9 +7,9 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqstringlist.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqsize.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqregion.h>
 #include <tqcursor.h>
 #include <tqbitmap.h>
diff --git a/qtjava/javalib/qtjava/TQWidget.cpp b/qtjava/javalib/qtjava/TQWidget.cpp
index 7b14d140..d51f416a 100644
--- a/qtjava/javalib/qtjava/TQWidget.cpp
+++ b/qtjava/javalib/qtjava/TQWidget.cpp
@@ -5,10 +5,10 @@
 #include <tqstring.h>
 #include <tqpoint.h>
 #include <tqfontmetrics.h>
-#include <tqpalette.h>
+#include <palette.h>
 #include <tqwidget.h>
 #include <tqpaintdevice.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqsize.h>
 #include <tqregion.h>
 #include <tqcursor.h>
diff --git a/qtjava/javalib/qtjava/TQWidgetItem.cpp b/qtjava/javalib/qtjava/TQWidgetItem.cpp
index 4dc2fcc4..a760dd50 100644
--- a/qtjava/javalib/qtjava/TQWidgetItem.cpp
+++ b/qtjava/javalib/qtjava/TQWidgetItem.cpp
@@ -1,7 +1,7 @@
 //Auto-generated by kalyptus. DO NOT EDIT.
 #include <tqsizepolicy.h>
 #include <tqrect.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqsize.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtjava/javalib/qtjava/TQXmlInputSource.cpp b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
index 2ed62091..5cc7e459 100644
--- a/qtjava/javalib/qtjava/TQXmlInputSource.cpp
+++ b/qtjava/javalib/qtjava/TQXmlInputSource.cpp
@@ -2,7 +2,7 @@
 #include <tqxml.h>
 #include <tqstring.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcstring.h>
 
 #include <qtjava/QtSupport.h>
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index 42ec751f..a5e0718c 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -368,7 +368,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
-		globalIncludes += "tqlayout.h";
+		globalIncludes += "layout.h";
 		globalIncludes += "tqapplication.h";
 		continue;
 	    }
diff --git a/qtruby/rubylib/designer/rbuic/uic.h b/qtruby/rubylib/designer/rbuic/uic.h
index ddfcc1be..74e53c4d 100644
--- a/qtruby/rubylib/designer/rbuic/uic.h
+++ b/qtruby/rubylib/designer/rbuic/uic.h
@@ -25,8 +25,8 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include <tqtextstream.h>
-#include <tqpalette.h>
+#include <textstream.h>
+#include <palette.h>
 
 
 class RubyIndent
diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
index f8a0f0fd..5d3f487c 100644
--- a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
+++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
@@ -30,7 +30,7 @@
 #include <tqstrlist.h>
 #include <tqdict.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqcleanuphandler.h>
 
 #include <tqfeatures.h>
diff --git a/qtruby/rubylib/qtruby/Qt.cpp b/qtruby/rubylib/qtruby/Qt.cpp
index c45eeb64..7c6d138b 100644
--- a/qtruby/rubylib/qtruby/Qt.cpp
+++ b/qtruby/rubylib/qtruby/Qt.cpp
@@ -32,7 +32,7 @@
 #include <tqvariant.h>
 #include <tqcursor.h>
 #include <tqobjectlist.h>
-#include <tqsignalslotimp.h>
+#include <signalslotimp.h>
 #include <tqcstring.h>
 
 #undef DEBUG
diff --git a/qtruby/rubylib/qtruby/handlers.cpp b/qtruby/rubylib/qtruby/handlers.cpp
index 30341fd1..d34ea4a0 100644
--- a/qtruby/rubylib/qtruby/handlers.cpp
+++ b/qtruby/rubylib/qtruby/handlers.cpp
@@ -15,11 +15,11 @@
 #include <tqiconview.h>
 #include <tqtable.h>
 #include <tqpopupmenu.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqmetaobject.h>
 #include <tqvaluelist.h>
 #include <tqobjectlist.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqhostaddress.h>
 #include <tqpair.h>
 
diff --git a/xparts/xpart_notepad/xp_notepad.cpp b/xparts/xpart_notepad/xp_notepad.cpp
index 5dc7157c..35b71e4f 100644
--- a/xparts/xpart_notepad/xp_notepad.cpp
+++ b/xparts/xpart_notepad/xp_notepad.cpp
@@ -2,7 +2,7 @@
 #include <kapplication.h>
 #include <tqmultilineedit.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <stdio.h>
 #include <iostream>
 #include <xpart.h>