diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 4610e507..81a56e3e 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -132,7 +132,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     _STYLE_SGI => '',
     _STYLE_WINDOWS => '',
     QT_STATIC_CONST => 'static const',
-    Q_EXPORT => '',
+    TQ_EXPORT => '',
     Q_EXPORT_CODECS_BIG5 => '',
     TQ_REFCOUNT => '',
     TQM_EXPORT_CANVAS => '',
diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h
index 6fc18ccf..5c5fb034 100644
--- a/kjsembed/tools/headers/qbrush.h
+++ b/kjsembed/tools/headers/qbrush.h
@@ -44,7 +44,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQBrush: public Qt
+class TQ_EXPORT TQBrush: public Qt
 {
 friend class TQPainter;
 public:
@@ -84,8 +84,8 @@ private:
  *****************************************************************************/
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
 #endif
 
 #endif // TQBRUSH_H
diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h
index bebe575a..dbdd6548 100644
--- a/kjsembed/tools/headers/qcanvas.h
+++ b/kjsembed/tools/headers/qcanvas.h
@@ -52,7 +52,7 @@
 #define TQM_EXPORT_CANVAS
 #define TQM_TEMPLATE_EXTERN_CANVAS
 #else
-#define TQM_EXPORT_CANVAS Q_EXPORT
+#define TQM_EXPORT_CANVAS TQ_EXPORT
 #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN
 #endif
 
diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h
index 7fda3222..88c42ce3 100644
--- a/kjsembed/tools/headers/qdir.h
+++ b/kjsembed/tools/headers/qdir.h
@@ -52,7 +52,7 @@ class TQStringList;
 template <class T> class TQDeepCopy;
 
 
-class Q_EXPORT TQDir
+class TQ_EXPORT TQDir
 {
 public:
     enum FilterSpec { Dirs	    = 0x001,
diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h
index 40e9767e..28158a8b 100644
--- a/kjsembed/tools/headers/qpen.h
+++ b/kjsembed/tools/headers/qpen.h
@@ -44,7 +44,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQPen: public Qt
+class TQ_EXPORT TQPen: public Qt
 {
 public:
     TQPen();
@@ -92,8 +92,8 @@ private:
   TQPen stream functions
  *****************************************************************************/
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
 #endif
 
 #endif // TQPEN_H
diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h
index 5791c57e..b1ce519e 100644
--- a/kjsembed/tools/headers/qtimer.h
+++ b/kjsembed/tools/headers/qtimer.h
@@ -43,7 +43,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQTimer : public TQObject
+class TQ_EXPORT TQTimer : public TQObject
 {
     TQ_OBJECT
 public:
diff --git a/smoke/tde/qtguess.pl.in b/smoke/tde/qtguess.pl.in
index 126bdce3..3c80e1d0 100644
--- a/smoke/tde/qtguess.pl.in
+++ b/smoke/tde/qtguess.pl.in
@@ -311,7 +311,7 @@ our %tests = (
 						    TQStringList keys() const { return TQStringList(); };
 						    bool installIOHandler( const TQString &format ) { return true; };
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
@@ -461,7 +461,7 @@ our %tests = (
                                                     TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;}
                                                     TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;}
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
         "TQT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],
diff --git a/smoke/tqt/qtguess.pl.in b/smoke/tqt/qtguess.pl.in
index 126bdce3..3c80e1d0 100644
--- a/smoke/tqt/qtguess.pl.in
+++ b/smoke/tqt/qtguess.pl.in
@@ -311,7 +311,7 @@ our %tests = (
 						    TQStringList keys() const { return TQStringList(); };
 						    bool installIOHandler( const TQString &format ) { return true; };
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_IMAGE_DITHER_TO_1" =>	["qimage.h", q£
 						TQImage *foo = new TQImage;
@@ -461,7 +461,7 @@ our %tests = (
                                                     TQTextCodec *createForName( const TQString & name ) {return (TQTextCodec *)NULL;}
                                                     TQTextCodec *createForMib( int mib ) {return (TQTextCodec *)NULL;}
 						};
-						Q_EXPORT_PLUGIN( TQFoo )
+						TQ_EXPORT_PLUGIN( TQFoo )
 					£],
  	"TQT_NO_TEXTEDIT" =>		["qtextedit.h", "TQTextEdit foo;", 13], 
         "TQT_NO_TEXTSTREAM" =>           ["qtextstream.h", "TQTextStream foo;", 5],