diff --git a/src/neochatroom.cpp b/src/neochatroom.cpp
index 4655ff073..1f6778b99 100644
--- a/src/neochatroom.cpp
+++ b/src/neochatroom.cpp
@@ -39,14 +39,11 @@
 
 #include "chatbarcache.h"
 #include "clipboard.h"
-#include "eventhandler.h"
 #include "events/pollevent.h"
 #include "filetransferpseudojob.h"
 #include "neochatconnection.h"
-#include "neochatroommember.h"
 #include "roomlastmessageprovider.h"
 #include "spacehierarchycache.h"
-#include "texthandler.h"
 #include "urlhelper.h"
 
 #ifndef Q_OS_ANDROID
diff --git a/src/neochatroom.h b/src/neochatroom.h
index a2a218cff..e292de7e0 100644
--- a/src/neochatroom.h
+++ b/src/neochatroom.h
@@ -11,11 +11,9 @@
 #include <QQmlEngine>
 
 #include <QCoroTask>
-#include <Quotient/roommember.h>
 
 #include "enums/messagetype.h"
 #include "enums/pushrule.h"
-#include "events/pollevent.h"
 #include "neochatroommember.h"
 #include "pollhandler.h"