diff --git a/clients/tde/src/app/main.cpp b/clients/tde/src/app/main.cpp
index 6334312..e156f4f 100644
--- a/clients/tde/src/app/main.cpp
+++ b/clients/tde/src/app/main.cpp
@@ -25,7 +25,7 @@
 #include <kapplication.h>
 #include <kinputdialog.h>
 #include <kcmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include "remotemdi.h"
diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index 7630c66..4d59c4c 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -9,7 +9,7 @@
 using namespace std;
 
 #include <kapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
diff --git a/clients/tde/src/app/views/instrumentview.cpp b/clients/tde/src/app/views/instrumentview.cpp
index 74c75be..b4e7e00 100644
--- a/clients/tde/src/app/views/instrumentview.cpp
+++ b/clients/tde/src/app/views/instrumentview.cpp
@@ -7,7 +7,7 @@
 
 #include <klibloader.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmessagebox.h>
 #include <tdemdimainfrm.h>
 
diff --git a/clients/tde/src/dialogs/selectserverdlg.cpp b/clients/tde/src/dialogs/selectserverdlg.cpp
index 773ea98..c800863 100644
--- a/clients/tde/src/dialogs/selectserverdlg.cpp
+++ b/clients/tde/src/dialogs/selectserverdlg.cpp
@@ -24,7 +24,7 @@
 
 #include <kapplication.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/clients/tde/src/part/adminconsole/part.cpp b/clients/tde/src/part/adminconsole/part.cpp
index 1bc460f..6de43d4 100644
--- a/clients/tde/src/part/adminconsole/part.cpp
+++ b/clients/tde/src/part/adminconsole/part.cpp
@@ -25,7 +25,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>  //::start()
diff --git a/clients/tde/src/part/adminconsole/terminatedlg.cpp b/clients/tde/src/part/adminconsole/terminatedlg.cpp
index 9b9afd7..0ac4a4f 100644
--- a/clients/tde/src/part/adminconsole/terminatedlg.cpp
+++ b/clients/tde/src/part/adminconsole/terminatedlg.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <knuminput.h>
diff --git a/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp b/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
index 0a10668..35b9064 100644
--- a/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
+++ b/clients/tde/src/part/adminusermgmt/groupauthdlg.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <ktextedit.h>
 #include <knuminput.h>
diff --git a/clients/tde/src/part/adminusermgmt/part.cpp b/clients/tde/src/part/adminusermgmt/part.cpp
index 8de3a70..bf17771 100644
--- a/clients/tde/src/part/adminusermgmt/part.cpp
+++ b/clients/tde/src/part/adminusermgmt/part.cpp
@@ -25,7 +25,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>  //::start()
diff --git a/clients/tde/src/part/commanalyzer/part.cpp b/clients/tde/src/part/commanalyzer/part.cpp
index 617c1eb..5368688 100644
--- a/clients/tde/src/part/commanalyzer/part.cpp
+++ b/clients/tde/src/part/commanalyzer/part.cpp
@@ -6,7 +6,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <kstatusbar.h>
diff --git a/clients/tde/src/part/fpgaprogram/part.cpp b/clients/tde/src/part/fpgaprogram/part.cpp
index 3539baf..60f4790 100644
--- a/clients/tde/src/part/fpgaprogram/part.cpp
+++ b/clients/tde/src/part/fpgaprogram/part.cpp
@@ -25,7 +25,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>  //::start()
diff --git a/clients/tde/src/part/fpgaview/part.cpp b/clients/tde/src/part/fpgaview/part.cpp
index c158a85..8360677 100644
--- a/clients/tde/src/part/fpgaview/part.cpp
+++ b/clients/tde/src/part/fpgaview/part.cpp
@@ -25,7 +25,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmessagebox.h>  //::start()
 #include <tdeparts/genericfactory.h>
 #include <tdemdimainfrm.h>
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp
index ea8c772..5486d9d 100644
--- a/clients/tde/src/part/scope/part.cpp
+++ b/clients/tde/src/part/scope/part.cpp
@@ -6,7 +6,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmessagebox.h>  //::start()
 #include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
diff --git a/clients/tde/src/part/sensormonitor/part.cpp b/clients/tde/src/part/sensormonitor/part.cpp
index 4e28b6b..73daa35 100644
--- a/clients/tde/src/part/sensormonitor/part.cpp
+++ b/clients/tde/src/part/sensormonitor/part.cpp
@@ -25,7 +25,7 @@
 
 #include <kaboutdata.h>   //::createAboutData()
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextedit.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>  //::start()
diff --git a/clients/tde/src/widgets/tracewidget.cpp b/clients/tde/src/widgets/tracewidget.cpp
index 617363e..b19ec7b 100644
--- a/clients/tde/src/widgets/tracewidget.cpp
+++ b/clients/tde/src/widgets/tracewidget.cpp
@@ -14,7 +14,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
 
 #define VERIFY_TRACE_ARRAY_SIZE if (traceNumber >= m_traceArray.count()) resizeTraceArray(traceNumber+1);
diff --git a/lib/libtdekrb/src/tdekrbclientsocket.cpp b/lib/libtdekrb/src/tdekrbclientsocket.cpp
index 2ada832..35544c2 100644
--- a/lib/libtdekrb/src/tdekrbclientsocket.cpp
+++ b/lib/libtdekrb/src/tdekrbclientsocket.cpp
@@ -30,7 +30,7 @@
 #include <saslplug.h>
 #include <saslutil.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdekrbclientsocket.h"
 
diff --git a/lib/libtdekrb/src/tdekrbserversocket.cpp b/lib/libtdekrb/src/tdekrbserversocket.cpp
index c309da5..374bda0 100644
--- a/lib/libtdekrb/src/tdekrbserversocket.cpp
+++ b/lib/libtdekrb/src/tdekrbserversocket.cpp
@@ -30,7 +30,7 @@
 #include <saslplug.h>
 #include <saslutil.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdekrbserversocket.h"
 
diff --git a/lib/libtqtrla/src/tqtrla.cpp b/lib/libtqtrla/src/tqtrla.cpp
index 373c088..5830f60 100644
--- a/lib/libtqtrla/src/tqtrla.cpp
+++ b/lib/libtqtrla/src/tqtrla.cpp
@@ -23,7 +23,7 @@
 #include <tqwidget.h>
 #include <tqbuffer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmessagebox.h>
 
 // RAJA UNCOMMENT ME
diff --git a/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp b/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
index 7418de1..ec2740c 100644
--- a/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
+++ b/servers/admin_sys_ctl_server_lin/src/admin_sys_ctl.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "admin_sys_ctl.h"
 
diff --git a/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp b/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp
index 7779bed..29914bd 100644
--- a/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp
+++ b/servers/admin_user_mgmt_server_lin/src/admin_user_mgmt.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.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 52f950a..b64d838 100644
--- a/servers/auth_server_lin/src/auth_conn.cpp
+++ b/servers/auth_server_lin/src/auth_conn.cpp
@@ -27,7 +27,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcmdlineargs.h>
 
 #include "auth_conn.h"
diff --git a/servers/fpga_programming_server_lin/src/fpga_conn.cpp b/servers/fpga_programming_server_lin/src/fpga_conn.cpp
index cd8ed0b..84911c8 100644
--- a/servers/fpga_programming_server_lin/src/fpga_conn.cpp
+++ b/servers/fpga_programming_server_lin/src/fpga_conn.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "fpga_conn.h"
 
diff --git a/servers/fpga_server_lin/src/fpga_conn.cpp b/servers/fpga_server_lin/src/fpga_conn.cpp
index ea5c477..d8df085 100644
--- a/servers/fpga_server_lin/src/fpga_conn.cpp
+++ b/servers/fpga_server_lin/src/fpga_conn.cpp
@@ -36,7 +36,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "fpga_conn.h"
 
diff --git a/servers/gpib_server_lin/src/gpib_conn.cpp b/servers/gpib_server_lin/src/gpib_conn.cpp
index 34e5300..3fce6e2 100644
--- a/servers/gpib_server_lin/src/gpib_conn.cpp
+++ b/servers/gpib_server_lin/src/gpib_conn.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <gpib/ib.h>
 
diff --git a/servers/sensor_monitor_server_lin/src/sensor_conn.cpp b/servers/sensor_monitor_server_lin/src/sensor_conn.cpp
index e9298db..b65648d 100644
--- a/servers/sensor_monitor_server_lin/src/sensor_conn.cpp
+++ b/servers/sensor_monitor_server_lin/src/sensor_conn.cpp
@@ -38,7 +38,7 @@
 #include <tqtimer.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sensor_conn.h"