diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp
index 713562a..d115c89 100644
--- a/src/commands/edit/EventQuantizeCommand.cpp
+++ b/src/commands/edit/EventQuantizeCommand.cpp
@@ -40,7 +40,7 @@
 #include <tqstring.h>
 #include "base/BaseProperties.h"
 #include "gui/application/RosegardenApplication.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 namespace Rosegarden
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 028e7d3..e764273 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -24,7 +24,7 @@
 
 
 #include "RosegardenGUIDoc.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqxml.h>
 #include "sound/Midi.h"
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index e7292f7..284fea2 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -73,7 +73,7 @@
 #include <tqregexp.h>
 #include <tqstring.h>
 #include <tqtextcodec.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <sstream>
 #include <algorithm>
 
diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp
index e77fea1..0a427a5 100644
--- a/src/gui/application/RosegardenApplication.cpp
+++ b/src/gui/application/RosegardenApplication.cpp
@@ -31,7 +31,7 @@
 #include "gui/application/RosegardenDCOP.h"
 #include "gui/kdeext/KTmpStatusMsg.h"
 #include "RosegardenGUIApp.h"
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdemainwindow.h>
 #include <kmessagebox.h>
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 202c530..c2f3068 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -24,7 +24,7 @@
 
 
 #include "RosegardenGUIApp.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "gui/editors/segment/TrackEditor.h"
 #include "gui/editors/segment/TrackButtons.h"
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 970c6be..b47bd1d 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -24,7 +24,7 @@
 
 
 #include "RosegardenGUIApp.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "gui/editors/segment/TrackEditor.h"
 #include "gui/editors/segment/TrackButtons.h"
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index ea12c38..40adbc6 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -24,7 +24,7 @@
 
 
 #include "RosegardenGUIView.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "sound/Midi.h"
 #include "gui/editors/segment/TrackButtons.h"
diff --git a/src/gui/application/RosegardenIface.cpp b/src/gui/application/RosegardenIface.cpp
index b413612..55df175 100644
--- a/src/gui/application/RosegardenIface.cpp
+++ b/src/gui/application/RosegardenIface.cpp
@@ -38,7 +38,7 @@
 #include <tqcstring.h>
 #include <tqstring.h>
 #include <tqvaluelist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 
diff --git a/src/gui/application/SetWaitCursor.cpp b/src/gui/application/SetWaitCursor.cpp
index 9d4472d..3085cbc 100644
--- a/src/gui/application/SetWaitCursor.cpp
+++ b/src/gui/application/SetWaitCursor.cpp
@@ -33,7 +33,7 @@
 #include <kcursor.h>
 #include <tqcursor.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 namespace Rosegarden
 {
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 4f94cdd..e14f657 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -20,13 +20,13 @@
 */
 
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include "base/RealTime.h"
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 132df33..b4f5339 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -31,7 +31,7 @@
 #include "gui/widgets/CollapsingFrame.h"
 #include "misc/Strings.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
 #include <klocale.h>
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index 0c0a33d..06e7d1b 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioManagerDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/Event.h"
 #include "misc/Debug.h"
diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp
index 74cad6a..ceec4b5 100644
--- a/src/gui/dialogs/AudioSplitDialog.cpp
+++ b/src/gui/dialogs/AudioSplitDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "AudioSplitDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp
index cd1d889..b765532 100644
--- a/src/gui/dialogs/EventFilterDialog.cpp
+++ b/src/gui/dialogs/EventFilterDialog.cpp
@@ -37,7 +37,7 @@
 #include "gui/editors/notation/NotationStrings.h"
 #include "gui/editors/notation/NotePixmapFactory.h"
 #include "document/ConfigGroups.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <klocale.h>
diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp
index 42b6881..badf983 100644
--- a/src/gui/dialogs/ImportDeviceDialog.cpp
+++ b/src/gui/dialogs/ImportDeviceDialog.cpp
@@ -25,7 +25,7 @@
 
 #include "ImportDeviceDialog.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Strings.h"
diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp
index ce5ba1a..2ed7922 100644
--- a/src/gui/dialogs/InterpretDialog.cpp
+++ b/src/gui/dialogs/InterpretDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "InterpretDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "document/ConfigGroups.h"
diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp
index 0d5d27a..9d0a5ec 100644
--- a/src/gui/dialogs/LilyPondOptionsDialog.cpp
+++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp
@@ -28,7 +28,7 @@
 #include "gui/configuration/HeadersConfigurationPage.h"
 
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "document/ConfigGroups.h"
 #include "document/RosegardenGUIDoc.h"
diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp
index 45c2fb4..d30d247 100644
--- a/src/gui/dialogs/RescaleDialog.cpp
+++ b/src/gui/dialogs/RescaleDialog.cpp
@@ -36,7 +36,7 @@
 #include <tqstring.h>
 #include <tqvbox.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 namespace Rosegarden
diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp
index dbba02f..a3cf30e 100644
--- a/src/gui/dialogs/TextEventDialog.cpp
+++ b/src/gui/dialogs/TextEventDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TextEventDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Strings.h"
diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp
index 2573752..c502380 100644
--- a/src/gui/dialogs/TimeSignatureDialog.cpp
+++ b/src/gui/dialogs/TimeSignatureDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TimeSignatureDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "document/ConfigGroups.h"
diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp
index c0ff424..e6d04bf 100644
--- a/src/gui/dialogs/TriggerSegmentDialog.cpp
+++ b/src/gui/dialogs/TriggerSegmentDialog.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TriggerSegmentDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
 #include <klocale.h>
diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp
index 3c37239..9747418 100644
--- a/src/gui/dialogs/UseOrnamentDialog.cpp
+++ b/src/gui/dialogs/UseOrnamentDialog.cpp
@@ -25,7 +25,7 @@
 
 #include "UseOrnamentDialog.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
 #include <klocale.h>
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index f118bfb..c75400b 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -48,7 +48,7 @@
 #include "MatrixView.h"
 #include <tdeaction.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqdialog.h>
 #include <tqiconset.h>
diff --git a/src/gui/editors/notation/FontViewFrame.cpp b/src/gui/editors/notation/FontViewFrame.cpp
index 6e24a18..a226ffb 100644
--- a/src/gui/editors/notation/FontViewFrame.cpp
+++ b/src/gui/editors/notation/FontViewFrame.cpp
@@ -24,7 +24,7 @@
 
 
 #include "FontViewFrame.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp
index fab2b4d..1908fcf 100644
--- a/src/gui/editors/notation/NotationEraser.cpp
+++ b/src/gui/editors/notation/NotationEraser.cpp
@@ -24,7 +24,7 @@
 
 
 #include "NotationEraser.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "document/ConfigGroups.h"
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index 50fb0f6..8d7bd69 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -25,7 +25,7 @@
 
 #include "NotationHLayout.h"
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/Composition.h"
 #include "base/LayoutEngine.h"
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index f49b632..3e1bf28 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -25,7 +25,7 @@
 
 #include "NotationStaff.h"
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Strings.h"
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 24d5c9d..e46f95e 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -24,7 +24,7 @@
 
 
 #include "NotationStrings.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Strings.h"
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index d8fe2c6..3059de3 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -27,7 +27,7 @@
 #include <list>
 #include <tqlayout.h>
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "gui/editors/segment/TrackEditor.h"
 #include "gui/editors/segment/TrackButtons.h"
diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp
index 47855a1..b13f45b 100644
--- a/src/gui/editors/notation/NoteFontFactory.cpp
+++ b/src/gui/editors/notation/NoteFontFactory.cpp
@@ -25,7 +25,7 @@
 
 #include "NoteFontFactory.h"
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index de1ba52..609b6cf 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -25,7 +25,7 @@
 
 #include "NoteInserter.h"
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
 #include <klocale.h>
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index b661d88..e2f69cb 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -26,7 +26,7 @@
 #include "NotePixmapFactory.h"
 #include "misc/Debug.h"
 #include "base/NotationRules.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
diff --git a/src/gui/editors/notation/TrackHeader.cpp b/src/gui/editors/notation/TrackHeader.cpp
index 83dca88..1b73889 100644
--- a/src/gui/editors/notation/TrackHeader.cpp
+++ b/src/gui/editors/notation/TrackHeader.cpp
@@ -48,7 +48,7 @@
 #include <string>
 #include <utility>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqsize.h>
 #include <tqwidget.h>
diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
index 7299a9f..ddd9d6a 100644
--- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.cpp
@@ -25,7 +25,7 @@
 
 #include "AudioInstrumentParameterPanel.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp
index 4562520..e6c3beb 100644
--- a/src/gui/editors/parameters/SegmentParameterBox.cpp
+++ b/src/gui/editors/parameters/SegmentParameterBox.cpp
@@ -25,7 +25,7 @@
 
 #include "SegmentParameterBox.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index 62920b4..347ee8a 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -29,7 +29,7 @@
 
 #include "TrackParameterBox.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
diff --git a/src/gui/editors/segment/ControlEditorDialog.cpp b/src/gui/editors/segment/ControlEditorDialog.cpp
index 3480f06..e91f9f1 100644
--- a/src/gui/editors/segment/ControlEditorDialog.cpp
+++ b/src/gui/editors/segment/ControlEditorDialog.cpp
@@ -25,7 +25,7 @@
 
 #include "ControlEditorDialog.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 5eb09d1..922b385 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -26,7 +26,7 @@
 #include "MarkerEditor.h"
 #include "MarkerEditorViewItem.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp
index 6be14b5..0638aba 100644
--- a/src/gui/editors/segment/TrackEditor.cpp
+++ b/src/gui/editors/segment/TrackEditor.cpp
@@ -25,7 +25,7 @@
 
 #include "TrackEditor.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <tdeconfig.h>
diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp
index 5444e80..c26cc15 100644
--- a/src/gui/editors/segment/TriggerSegmentManager.cpp
+++ b/src/gui/editors/segment/TriggerSegmentManager.cpp
@@ -26,7 +26,7 @@
 #include "TriggerSegmentManager.h"
 #include "TriggerManagerItem.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/BaseProperties.h"
 #include <klocale.h>
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 89290fa..0380d9e 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -63,7 +63,7 @@
 #include <tqsize.h>
 #include <tqstring.h>
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <algorithm>
 
diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
index 02f3670..fe61e78 100644
--- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
+++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp
@@ -46,7 +46,7 @@
 #include "SegmentResizer.h"
 #include "SegmentTool.h"
 #include "SegmentToolBox.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tqcursor.h>
 #include <tqevent.h>
diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp
index f7f8e93..5194349 100644
--- a/src/gui/general/EditViewBase.cpp
+++ b/src/gui/general/EditViewBase.cpp
@@ -25,7 +25,7 @@
 
 #include "EditViewBase.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp
index 0a3bd91..f5270fd 100644
--- a/src/gui/general/GUIPalette.cpp
+++ b/src/gui/general/GUIPalette.cpp
@@ -24,7 +24,7 @@
 
 
 #include "GUIPalette.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "base/Colour.h"
 #include "document/ConfigGroups.h"
diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp
index 7b46812..82667b6 100644
--- a/src/gui/general/MidiPitchLabel.cpp
+++ b/src/gui/general/MidiPitchLabel.cpp
@@ -24,7 +24,7 @@
 
 
 #include "MidiPitchLabel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "document/ConfigGroups.h"
 #include <tdeconfig.h>
diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp
index a5f77d9..a1ce9d5 100644
--- a/src/gui/general/PresetHandlerDialog.cpp
+++ b/src/gui/general/PresetHandlerDialog.cpp
@@ -28,7 +28,7 @@
 
 #include "PresetHandlerDialog.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "misc/Debug.h"
diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp
index 1edcc4f..725fd45 100644
--- a/src/gui/kdeext/RGLed.cpp
+++ b/src/gui/kdeext/RGLed.cpp
@@ -139,7 +139,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 #include <tqcolor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapeffect.h>
 #include "kled.h"
 
diff --git a/src/gui/kdeext/TDEStartupLogo.cpp b/src/gui/kdeext/TDEStartupLogo.cpp
index 6e57e2f..2b2eda6 100644
--- a/src/gui/kdeext/TDEStartupLogo.cpp
+++ b/src/gui/kdeext/TDEStartupLogo.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <unistd.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqpainter.h>
 #include <tqfontmetrics.h>
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 2c9793e..65d5577 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -2125,7 +2125,7 @@ void KlearlookStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter *p,
                 case LV_LINES_NONE:
                     break;
                 case LV_LINES_DOTTED:
-                    // Taken and modified (colour wise) from kstyle.cpp - which in turn comes from
+                    // Taken and modified (colour wise) from tdestyle.cpp - which in turn comes from
                     // qwindowsstyl.cpp
                     {
                         static TQBitmap *verticalLine = 0,
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index 1e74355..232c5a2 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -39,7 +39,7 @@
 #define USE_SINGLE_STYLE 1
 
 #include <tdeversion.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqcolor.h>
 #include <tqpoint.h>
 
diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp
index 5e79b3e..ab46191 100644
--- a/src/gui/seqmanager/MetronomeMmapper.cpp
+++ b/src/gui/seqmanager/MetronomeMmapper.cpp
@@ -25,7 +25,7 @@
 
 #include "MetronomeMmapper.h"
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "sound/Midi.h"
 #include <kstddirs.h>
diff --git a/src/gui/studio/AudioMixerWindow.cpp b/src/gui/studio/AudioMixerWindow.cpp
index e28f14f..f983cb9 100644
--- a/src/gui/studio/AudioMixerWindow.cpp
+++ b/src/gui/studio/AudioMixerWindow.cpp
@@ -25,7 +25,7 @@
 
 #include "AudioMixerWindow.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "AudioPlugin.h"
 #include "AudioPluginManager.h"
diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp
index 863c637..14a0636 100644
--- a/src/gui/studio/BankEditorDialog.cpp
+++ b/src/gui/studio/BankEditorDialog.cpp
@@ -25,7 +25,7 @@
 
 #include "BankEditorDialog.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include <kstddirs.h>
diff --git a/src/gui/studio/ChangeRecordDeviceCommand.cpp b/src/gui/studio/ChangeRecordDeviceCommand.cpp
index fb819ea..586b7b8 100644
--- a/src/gui/studio/ChangeRecordDeviceCommand.cpp
+++ b/src/gui/studio/ChangeRecordDeviceCommand.cpp
@@ -26,7 +26,7 @@
 #include "StudioControl.h"
 #include "document/ConfigGroups.h"
 #include "sound/MappedEvent.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 namespace Rosegarden
diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp
index 0902afc..8c8f160 100644
--- a/src/gui/studio/DeviceManagerDialog.cpp
+++ b/src/gui/studio/DeviceManagerDialog.cpp
@@ -44,7 +44,7 @@
 #include "gui/application/RosegardenApplication.h"
 #include "gui/dialogs/ExportDeviceDialog.h"
 #include "gui/dialogs/ImportDeviceDialog.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstddirs.h>
 #include <tdeaction.h>
diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp
index 2fe179f..93fc146 100644
--- a/src/gui/widgets/CollapsingFrame.cpp
+++ b/src/gui/widgets/CollapsingFrame.cpp
@@ -24,7 +24,7 @@
 
 
 #include "CollapsingFrame.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstddirs.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp
index a51f099..5a6076f 100644
--- a/src/gui/widgets/QuantizeParameters.cpp
+++ b/src/gui/widgets/QuantizeParameters.cpp
@@ -25,7 +25,7 @@
 
 #include "QuantizeParameters.h"
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <klocale.h>
 #include "base/NotationTypes.h"
diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp
index e417fd9..f1475c4 100644
--- a/src/gui/widgets/Rotary.cpp
+++ b/src/gui/widgets/Rotary.cpp
@@ -29,7 +29,7 @@
 #include "gui/dialogs/FloatEdit.h"
 #include "gui/general/GUIPalette.h"
 #include "TextFloat.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqbrush.h>
 #include <tqcolor.h>
diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp
index 218fe5d..d166735 100644
--- a/src/gui/widgets/TextFloat.cpp
+++ b/src/gui/widgets/TextFloat.cpp
@@ -24,7 +24,7 @@
 
 
 #include "TextFloat.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "gui/general/GUIPalette.h"
 #include <tqfontmetrics.h>
diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h
index d9b325b..777f75f 100644
--- a/src/misc/stableheaders.h
+++ b/src/misc/stableheaders.h
@@ -141,14 +141,14 @@
 #include <dcopclient.h>
 #include <dcopobject.h>
 #include <dcopref.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccel.h>
 #include <tdeactioncollection.h>
 #include <tdeaction.h>
 #include <kapp.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <karrowbutton.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kcolordialog.h>
 #include <kcombobox.h>
 #include <kcommand.h>
diff --git a/src/sequencer/RosegardenSequencerApp.cpp b/src/sequencer/RosegardenSequencerApp.cpp
index 3acca16..637a5e8 100644
--- a/src/sequencer/RosegardenSequencerApp.cpp
+++ b/src/sequencer/RosegardenSequencerApp.cpp
@@ -23,7 +23,7 @@
 */
 
 #include "RosegardenSequencerApp.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/sequencer/main.cpp b/src/sequencer/main.cpp
index e0db570..89c96a2 100644
--- a/src/sequencer/main.cpp
+++ b/src/sequencer/main.cpp
@@ -26,8 +26,8 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 
diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp
index a237380..ec762d9 100644
--- a/src/sound/AudioFileManager.cpp
+++ b/src/sound/AudioFileManager.cpp
@@ -20,7 +20,7 @@
 
 
 #include <iostream>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <fstream>
 #include <string>
 #include <dirent.h> // for new recording file
diff --git a/src/sound/AudioFileTimeStretcher.cpp b/src/sound/AudioFileTimeStretcher.cpp
index d5b2321..82ebef6 100644
--- a/src/sound/AudioFileTimeStretcher.cpp
+++ b/src/sound/AudioFileTimeStretcher.cpp
@@ -28,7 +28,7 @@
 #include "WAVAudioFile.h"
 #include "base/RealTime.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index 76d5c85..c59efa7 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -22,7 +22,7 @@
 
 #include <iostream>
 #include "misc/Debug.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <fstream>
 #include <string>
 #include <cstdio>
diff --git a/src/sound/PeakFile.cpp b/src/sound/PeakFile.cpp
index 1edbdbc..ef9ff65 100644
--- a/src/sound/PeakFile.cpp
+++ b/src/sound/PeakFile.cpp
@@ -20,7 +20,7 @@
 
 #include <cmath>
 #include <cstdlib>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqdatetime.h>
 #include <tqstringlist.h>