15 files changed, 2 insertions, 1 deletions
diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h
index 80c16740..ede7b18a 100644
--- a/include/TextInputWidget.h
+++ b/include/TextInputWidget.h
@@ -24,11 +24,12 @@
 #include <QTextEdit>
 #include <QWidget>
 
-#include "EmojiPickButton.h"
 #include "FlatButton.h"
 #include "Image.h"
 #include "LoadingIndicator.h"
 
+#include "emoji/EmojiPickButton.h"
+
 namespace msgs = matrix::events::messages;
 
 class FilteredTextEdit : public QTextEdit
diff --git a/include/ImageOverlayDialog.h b/include/dialogs/ImageOverlayDialog.h
index 5159c665..5159c665 100644
--- a/include/ImageOverlayDialog.h
+++ b/include/dialogs/ImageOverlayDialog.h
diff --git a/include/JoinRoomDialog.h b/include/dialogs/JoinRoomDialog.h
index 84184733..84184733 100644
--- a/include/JoinRoomDialog.h
+++ b/include/dialogs/JoinRoomDialog.h
diff --git a/include/LeaveRoomDialog.h b/include/dialogs/LeaveRoomDialog.h
index eab022f7..eab022f7 100644
--- a/include/LeaveRoomDialog.h
+++ b/include/dialogs/LeaveRoomDialog.h
diff --git a/include/LogoutDialog.h b/include/dialogs/LogoutDialog.h
index a1a5ee4f..a1a5ee4f 100644
--- a/include/LogoutDialog.h
+++ b/include/dialogs/LogoutDialog.h
diff --git a/include/EmojiCategory.h b/include/emoji/EmojiCategory.h
index be0110f2..be0110f2 100644
--- a/include/EmojiCategory.h
+++ b/include/emoji/EmojiCategory.h
diff --git a/include/EmojiItemDelegate.h b/include/emoji/EmojiItemDelegate.h
index 15d61f49..15d61f49 100644
--- a/include/EmojiItemDelegate.h
+++ b/include/emoji/EmojiItemDelegate.h
diff --git a/include/EmojiPanel.h b/include/emoji/EmojiPanel.h
index 9eecc8e0..9eecc8e0 100644
--- a/include/EmojiPanel.h
+++ b/include/emoji/EmojiPanel.h
diff --git a/include/EmojiPickButton.h b/include/emoji/EmojiPickButton.h
index 8ef9be9e..8ef9be9e 100644
--- a/include/EmojiPickButton.h
+++ b/include/emoji/EmojiPickButton.h
diff --git a/include/EmojiProvider.h b/include/emoji/EmojiProvider.h
index 847157fd..847157fd 100644
--- a/include/EmojiProvider.h
+++ b/include/emoji/EmojiProvider.h
diff --git a/include/TimelineItem.h b/include/timeline/TimelineItem.h
index 9646405c..9646405c 100644
--- a/include/TimelineItem.h
+++ b/include/timeline/TimelineItem.h
diff --git a/include/TimelineView.h b/include/timeline/TimelineView.h
index 898a304e..898a304e 100644
--- a/include/TimelineView.h
+++ b/include/timeline/TimelineView.h
diff --git a/include/TimelineViewManager.h b/include/timeline/TimelineViewManager.h
index 854c2550..854c2550 100644
--- a/include/TimelineViewManager.h
+++ b/include/timeline/TimelineViewManager.h
diff --git a/include/FileItem.h b/include/timeline/widgets/FileItem.h
index ebb18111..ebb18111 100644
--- a/include/FileItem.h
+++ b/include/timeline/widgets/FileItem.h
diff --git a/include/ImageItem.h b/include/timeline/widgets/ImageItem.h
index c4f6998a..c4f6998a 100644
--- a/include/ImageItem.h
+++ b/include/timeline/widgets/ImageItem.h