diff --git a/ChangeLog b/ChangeLog
index f2b3739..66598e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1451,7 +1451,7 @@ KPilot Developer's notes for March 12th, 2003
 2003-3-4  Adriaan de Groot
 * Welcome back to David Mott, author of several patches already and
   ready to dive into the code again for GJJs. Happy distraction, dude.
-* [vcal-conduitbase.cc] Checked against wrong KDE_VERSION. [BRANCH]
+* [vcal-conduitbase.cc] Checked against wrong TDE_VERSION. [BRANCH]
 * Various merging from BRANCH to HEAD. Layout fixups here and there.
 * Test mode in the vcal conduit by default uses local databases from
   /tmp.
@@ -1775,7 +1775,7 @@ KPilot Developer's notes for January 17th, 2003
 2003-1-10  Adriaan de Groot
 * [kpilot/interactivesync.cc] Some strlcpy problems when compiling HEAD
   (or BRANCH) KPilot on a KDE 3.0 system. Since we don't maintain branches,
-  backwards compatibility in HEAD is essential. Added #if KDE_VERSION < 310.
+  backwards compatibility in HEAD is essential. Added #if TDE_VERSION < 310.
 * [lib/kpilotlink.cc] Might have found the source of the KPilot-hangs-with-USB
   problems. There's a note in the QSocketNotifier docs saying not to disable
   read-notifiers.  I did anyway, and it never caused problems before.
diff --git a/conduits/sysinfoconduit/sysinfo-conduit.cc b/conduits/sysinfoconduit/sysinfo-conduit.cc
index 3ee13e2..4d1a35f 100644
--- a/conduits/sysinfoconduit/sysinfo-conduit.cc
+++ b/conduits/sysinfoconduit/sysinfo-conduit.cc
@@ -413,8 +413,8 @@ void SysInfoConduit::pcVersionInfo()
 				.tqarg(TQString::tqfromLatin1(name.machine));
 			fValues[CSL1("hostname")] = CSL1("%2").tqarg(TQString::tqfromLatin1(name.nodename));
 		}
-#ifdef KDE_VERSION_STRING
-		fValues[CSL1("kde")] = TQString::tqfromLatin1(KDE_VERSION_STRING);
+#ifdef TDE_VERSION_STRING
+		fValues[CSL1("kde")] = TQString::tqfromLatin1(TDE_VERSION_STRING);
 #endif
 #ifdef TQT_VERSION_STR
 		fValues[CSL1("qt")] = TQString::tqfromLatin1(TQT_VERSION_STR);
diff --git a/kpilot/addressWidget.cc b/kpilot/addressWidget.cc
index 676e66d..fd3c54f 100644
--- a/kpilot/addressWidget.cc
+++ b/kpilot/addressWidget.cc
@@ -183,7 +183,7 @@ void AddressWidget::hideComponent()
 			<< endl;
 #endif
 
-#if KDE_VERSION<220
+#if TDE_VERSION<220
 		s = i18n("There are still %1 address editing windows open.")
 			.tqarg(TQString::number(fPendingAddresses));
 #else
diff --git a/kpilot/dbFlagsEditor_base.ui.h b/kpilot/dbFlagsEditor_base.ui.h
index 74c3b5a..fb4fe77 100644
--- a/kpilot/dbFlagsEditor_base.ui.h
+++ b/kpilot/dbFlagsEditor_base.ui.h
@@ -6,7 +6,7 @@
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
-#ifndef KDE_VERSION
+#ifndef TDE_VERSION
 #include <kdeversion.h>
 #endif
 
diff --git a/kpilot/logFile.cc b/kpilot/logFile.cc
index e047657..b6fab0c 100644
--- a/kpilot/logFile.cc
+++ b/kpilot/logFile.cc
@@ -80,8 +80,8 @@ LogFile::LogFile() : DCOPObject("LogIface"), TQObject(), fOutfile(0L), fSyncing(
 		.tqarg(TQString())
 #endif
 		)<<endl;
-#ifdef KDE_VERSION_STRING
-	fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::tqfromLatin1(KDE_VERSION_STRING)) )<<endl;
+#ifdef TDE_VERSION_STRING
+	fLogStream<<(CSL1("Version: KDE %1" ).tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING)) )<<endl;
 #endif
 #ifdef TQT_VERSION_STR
 	fLogStream<<(CSL1("Version: TQt %1" ).tqarg(TQString::tqfromLatin1(TQT_VERSION_STR)) )<<endl;
diff --git a/kpilot/logWidget.cc b/kpilot/logWidget.cc
index 1ff7ae9..dbd9c5f 100644
--- a/kpilot/logWidget.cc
+++ b/kpilot/logWidget.cc
@@ -106,9 +106,9 @@ LogWidget::LogWidget(TQWidget * parent) :
 		.tqarg(TQString())
 #endif
 		);
-#ifdef KDE_VERSION_STRING
+#ifdef TDE_VERSION_STRING
 	initialText.append(CSL1("<b>Version:</b> KDE %1" TE_EOL)
-		.tqarg(TQString::tqfromLatin1(KDE_VERSION_STRING)));
+		.tqarg(TQString::tqfromLatin1(TDE_VERSION_STRING)));
 #endif
 #ifdef TQT_VERSION_STR
 	initialText.append(CSL1("<b>Version:</b> TQt %1" TE_EOL)
diff --git a/kpilot/pilotDaemon.cc b/kpilot/pilotDaemon.cc
index 8e1c8dc..bbd8233 100644
--- a/kpilot/pilotDaemon.cc
+++ b/kpilot/pilotDaemon.cc
@@ -1210,7 +1210,7 @@ void PilotDaemon::slotRunKPilot()
 
 	if (KApplication::startServiceByDesktopName(CSL1("kpilot"),
 			TQString(), &kpilotError, &kpilotDCOP, &kpilotPID
-#if (KDE_VERSION >= 220)
+#if (TDE_VERSION >= 220)
 			// Startup notification added in 2.2
 			, ""
 #endif
diff --git a/kpilot/todoWidget.cc b/kpilot/todoWidget.cc
index a095685..4632e69 100644
--- a/kpilot/todoWidget.cc
+++ b/kpilot/todoWidget.cc
@@ -170,7 +170,7 @@ void TodoWidget::showComponent()
 			<< endl;
 #endif
 
-#if KDE_VERSION<220
+#if TDE_VERSION<220
 		s = i18n("There are still %1 to-do editing windows open.")
 			.tqarg(TQString::number(fPendingTodos));
 #else