diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed8b3ed1..e7be51a2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,7 +108,6 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         BookmarkHandler.cpp
                         BookmarkMenu.cpp
                         CheckableSessionModel.cpp
-                        CompositeWidgetFocusWatcher.cpp
                         CopyInputDialog.cpp
                         Emulation.cpp
                         EscapeSequenceUrlExtractor.cpp
@@ -175,6 +174,8 @@ set(konsoleprivate_SRCS ${windowadaptors_SRCS}
                         widgets/RenameTabWidget.cpp
                         widgets/RenameTabWidget.cpp
                         widgets/TabTitleFormatButton.cpp
+
+                        terminalDisplay/extras/CompositeWidgetFocusWatcher.cpp
                         
                         terminalDisplay/TerminalDisplay.cpp
                         terminalDisplay/TerminalPainter.cpp
diff --git a/src/terminalDisplay/TerminalDisplay.cpp b/src/terminalDisplay/TerminalDisplay.cpp
index 993065f1..687db201 100644
--- a/src/terminalDisplay/TerminalDisplay.cpp
+++ b/src/terminalDisplay/TerminalDisplay.cpp
@@ -58,7 +58,7 @@
 #include <KIO/StatJob>
 
 // Konsole
-#include "CompositeWidgetFocusWatcher.h"
+#include "extras/CompositeWidgetFocusWatcher.h"
 #include "AutoScrollHandler.h"
 
 #include "filterHotSpots/Filter.h"
diff --git a/src/CompositeWidgetFocusWatcher.cpp b/src/terminalDisplay/extras/CompositeWidgetFocusWatcher.cpp
similarity index 100%
rename from src/CompositeWidgetFocusWatcher.cpp
rename to src/terminalDisplay/extras/CompositeWidgetFocusWatcher.cpp
diff --git a/src/CompositeWidgetFocusWatcher.h b/src/terminalDisplay/extras/CompositeWidgetFocusWatcher.h
similarity index 100%
rename from src/CompositeWidgetFocusWatcher.h
rename to src/terminalDisplay/extras/CompositeWidgetFocusWatcher.h