diff --git a/src/terminalDisplay/TerminalDisplay.cpp b/src/terminalDisplay/TerminalDisplay.cpp
index 8909f505..6d4d89af 100644
--- a/src/terminalDisplay/TerminalDisplay.cpp
+++ b/src/terminalDisplay/TerminalDisplay.cpp
@@ -78,6 +78,12 @@
 #include "TerminalPainter.h"
 #include "TerminalScrollBar.h"
 
+#include "unicode/localpointer.h"
+#include "unicode/ubidi.h"
+#include "unicode/uchar.h"
+#include "unicode/ushape.h"
+#include "unicode/utypes.h"
+
 using namespace Konsole;
 
 inline int TerminalDisplay::loc(int x, int y) const
diff --git a/src/terminalDisplay/TerminalDisplay.h b/src/terminalDisplay/TerminalDisplay.h
index 317fac9d..7ac2cd52 100644
--- a/src/terminalDisplay/TerminalDisplay.h
+++ b/src/terminalDisplay/TerminalDisplay.h
@@ -26,12 +26,6 @@
 
 #include "TerminalBell.h"
 
-#include "unicode/localpointer.h"
-#include "unicode/ubidi.h"
-#include "unicode/uchar.h"
-#include "unicode/ushape.h"
-#include "unicode/utypes.h"
-
 class QDrag;
 class QDragEnterEvent;
 class QDropEvent;
@@ -48,6 +42,8 @@ class QScrollEvent;
 class QScrollPrepareEvent;
 class KMessageWidget;
 
+struct UBiDi;
+
 namespace Konsole
 {
 class TerminalPainter;