diff --git a/src/knutanalog.cpp b/src/knutanalog.cpp
index 8786e71..2cbbf26 100644
--- a/src/knutanalog.cpp
+++ b/src/knutanalog.cpp
@@ -34,7 +34,7 @@
 #include <tqpaintdevice.h>
 #include <tqcolor.h>
 
-#include <kapp.h>
+#include <tdeapplication.h>
 
 
 
diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index b565ec5..c8fd486 100644
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -18,10 +18,9 @@
 #include "knutdock.h"
 #include "knutnet.h"
 
-//#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <tdeaboutapplication.h>
 #include <tdemessagebox.h>
 
@@ -31,7 +30,6 @@
 #include <tqbitmap.h>
 #include <tqstring.h>
 
-
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/knutfrontpanel.cpp b/src/knutfrontpanel.cpp
index 9aac1e9..b877d57 100644
--- a/src/knutfrontpanel.cpp
+++ b/src/knutfrontpanel.cpp
@@ -21,14 +21,13 @@
 #include "knutnet.h"
 
 #include <tdelocale.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 
 #include <tqtooltip.h>
 #include <tqstring.h>
 #include <tqpaintdevice.h>
 #include <tqlayout.h>
 #include <tqlcdnumber.h>
-//#include <tqframe.h>
 #include <tqlabel.h>
 #include <tqcolor.h>
 #include <tqfont.h>
diff --git a/src/knutmainwindow.h b/src/knutmainwindow.h
index 2130112..712c713 100644
--- a/src/knutmainwindow.h
+++ b/src/knutmainwindow.h
@@ -31,15 +31,12 @@
 #include "knutanalog.h"
 #include "knutpanelmeter.h"
 
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-//#include <kprogress.h>
-
 
 #include <tqwidget.h>
 #include <tqdatetime.h>
-//#include <tqprogressbar.h>
 
 
 class TQString;
diff --git a/src/knutnet.h b/src/knutnet.h
index 393adac..8483e00 100644
--- a/src/knutnet.h
+++ b/src/knutnet.h
@@ -18,17 +18,13 @@
 #ifndef KNUTNET_H
 #define KNUTNET_H
 
-//Od verze 3 je kapp jen odkaz na kapplication
-//Since version 3 is kapp pointer on kapplication only
-//#include <tdeapplication.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 
 #include <tqobject.h>
 #include <tqsocket.h>
 #include <tqsocketdevice.h>
 #include <tqnetworkprotocol.h>
 #include <tqmutex.h>
-
 #include <tqvaluevector.h>
 
 
diff --git a/src/knutprintupsvar.h b/src/knutprintupsvar.h
index eb85e39..c8c4a5a 100644
--- a/src/knutprintupsvar.h
+++ b/src/knutprintupsvar.h
@@ -18,9 +18,7 @@
 #ifndef KNUTPRINTUPSVAR_H
 #define KNUTPRINTUPSVAR_H
 
-//Od verze 3 je kapp jen odkaz na kapplication
-//#include <tdeapplication.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 #include "knutupsdata.h"
 #include "knutnet.h"
 
diff --git a/src/knutrwvar.cpp b/src/knutrwvar.cpp
index 4f9c2f9..53100bd 100644
--- a/src/knutrwvar.cpp
+++ b/src/knutrwvar.cpp
@@ -20,14 +20,11 @@
 #include "knutvardata.h"
 #include "knutprintupsvar.h"
 
-//Od verze 3 je kapp jen odkaz na kapplication
-//#include <tdeapplication.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 
-
 #include <tqframe.h>
 #include <tqlabel.h>
 #include <tqstring.h>
diff --git a/src/main.cpp b/src/main.cpp
index fcf30a9..51579aa 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <tdelocale.h>
-#include <kapp.h>
+#include <tdeapplication.h>
 #include <kuniqueapplication.h> 
 
 #include "knutclient.h"