diff --git a/kpilot/conduitConfigDialog.cpp b/kpilot/conduitConfigDialog.cpp
index b39ba01..a55f6b4 100644
--- a/kpilot/conduitConfigDialog.cpp
+++ b/kpilot/conduitConfigDialog.cpp
@@ -72,13 +72,13 @@
 
 extern "C"
 {
-	KDE_EXPORT TDECModule *create_kpilotconfig( TQWidget *parent, const char * )
+	TDE_EXPORT TDECModule *create_kpilotconfig( TQWidget *parent, const char * )
 	{
 		FUNCTIONSETUP;
 		return new ConduitConfigWidget( parent, "kcmkpilotconfig" );
 	}
 
-	KDE_EXPORT ConfigWizard *create_wizard(TQWidget *parent, int m)
+	TDE_EXPORT ConfigWizard *create_wizard(TQWidget *parent, int m)
 	{
 		FUNCTIONSETUP;
 		return new ConfigWizard(parent,"Wizard", m);
diff --git a/kpilot/kpilotConfigDialog.h b/kpilot/kpilotConfigDialog.h
index 09fa182..6fb3b84 100644
--- a/kpilot/kpilotConfigDialog.h
+++ b/kpilot/kpilotConfigDialog.h
@@ -75,7 +75,7 @@ private:
 } ;
 
 
-class KDE_EXPORT SyncConfigPage : public ConfigPage
+class TDE_EXPORT SyncConfigPage : public ConfigPage
 {
 public:
 	SyncConfigPage( TQWidget *, const char * );
diff --git a/lib/actionQueue.h b/lib/actionQueue.h
index 48c9718..50bacaa 100644
--- a/lib/actionQueue.h
+++ b/lib/actionQueue.h
@@ -54,7 +54,7 @@
 * actions in the queue in sequence.
 *
 */
-class KDE_EXPORT ActionQueue : public SyncAction
+class TDE_EXPORT ActionQueue : public SyncAction
 {
 TQ_OBJECT
   
diff --git a/lib/actions.h b/lib/actions.h
index a57a6e9..1f15861 100644
--- a/lib/actions.h
+++ b/lib/actions.h
@@ -42,7 +42,7 @@
 * It is added automatically to a ActionQueue by queueInit() in order
 * to inform the user of the sync.
 */
-class KDE_EXPORT WelcomeAction : public SyncAction
+class TDE_EXPORT WelcomeAction : public SyncAction
 {
 public:
 	/** Constructor. */
@@ -58,7 +58,7 @@ protected:
 * in cases when the hotsync starts while KPilot is busy configuring
 * something and can't be interrupted.
 */
-class KDE_EXPORT SorryAction : public SyncAction
+class TDE_EXPORT SorryAction : public SyncAction
 {
 public:
 	/**
@@ -84,7 +84,7 @@ protected:
 * device that the HotSync is over, it should be the last
 * action executed.
 */
-class KDE_EXPORT CleanupAction : public SyncAction
+class TDE_EXPORT CleanupAction : public SyncAction
 {
 public:
 	/** Constructor. */
@@ -100,7 +100,7 @@ protected:
 * and not do anything spectacular. It lists all the databases
 * on the handheld in the sync log.
 */
-class KDE_EXPORT TestLink : public SyncAction
+class TDE_EXPORT TestLink : public SyncAction
 {
 public:
 	/** Constructor. */
diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h
index f932371..f3266b1 100644
--- a/lib/kpilotdevicelink.h
+++ b/lib/kpilotdevicelink.h
@@ -69,7 +69,7 @@ enum DeviceCustomEvents {
 * handheld devices, which communicate with the PC
 * using DLP / SLP via the pilot-link library.
 */
-class KDE_EXPORT KPilotDeviceLink : public KPilotLink
+class TDE_EXPORT KPilotDeviceLink : public KPilotLink
 {
 friend class PilotSerialDatabase;
 friend class DeviceCommThread;
diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h
index 25da326..d8c42b0 100644
--- a/lib/kpilotlink.h
+++ b/lib/kpilotlink.h
@@ -168,7 +168,7 @@ class PilotDatabase;
 * with a non-zero timeout and that timeout has elapsed. The
 * tickler is stopped before timeout is emitted.
 */
-class KDE_EXPORT KPilotLink : public TQObject
+class TDE_EXPORT KPilotLink : public TQObject
 {
 TQ_OBJECT
   
diff --git a/lib/kpilotlocallink.h b/lib/kpilotlocallink.h
index cd3213c..1831d0c 100644
--- a/lib/kpilotlocallink.h
+++ b/lib/kpilotlocallink.h
@@ -40,7 +40,7 @@
 * Implementation of the device link for file-system backed (ie. local, fake)
 * devices. Uses a directory specified in the reset() call to serve databases.
 */
-class KDE_EXPORT KPilotLocalLink : public KPilotLink
+class TDE_EXPORT KPilotLocalLink : public KPilotLink
 {
 TQ_OBJECT
   
diff --git a/lib/options.h b/lib/options.h
index 0896af0..9fbcf22 100644
--- a/lib/options.h
+++ b/lib/options.h
@@ -67,9 +67,9 @@ inline std::ostream& operator <<(std::ostream &o, const TQCString &s)
 #define DEBUG	(1)
 #endif
 
-extern KDE_EXPORT int debug_level;
+extern TDE_EXPORT int debug_level;
 
-class KDE_EXPORT KPilotDepthCount
+class TDE_EXPORT KPilotDepthCount
 {
 public:
 	KPilotDepthCount(int, int level, const char *s);
@@ -147,12 +147,12 @@ TQString rtExpand(const TQString &s, TQt::TextFormat richText);
 /**
  * Convert a struct tm from the pilot-link package to a TQDateTime
  */
-KDE_EXPORT TQDateTime readTm(const struct tm &t);
+TDE_EXPORT TQDateTime readTm(const struct tm &t);
 /**
  * Convert a TQDateTime to a struct tm for use with the pilot-link package
  */
-KDE_EXPORT struct tm writeTm(const TQDateTime &dt);
-KDE_EXPORT struct tm writeTm(const TQDate &dt);
+TDE_EXPORT struct tm writeTm(const TQDateTime &dt);
+TDE_EXPORT struct tm writeTm(const TQDate &dt);
 
 
 // Some layout macros
diff --git a/lib/pilot.h b/lib/pilot.h
index b6d6882..8cdb6b1 100644
--- a/lib/pilot.h
+++ b/lib/pilot.h
@@ -60,7 +60,7 @@ class PilotCategoryInfo; // ... and category information
 * as mapping user-visible strings from UTF8 (KDE side) to
 * the encoding used on the handheld.
 */
-namespace Pilot KDE_EXPORT
+namespace Pilot TDE_EXPORT
 {
 	/** Maximum size of an AppInfo block, taken roughly from the pilot-link source. */
 	static const int MAX_APPINFO_SIZE=8192;
diff --git a/lib/pilotAddress.h b/lib/pilotAddress.h
index 1ef1077..fd426fc 100644
--- a/lib/pilotAddress.h
+++ b/lib/pilotAddress.h
@@ -59,7 +59,7 @@ typedef PilotAppInfo<
 *   A phone slot value may be invalid. If so, operations on it will
 *   fail (yielding invalid again) and isValid() will return @c false.
 */
-class KDE_EXPORT PhoneSlot
+class TDE_EXPORT PhoneSlot
 {
 friend class PilotAddress;
 protected:
@@ -125,7 +125,7 @@ private:
 } ;
 
 
-class KDE_EXPORT PilotAddressInfo : public PilotAddressInfo_
+class TDE_EXPORT PilotAddressInfo : public PilotAddressInfo_
 {
 public:
 	PilotAddressInfo(PilotDatabase *d) : PilotAddressInfo_(d)
@@ -187,7 +187,7 @@ public:
  * this order is kept. In other languages, main can replaced with
  * Corporation.
  */
-class KDE_EXPORT PilotAddress : public PilotRecordBase
+class TDE_EXPORT PilotAddress : public PilotRecordBase
 {
 public:
 	PilotAddress(PilotRecord *rec = 0L);
diff --git a/lib/pilotAppInfo.h b/lib/pilotAppInfo.h
index 43e8eb5..2d64cdd 100644
--- a/lib/pilotAppInfo.h
+++ b/lib/pilotAppInfo.h
@@ -47,7 +47,7 @@
 *
 * This class encapsulates the basic category table manipulations.
 */
-class KDE_EXPORT PilotAppInfoBase
+class TDE_EXPORT PilotAppInfoBase
 {
 protected:
 	/** Initialize class members after reading header, to alias data elsewhere.
diff --git a/lib/pilotDatabase.h b/lib/pilotDatabase.h
index 7c952d2..6698b0c 100644
--- a/lib/pilotDatabase.h
+++ b/lib/pilotDatabase.h
@@ -47,7 +47,7 @@
  * PilotDatabase methods when finished with them!
  */
 
-class KDE_EXPORT PilotDatabase
+class TDE_EXPORT PilotDatabase
 {
 public:
 	PilotDatabase(const TQString &name = TQString());
diff --git a/lib/pilotDateEntry.h b/lib/pilotDateEntry.h
index 34deb78..1d34991 100644
--- a/lib/pilotDateEntry.h
+++ b/lib/pilotDateEntry.h
@@ -69,7 +69,7 @@ public:
 };
 
 /** This class is a wrapper for pilot-link's datebook entries (struct Appointment). */
-class KDE_EXPORT PilotDateEntry : public PilotRecordBase
+class TDE_EXPORT PilotDateEntry : public PilotRecordBase
 {
 public:
 	/** Constructor. Zeroes out the appointment. */
diff --git a/lib/pilotLocalDatabase.h b/lib/pilotLocalDatabase.h
index abc6ee6..4679a72 100644
--- a/lib/pilotLocalDatabase.h
+++ b/lib/pilotLocalDatabase.h
@@ -40,7 +40,7 @@
 * PilotLocalDatabase represents databases in the same binary format
 * as on the handheld but which are stored on local disk.
 */
-class KDE_EXPORT PilotLocalDatabase : public PilotDatabase
+class TDE_EXPORT PilotLocalDatabase : public PilotDatabase
 {
 public:
 	/**
diff --git a/lib/pilotMemo.h b/lib/pilotMemo.h
index b8328f5..c84903d 100644
--- a/lib/pilotMemo.h
+++ b/lib/pilotMemo.h
@@ -36,7 +36,7 @@
 #include "pilotRecord.h"
 #include "pilotAppInfo.h"
 
-class KDE_EXPORT PilotMemo : public PilotRecordBase
+class TDE_EXPORT PilotMemo : public PilotRecordBase
 {
 public:
 	/**
diff --git a/lib/pilotRecord.h b/lib/pilotRecord.h
index fdf8a33..1454966 100644
--- a/lib/pilotRecord.h
+++ b/lib/pilotRecord.h
@@ -45,7 +45,7 @@
 * a common base class collecting methods to manipulate those
 * common characteristics.
 */
-class KDE_EXPORT PilotRecordBase
+class TDE_EXPORT PilotRecordBase
 {
 public:
 	/** Constructor. Initialize the characteristics to the
@@ -232,7 +232,7 @@ private:
 * This binary blob only exposes the data via the data() and size() functions,
 * and also exposes the common characteristics of all entries.
 */
-class KDE_EXPORT PilotRecord : public PilotRecordBase
+class TDE_EXPORT PilotRecord : public PilotRecordBase
 {
 public:
 	/** Constructor. Using the given @p data and @p length, create
diff --git a/lib/pilotSerialDatabase.h b/lib/pilotSerialDatabase.h
index 66faf53..5dfac65 100644
--- a/lib/pilotSerialDatabase.h
+++ b/lib/pilotSerialDatabase.h
@@ -45,7 +45,7 @@ class KPilotDeviceLink;
 * PilotSerialDatabase represents databases stored on the handheld
 * and accessed through the SLP / DLP protocol.
 */
-class KDE_EXPORT PilotSerialDatabase : public PilotDatabase
+class TDE_EXPORT PilotSerialDatabase : public PilotDatabase
 {
 friend class KPilotDeviceLink;
 protected:
diff --git a/lib/pilotTodoEntry.h b/lib/pilotTodoEntry.h
index e6bb05d..395d03b 100644
--- a/lib/pilotTodoEntry.h
+++ b/lib/pilotTodoEntry.h
@@ -46,7 +46,7 @@
 */
 
 /** A decoded ToDo item. */
-class KDE_EXPORT PilotTodoEntry : public PilotRecordBase
+class TDE_EXPORT PilotTodoEntry : public PilotRecordBase
 {
 public:
 	/** Create an empty ToDo item. All attributes are 0. */
diff --git a/lib/plugin.h b/lib/plugin.h
index f3012c4..9187212 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -75,7 +75,7 @@ namespace Pilot
 * seems a little foolish.
 *
 */
-class KDE_EXPORT ConduitConfigBase : public TQObject
+class TDE_EXPORT ConduitConfigBase : public TQObject
 {
 TQ_OBJECT
   
@@ -192,7 +192,7 @@ signals:
 * by the conduit and offer rollback functionality if we think the
 * conduit has behaved improperly.
 */
-class KDE_EXPORT CUDCounter
+class TDE_EXPORT CUDCounter
 {
 public:
 	/** Create new counter initialized to 0, and be told what
@@ -258,7 +258,7 @@ private:
 * conduit can read/write metadata and local settings.
 */
 
-class KDE_EXPORT ConduitAction : public SyncAction
+class TDE_EXPORT ConduitAction : public SyncAction
 {
 TQ_OBJECT
   
@@ -388,7 +388,7 @@ protected:
 } ;
 
 /** A namespace containing only static helper methods. */
-namespace PluginUtility KDE_EXPORT
+namespace PluginUtility TDE_EXPORT
 {
 	/** Searches the argument list for --foo=bar and returns bar, TQString() if not found.
 	* Don't include the -- in the argname. */
diff --git a/lib/syncAction.h b/lib/syncAction.h
index 3ac16e8..a0ed1e3 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -47,7 +47,7 @@ class TQTimer;
 class KPilotUser;
 class SyncAction;
 
-class KDE_EXPORT SyncAction : public TQObject
+class TDE_EXPORT SyncAction : public TQObject
 {
 TQ_OBJECT