From 37fdbaf53a238a96aff48f31f47b6064ceae4b98 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:47:09 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 knetworkmanager-0.8/src/devicetraycomponent.cpp             | 2 +-
 .../src/knetworkmanager-cellular_device_tray.cpp            | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-connection.cpp      | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-connection_dbus.cpp | 2 +-
 .../src/knetworkmanager-connection_editor.cpp               | 2 +-
 .../src/knetworkmanager-connection_secrets_dbus.cpp         | 2 +-
 .../src/knetworkmanager-connection_setting.cpp              | 2 +-
 .../src/knetworkmanager-connection_setting_8021x.cpp        | 2 +-
 .../src/knetworkmanager-connection_setting_cdma.cpp         | 2 +-
 .../src/knetworkmanager-connection_setting_gsm.cpp          | 2 +-
 .../src/knetworkmanager-connection_setting_info.cpp         | 2 +-
 .../src/knetworkmanager-connection_setting_ipv4.cpp         | 2 +-
 .../src/knetworkmanager-connection_setting_ppp.cpp          | 2 +-
 .../src/knetworkmanager-connection_setting_serial.cpp       | 2 +-
 .../src/knetworkmanager-connection_setting_vpn.cpp          | 2 +-
 .../src/knetworkmanager-connection_setting_wired.cpp        | 2 +-
 .../src/knetworkmanager-connection_setting_wireless.cpp     | 2 +-
 ...knetworkmanager-connection_setting_wireless_security.cpp | 2 +-
 ...kmanager-connection_setting_wireless_security_widget.cpp | 2 +-
 .../knetworkmanager-connection_setting_wireless_widget.cpp  | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp     | 6 +++---
 .../src/knetworkmanager-generic_connection.cpp              | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp    | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp        | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp   | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-storage.cpp         | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-tray.cpp            | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager-vpn_connection.cpp  | 2 +-
 .../src/knetworkmanager-vpnauthenticationdialog.cpp         | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp      | 2 +-
 knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp      | 2 +-
 .../src/knetworkmanager-wired_connection.cpp                | 2 +-
 .../src/knetworkmanager-wired_device_tray.cpp               | 2 +-
 .../src/knetworkmanager-wireless_connection.cpp             | 2 +-
 .../src/knetworkmanager-wireless_device_tray.cpp            | 2 +-
 .../src/knetworkmanager-wireless_menuitem.cpp               | 4 ++--
 knetworkmanager-0.8/src/knetworkmanager.cpp                 | 4 ++--
 knetworkmanager-0.8/src/traycomponent.cpp                   | 2 +-
 knetworkmanager-0.8/src/vpn_tray_component.cpp              | 2 +-
 .../vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp     | 2 +-
 .../vpn-plugins/pptp/src/Makefile.am.automake               | 2 +-
 .../vpn-plugins/pptp/src/knetworkmanager-pptp.cpp           | 2 +-
 .../strongswan/src/knetworkmanager-strongswan.cpp           | 2 +-
 .../vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp           | 4 ++--
 44 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/knetworkmanager-0.8/src/devicetraycomponent.cpp b/knetworkmanager-0.8/src/devicetraycomponent.cpp
index dbbf1ce..a13f674 100644
--- a/knetworkmanager-0.8/src/devicetraycomponent.cpp
+++ b/knetworkmanager-0.8/src/devicetraycomponent.cpp
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "devicetraycomponent.h"
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksystemtray.h>
 
 #include "knetworkmanager-device.h"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp
index cae5ce3..f7c1031 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp
@@ -27,7 +27,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TQt DBus
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection.cpp
index f0da309..4852198 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection.cpp
@@ -27,7 +27,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_dbus.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_dbus.cpp
index ecca0f5..b91b772 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_dbus.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_dbus.cpp
@@ -27,7 +27,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp
index 39d70f8..5be7652 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_editor.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 // knm headers
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
index aa64666..c415fe8 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_secrets_dbus.cpp
@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting.cpp
index 50d7423..63b3dd5 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_8021x.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_8021x.cpp
index 4904f01..37d1dcc 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_8021x.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_8021x.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma.cpp
index 854590c..0904037 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_cdma.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm.cpp
index cd38c3f..399222c 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_gsm.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info.cpp
index 225d002..9f3b503 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_info.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4.cpp
index 15f8978..fcaa78e 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ipv4.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp.cpp
index 257a012..e3b790c 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_ppp.cpp
@@ -31,7 +31,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial.cpp
index 4861e7b..788e7eb 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_serial.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn.cpp
index 22e8b20..1fe2401 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_vpn.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wired.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wired.cpp
index 03aa61f..5e5874e 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wired.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wired.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless.cpp
index 2e1db8e..a56ed12 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless.cpp
@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security.cpp
index a01f8f6..4678b9b 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security.cpp
@@ -28,7 +28,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQT_DBus headers*/
 #include <tqdbusdata.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
index 1adea03..3bfab1b 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
@@ -36,7 +36,7 @@
 
 /* kde headers */
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
index 35898e7..3c62a1c 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-connection_setting_wireless_widget.cpp
@@ -32,7 +32,7 @@
 #include <klineedit.h>
 #include <tdelistviewsearchline.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpushbutton.h>
 
 #include "knetworkmanager-connection.h"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
index c738930..44d4834 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-device_tray.cpp
@@ -44,14 +44,14 @@ class WirelessDialog;
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kiconeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 // KNM includes
 #include "knetworkmanager-device_tray.h"
diff --git a/knetworkmanager-0.8/src/knetworkmanager-generic_connection.cpp b/knetworkmanager-0.8/src/knetworkmanager-generic_connection.cpp
index 9f9b12d..988bf5f 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-generic_connection.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-generic_connection.cpp
@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
index cef0eb9..77ed18a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menu_subhead.cpp
@@ -40,13 +40,13 @@ class WirelessDialog;
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "knetworkmanager-menu_subhead.h"
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
index fc67f7f..6ffecb3 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp
@@ -41,13 +41,13 @@
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqdbusobjectpath.h>
 #include <tqdbuserror.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
index 5e6ca54..57ee8c1 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-pluginmanager.cpp
@@ -25,7 +25,7 @@
 #include <kplugininfo.h>
 #include <tdeparts/componentfactory.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "knetworkmanager-pluginmanager.h"
 
diff --git a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
index 87f1694..7044237 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-storage.cpp
@@ -25,7 +25,7 @@
 
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstaticdeleter.h>
 #include <kdebug.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
index 6a28d88..f10582a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp
@@ -45,13 +45,13 @@ class WirelessDialog;
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqpushbutton.h>
 #include <tqlayout.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpn_connection.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpn_connection.cpp
index e15f2a9..b2fb68c 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpn_connection.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpn_connection.cpp
@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
index 22f9d89..ac61067 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnauthenticationdialog.cpp
@@ -30,7 +30,7 @@
 #include <tqwidgetstack.h>
 #include <klineedit.h>
 #include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqobjectlist.h>
 #include <tqcheckbox.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
index 28ab689..dcf26f2 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnmanager.cpp
@@ -25,7 +25,7 @@
 
 #define SERVICE_DIR "/etc/NetworkManager/VPN"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqdir.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
index 77336c6..efedce3 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-vpnservice.cpp
@@ -29,7 +29,7 @@
 #include <tdeconfig.h>
 #include <tqdom.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstddirs.h>
 #include <kprocess.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wired_connection.cpp b/knetworkmanager-0.8/src/knetworkmanager-wired_connection.cpp
index 6eff4ee..98307b8 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wired_connection.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wired_connection.cpp
@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp
index 7c3ee1f..f566e9a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp
@@ -37,7 +37,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TQt DBus
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_connection.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_connection.cpp
index b11879f..ad9acbe 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_connection.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_connection.cpp
@@ -29,7 +29,7 @@
 
 /* kde headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
index 1def62c..3a29b75 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp
@@ -39,7 +39,7 @@
 // KDE includes
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 
 // QT DBus
diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
index ddf08b3..836e11a 100644
--- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp
@@ -38,13 +38,13 @@
 #include <kdialogbase.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <khelpmenu.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <NetworkManager.h>
 
 #include <tqdbusobjectpath.h>
diff --git a/knetworkmanager-0.8/src/knetworkmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager.cpp
index 81532e0..72a7ebc 100644
--- a/knetworkmanager-0.8/src/knetworkmanager.cpp
+++ b/knetworkmanager-0.8/src/knetworkmanager.cpp
@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // NM includes
 #include <NetworkManager.h>
@@ -67,7 +67,7 @@
 #include <tqobject.h>
 
 // KDE includes
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 char active_vpn_prev = 0;
diff --git a/knetworkmanager-0.8/src/traycomponent.cpp b/knetworkmanager-0.8/src/traycomponent.cpp
index 26f31b7..73fb6d3 100644
--- a/knetworkmanager-0.8/src/traycomponent.cpp
+++ b/knetworkmanager-0.8/src/traycomponent.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "traycomponent.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksystemtray.h>
 
 TrayComponent::TrayComponent(KSystemTray * parent, const char * name )
diff --git a/knetworkmanager-0.8/src/vpn_tray_component.cpp b/knetworkmanager-0.8/src/vpn_tray_component.cpp
index b568c73..b02412f 100644
--- a/knetworkmanager-0.8/src/vpn_tray_component.cpp
+++ b/knetworkmanager-0.8/src/vpn_tray_component.cpp
@@ -24,7 +24,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 // TQt DBus
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
index f043aad..0f265fe 100644
--- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake b/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake
index 60eb42d..8969488 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake
@@ -6,7 +6,7 @@ INCLUDES = $(PACKAGE_CFLAGS) $(all_includes)
 
 # rules for creating .h and .cpp from .ui
 %.cpp: %.ui %.h
-	$(UIC) -tr tr2i18n -pch klocale.h -o $@ -impl $*.h $<
+	$(UIC) -tr tr2i18n -pch tdelocale.h -o $@ -impl $*.h $<
 
 %.h: %.ui
 	$(UIC) -o $@ $<
diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
index 0be9f04..a8124da 100644
--- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
index 17ba6c8..914f324 100644
--- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp
@@ -22,7 +22,7 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>
diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
index adac93c..5f1e47f 100644
--- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
+++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp
@@ -23,8 +23,8 @@
  *
  **************************************************************************/
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqmessagebox.h>
 #include <tqbutton.h>
 #include <kcombobox.h>