diff --git a/clients/tde/src/app/main.cpp b/clients/tde/src/app/main.cpp
index e156f4f..8a5bf80 100644
--- a/clients/tde/src/app/main.cpp
+++ b/clients/tde/src/app/main.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "define.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdelocale.h>
 #include <kurl.h>
 #include <tdeconfig.h>
diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index 4d59c4c..46119f2 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -8,11 +8,11 @@
 #include <cassert>
 using namespace std;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqtimer.h>
diff --git a/clients/tde/src/app/views/instrumentview.cpp b/clients/tde/src/app/views/instrumentview.cpp
index b4e7e00..88f2329 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -8,7 +8,7 @@
 #include <klibloader.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdemdimainfrm.h>
 
 namespace RemoteLab {
diff --git a/clients/tde/src/dialogs/selectserverdlg.cpp b/clients/tde/src/dialogs/selectserverdlg.cpp
index c800863..86fea06 100644
--- a/clients/tde/src/dialogs/selectserverdlg.cpp
+++ b/clients/tde/src/dialogs/selectserverdlg.cpp
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <tdelocale.h>
 #include <kdebug.h>
@@ -31,7 +31,7 @@
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "selectserverdlg.h"
 #include "selectserverdlgbase.h"
diff --git a/clients/tde/src/part/adminconsole/part.cpp b/clients/tde/src/part/adminconsole/part.cpp
index 6de43d4..847ce68 100644
--- a/clients/tde/src/part/adminconsole/part.cpp
+++ b/clients/tde/src/part/adminconsole/part.cpp
@@ -23,12 +23,12 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/clients/tde/src/part/adminusermgmt/part.cpp b/clients/tde/src/part/adminusermgmt/part.cpp
index bf17771..a47230e 100644
--- a/clients/tde/src/part/adminusermgmt/part.cpp
+++ b/clients/tde/src/part/adminusermgmt/part.cpp
@@ -23,12 +23,12 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/clients/tde/src/part/commanalyzer/part.cpp b/clients/tde/src/part/commanalyzer/part.cpp
index 5368688..ac95cd1 100644
--- a/clients/tde/src/part/commanalyzer/part.cpp
+++ b/clients/tde/src/part/commanalyzer/part.cpp
@@ -4,10 +4,10 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/clients/tde/src/part/fpgaprogram/part.cpp b/clients/tde/src/part/fpgaprogram/part.cpp
index 60f4790..c3b2f4c 100644
--- a/clients/tde/src/part/fpgaprogram/part.cpp
+++ b/clients/tde/src/part/fpgaprogram/part.cpp
@@ -23,12 +23,12 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/clients/tde/src/part/fpgaview/part.cpp b/clients/tde/src/part/fpgaview/part.cpp
index 8360677..d393af4 100644
--- a/clients/tde/src/part/fpgaview/part.cpp
+++ b/clients/tde/src/part/fpgaview/part.cpp
@@ -23,10 +23,10 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <tdemdimainfrm.h>
 #include <kstatusbar.h>
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index 5486d9d..62d3f0c 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -4,10 +4,10 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
diff --git a/clients/tde/src/part/sensormonitor/part.cpp b/clients/tde/src/part/sensormonitor/part.cpp
index 73daa35..61d7b94 100644
--- a/clients/tde/src/part/sensormonitor/part.cpp
+++ b/clients/tde/src/part/sensormonitor/part.cpp
@@ -23,12 +23,12 @@
 #include "define.h"
 #include "part.h"
 
-#include <kaboutdata.h>   //::createAboutData()
+#include <tdeaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
 #include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>  //::start()
+#include <tdemessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
diff --git a/lib/libtdekrb/debian/rules b/lib/libtdekrb/debian/rules
index 242fb2c..0dd2ed9 100755
--- a/lib/libtdekrb/debian/rules
+++ b/lib/libtdekrb/debian/rules
@@ -9,7 +9,7 @@ DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
 DEB_CONFIGURE_PREFIX := /opt/trinity
 DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
 
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama --enable-exceptions $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 post-patches:: debian/stamp-bootstrap
 
diff --git a/lib/libtqtrla/src/tqtrla.cpp b/lib/libtqtrla/src/tqtrla.cpp
index 5830f60..a554007 100644
--- a/lib/libtqtrla/src/tqtrla.cpp
+++ b/lib/libtqtrla/src/tqtrla.cpp
@@ -24,7 +24,7 @@
 #include <tqbuffer.h>
 
 #include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 // RAJA UNCOMMENT ME
 //#define SERVER_TIMEOUT_MS 10000
diff --git a/servers/admin_sys_ctl_server_lin/src/main.cpp b/servers/admin_sys_ctl_server_lin/src/main.cpp
index 4456169..d1a0279 100644
--- a/servers/admin_sys_ctl_server_lin/src/main.cpp
+++ b/servers/admin_sys_ctl_server_lin/src/main.cpp
@@ -31,10 +31,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 
 #include "admin_sys_ctl.h"
diff --git a/servers/admin_user_mgmt_server_lin/src/main.cpp b/servers/admin_user_mgmt_server_lin/src/main.cpp
index 853d5bf..766f724 100644
--- a/servers/admin_user_mgmt_server_lin/src/main.cpp
+++ b/servers/admin_user_mgmt_server_lin/src/main.cpp
@@ -31,10 +31,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 
 #include "admin_user_mgmt.h"
diff --git a/servers/auth_server_lin/src/auth_conn.cpp b/servers/auth_server_lin/src/auth_conn.cpp
index b64d838..658397b 100644
--- a/servers/auth_server_lin/src/auth_conn.cpp
+++ b/servers/auth_server_lin/src/auth_conn.cpp
@@ -28,7 +28,7 @@
 #include <tqtimer.h>
 
 #include <tdelocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "auth_conn.h"
 
diff --git a/servers/auth_server_lin/src/main.cpp b/servers/auth_server_lin/src/main.cpp
index 0bdb21e..39d7327 100644
--- a/servers/auth_server_lin/src/main.cpp
+++ b/servers/auth_server_lin/src/main.cpp
@@ -27,10 +27,10 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include <ksimpleconfig.h>
 
diff --git a/servers/fpga_programming_server_lin/src/main.cpp b/servers/fpga_programming_server_lin/src/main.cpp
index 9d922c2..7f4a079 100644
--- a/servers/fpga_programming_server_lin/src/main.cpp
+++ b/servers/fpga_programming_server_lin/src/main.cpp
@@ -31,10 +31,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 
 #include "fpga_conn.h"
diff --git a/servers/fpga_server_lin/src/main.cpp b/servers/fpga_server_lin/src/main.cpp
index 4b19ac3..6dd8c6b 100644
--- a/servers/fpga_server_lin/src/main.cpp
+++ b/servers/fpga_server_lin/src/main.cpp
@@ -31,10 +31,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 
 #include "fpga_conn.h"
diff --git a/servers/gpib_server_lin/src/main.cpp b/servers/gpib_server_lin/src/main.cpp
index 10342ba..fe6fd34 100644
--- a/servers/gpib_server_lin/src/main.cpp
+++ b/servers/gpib_server_lin/src/main.cpp
@@ -31,10 +31,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 
 #include "gpib_conn.h"
diff --git a/servers/sensor_monitor_server_lin/src/main.cpp b/servers/sensor_monitor_server_lin/src/main.cpp
index 673142c..7b0c141 100644
--- a/servers/sensor_monitor_server_lin/src/main.cpp
+++ b/servers/sensor_monitor_server_lin/src/main.cpp
@@ -31,10 +31,10 @@
 #include <tqfile.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 
 #include "sensor_conn.h"