diff --git a/include/AvatarProvider.h b/include/AvatarProvider.h
index 0a37ffb9..a58ef0b7 100644
--- a/include/AvatarProvider.h
+++ b/include/AvatarProvider.h
@@ -18,12 +18,11 @@
#pragma once
#include <QImage>
-#include <QObject>
#include <QSharedPointer>
#include <QUrl>
-#include "MatrixClient.h"
-#include "TimelineItem.h"
+class MatrixClient;
+class TimelineItem;
class AvatarProvider : public QObject
{
diff --git a/include/Cache.h b/include/Cache.h
index 69d880f5..c16654d0 100644
--- a/include/Cache.h
+++ b/include/Cache.h
@@ -20,7 +20,7 @@
#include <QDir>
#include <lmdb++.h>
-#include "RoomState.h"
+class RoomState;
class Cache
{
diff --git a/include/ChatPage.h b/include/ChatPage.h
index bac83ece..d3790f78 100644
--- a/include/ChatPage.h
+++ b/include/ChatPage.h
@@ -17,23 +17,27 @@
#pragma once
+#include <QHBoxLayout>
+#include <QMap>
#include <QPixmap>
#include <QTimer>
#include <QWidget>
-#include "Cache.h"
-#include "MatrixClient.h"
-#include "QuickSwitcher.h"
-#include "RoomList.h"
-#include "RoomSettings.h"
-#include "RoomState.h"
-#include "SideBarActions.h"
-#include "Splitter.h"
-#include "TextInputWidget.h"
-#include "TimelineViewManager.h"
-#include "TopRoomBar.h"
-#include "TypingDisplay.h"
-#include "UserInfoWidget.h"
+class Cache;
+class MatrixClient;
+class OverlayModal;
+class QuickSwitcher;
+class RoomList;
+class RoomSettings;
+class RoomState;
+class SideBarActions;
+class Splitter;
+class SyncResponse;
+class TextInputWidget;
+class TimelineViewManager;
+class TopRoomBar;
+class TypingDisplay;
+class UserInfoWidget;
constexpr int CONSENSUS_TIMEOUT = 1000;
constexpr int SHOW_CONTENT_TIMEOUT = 3000;
diff --git a/include/Deserializable.h b/include/Deserializable.h
index 0d0b2882..0b97ce29 100644
--- a/include/Deserializable.h
+++ b/include/Deserializable.h
@@ -21,7 +21,6 @@
#include <QJsonDocument>
#include <QJsonObject>
-#include <QJsonValue>
class DeserializationException : public std::exception
{
diff --git a/include/EmojiCategory.h b/include/EmojiCategory.h
index 154ad8f4..06099f3d 100644
--- a/include/EmojiCategory.h
+++ b/include/EmojiCategory.h
@@ -17,15 +17,14 @@
#pragma once
-#include <QHBoxLayout>
#include <QLabel>
+#include <QLayout>
#include <QListView>
#include <QStandardItemModel>
-#include <QVBoxLayout>
-#include <QWidget>
#include "EmojiItemDelegate.h"
-#include "EmojiProvider.h"
+
+class EmojiProvider;
class EmojiCategory : public QWidget
{
diff --git a/include/EmojiPanel.h b/include/EmojiPanel.h
index 360e7006..211d916b 100644
--- a/include/EmojiPanel.h
+++ b/include/EmojiPanel.h
@@ -20,11 +20,11 @@
#include <QGraphicsOpacityEffect>
#include <QPropertyAnimation>
#include <QScrollArea>
-#include <QWidget>
-#include "EmojiCategory.h"
#include "EmojiProvider.h"
+class EmojiCategory;
+
class EmojiPanel : public QWidget
{
Q_OBJECT
diff --git a/include/EmojiPickButton.h b/include/EmojiPickButton.h
index d4226165..8ef9be9e 100644
--- a/include/EmojiPickButton.h
+++ b/include/EmojiPickButton.h
@@ -20,9 +20,10 @@
#include <QEvent>
#include <QWidget>
-#include "EmojiPanel.h"
#include "FlatButton.h"
+class EmojiPanel;
+
class EmojiPickButton : public FlatButton
{
Q_OBJECT
diff --git a/include/EmojiProvider.h b/include/EmojiProvider.h
index 3f91f2b3..847157fd 100644
--- a/include/EmojiProvider.h
+++ b/include/EmojiProvider.h
@@ -17,9 +17,7 @@
#pragma once
-#include <QFile>
#include <QList>
-#include <QMap>
struct Emoji
{
diff --git a/include/ImageItem.h b/include/ImageItem.h
index 20e0772d..c4f6998a 100644
--- a/include/ImageItem.h
+++ b/include/ImageItem.h
@@ -24,6 +24,7 @@
#include "Image.h"
#include "MatrixClient.h"
+#include "MessageEvent.h"
namespace events = matrix::events;
namespace msgs = matrix::events::messages;
diff --git a/include/InputValidator.h b/include/InputValidator.h
index 4f77033e..da1c121e 100644
--- a/include/InputValidator.h
+++ b/include/InputValidator.h
@@ -17,7 +17,6 @@
#pragma once
-#include <QRegExp>
#include <QRegExpValidator>
class InputValidator
diff --git a/include/JoinRoomDialog.h b/include/JoinRoomDialog.h
index 6c3fbdcf..84184733 100644
--- a/include/JoinRoomDialog.h
+++ b/include/JoinRoomDialog.h
@@ -3,7 +3,7 @@
#include <QFrame>
#include <QLineEdit>
-#include "FlatButton.h"
+class FlatButton;
class JoinRoomDialog : public QFrame
{
diff --git a/include/LeaveRoomDialog.h b/include/LeaveRoomDialog.h
index 1639a578..231556dc 100644
--- a/include/LeaveRoomDialog.h
+++ b/include/LeaveRoomDialog.h
@@ -2,7 +2,7 @@
#include <QFrame>
-#include "FlatButton.h"
+class FlatButton;
class LeaveRoomDialog : public QFrame
{
diff --git a/include/LoginPage.h b/include/LoginPage.h
index 88cffaf3..d5f46f76 100644
--- a/include/LoginPage.h
+++ b/include/LoginPage.h
@@ -17,18 +17,17 @@
#pragma once
-#include <QHBoxLayout>
#include <QLabel>
+#include <QLayout>
#include <QSharedPointer>
-#include <QVBoxLayout>
#include <QWidget>
-#include "FlatButton.h"
-#include "LoadingIndicator.h"
-#include "MatrixClient.h"
-#include "OverlayModal.h"
-#include "RaisedButton.h"
-#include "TextField.h"
+class FlatButton;
+class LoadingIndicator;
+class MatrixClient;
+class OverlayModal;
+class RaisedButton;
+class TextField;
class LoginPage : public QWidget
{
diff --git a/include/LogoutDialog.h b/include/LogoutDialog.h
index 44dab17a..e081986e 100644
--- a/include/LogoutDialog.h
+++ b/include/LogoutDialog.h
@@ -19,7 +19,7 @@
#include <QFrame>
-#include "FlatButton.h"
+class FlatButton;
class LogoutDialog : public QFrame
{
diff --git a/include/MainWindow.h b/include/MainWindow.h
index 95935c46..f56592c2 100644
--- a/include/MainWindow.h
+++ b/include/MainWindow.h
@@ -19,16 +19,18 @@
#include <QMainWindow>
#include <QSharedPointer>
+#include <QStackedWidget>
+#include <QSystemTrayIcon>
-#include "ChatPage.h"
-#include "LoadingIndicator.h"
-#include "LoginPage.h"
-#include "MatrixClient.h"
-#include "OverlayModal.h"
-#include "RegisterPage.h"
-#include "SnackBar.h"
-#include "TrayIcon.h"
-#include "WelcomePage.h"
+class ChatPage;
+class LoadingIndicator;
+class LoginPage;
+class MatrixClient;
+class OverlayModal;
+class RegisterPage;
+class SnackBar;
+class TrayIcon;
+class WelcomePage;
class MainWindow : public QMainWindow
{
diff --git a/include/MatrixClient.h b/include/MatrixClient.h
index 7a415e82..2e45e397 100644
--- a/include/MatrixClient.h
+++ b/include/MatrixClient.h
@@ -17,12 +17,13 @@
#pragma once
-#include <QtNetwork/QNetworkAccessManager>
+#include <QNetworkAccessManager>
#include "MessageEvent.h"
-#include "Profile.h"
-#include "RoomMessages.h"
-#include "Sync.h"
+
+class SyncResponse;
+class Profile;
+class RoomMessages;
/*
* MatrixClient provides the high level API to communicate with
diff --git a/include/Profile.h b/include/Profile.h
index e2868e62..d640db02 100644
--- a/include/Profile.h
+++ b/include/Profile.h
@@ -20,7 +20,7 @@
#include <QJsonDocument>
#include <QUrl>
-#include "Deserializable.h"
+class Deserializable;
class ProfileResponse : public Deserializable
{
diff --git a/include/Register.h b/include/Register.h
index 83f538b9..fc4a49e6 100644
--- a/include/Register.h
+++ b/include/Register.h
@@ -19,7 +19,7 @@
#include <QJsonDocument>
-#include "Deserializable.h"
+class Deserializable;
class RegisterRequest
{
diff --git a/include/RegisterPage.h b/include/RegisterPage.h
index a42cbedd..e0a3b6d8 100644
--- a/include/RegisterPage.h
+++ b/include/RegisterPage.h
@@ -17,17 +17,15 @@
#pragma once
-#include <QHBoxLayout>
#include <QLabel>
+#include <QLayout>
#include <QSharedPointer>
-#include <QVBoxLayout>
-#include <QWidget>
-#include "Avatar.h"
-#include "FlatButton.h"
-#include "MatrixClient.h"
-#include "RaisedButton.h"
-#include "TextField.h"
+class Avatar;
+class FlatButton;
+class MatrixClient;
+class RaisedButton;
+class TextField;
class RegisterPage : public QWidget
{
diff --git a/include/RoomInfoListItem.h b/include/RoomInfoListItem.h
index 8975af79..a137b37f 100644
--- a/include/RoomInfoListItem.h
+++ b/include/RoomInfoListItem.h
@@ -21,11 +21,12 @@
#include <QSharedPointer>
#include <QWidget>
-#include "Menu.h"
-#include "RippleOverlay.h"
-#include "RoomSettings.h"
#include "RoomState.h"
+class Menu;
+class RippleOverlay;
+class RoomSettings;
+
struct DescInfo
{
QString username;
diff --git a/include/RoomList.h b/include/RoomList.h
index d7b201f1..df668ac6 100644
--- a/include/RoomList.h
+++ b/include/RoomList.h
@@ -17,19 +17,22 @@
#pragma once
+#include <QMap>
#include <QPushButton>
#include <QScrollArea>
#include <QSharedPointer>
#include <QVBoxLayout>
#include <QWidget>
-#include "JoinRoomDialog.h"
-#include "LeaveRoomDialog.h"
-#include "MatrixClient.h"
-#include "OverlayModal.h"
-#include "RoomInfoListItem.h"
-#include "RoomState.h"
-#include "Sync.h"
+class JoinRoomDialog;
+class LeaveRoomDialog;
+class MatrixClient;
+class OverlayModal;
+class RoomInfoListItem;
+class RoomSettings;
+class RoomState;
+class Sync;
+struct DescInfo;
class RoomList : public QWidget
{
diff --git a/include/SideBarActions.h b/include/SideBarActions.h
index 60975a03..7b550578 100644
--- a/include/SideBarActions.h
+++ b/include/SideBarActions.h
@@ -1,7 +1,10 @@
+#pragma once
+
#include <QHBoxLayout>
#include <QResizeEvent>
+#include <QWidget>
-#include <FlatButton.h>
+#include "FlatButton.h"
class SideBarActions : public QWidget
{
diff --git a/include/Sync.h b/include/Sync.h
index ae61015e..d59a57dc 100644
--- a/include/Sync.h
+++ b/include/Sync.h
@@ -18,9 +18,7 @@
#pragma once
#include <QJsonArray>
-#include <QJsonDocument>
#include <QMap>
-#include <QString>
#include "Deserializable.h"
diff --git a/include/TimelineItem.h b/include/TimelineItem.h
index ef021cfe..1adf574c 100644
--- a/include/TimelineItem.h
+++ b/include/TimelineItem.h
@@ -19,12 +19,7 @@
#include <QHBoxLayout>
#include <QLabel>
-#include <QWidget>
-#include "ImageItem.h"
-#include "Sync.h"
-
-#include "Avatar.h"
#include "Emote.h"
#include "Image.h"
#include "MessageEvent.h"
@@ -32,6 +27,9 @@
#include "RoomInfoListItem.h"
#include "Text.h"
+class ImageItem;
+class Avatar;
+
namespace events = matrix::events;
namespace msgs = matrix::events::messages;
diff --git a/include/TimelineView.h b/include/TimelineView.h
index 83247948..7e44db46 100644
--- a/include/TimelineView.h
+++ b/include/TimelineView.h
@@ -17,24 +17,23 @@
#pragma once
-#include <QHBoxLayout>
+#include <QLayout>
#include <QList>
#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QWidget>
-
-#include "ScrollBar.h"
-#include "Sync.h"
-#include "TimelineItem.h"
#include "Emote.h"
#include "Image.h"
#include "MessageEvent.h"
#include "Notice.h"
-#include "RoomInfoListItem.h"
#include "Text.h"
class FloatingButton;
+class MatrixClient;
+class RoomMessages;
+class ScrollBar;
+class Timeline;
+class TimelineItem;
+struct DescInfo;
namespace msgs = matrix::events::messages;
namespace events = matrix::events;
diff --git a/include/TimelineViewManager.h b/include/TimelineViewManager.h
index 91fda996..8ff49f20 100644
--- a/include/TimelineViewManager.h
+++ b/include/TimelineViewManager.h
@@ -17,16 +17,16 @@
#pragma once
-#include <QDebug>
+#include <QMap>
#include <QSharedPointer>
#include <QStackedWidget>
-#include <QWidget>
-#include "MatrixClient.h"
-#include "MessageEvent.h"
-#include "RoomInfoListItem.h"
-#include "Sync.h"
-#include "TimelineView.h"
+class JoinedRoom;
+class MatrixClient;
+class RoomInfoListItem;
+class Rooms;
+class TimelineView;
+struct DescInfo;
class TimelineViewManager : public QStackedWidget
{
diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h
index eb941b3b..f1e93d9d 100644
--- a/include/TopRoomBar.h
+++ b/include/TopRoomBar.h
@@ -18,22 +18,21 @@
#pragma once
#include <QAction>
-#include <QDebug>
#include <QIcon>
#include <QImage>
#include <QLabel>
+#include <QMenu>
#include <QPaintEvent>
#include <QSharedPointer>
#include <QVBoxLayout>
-#include <QWidget>
-#include "Avatar.h"
-#include "FlatButton.h"
-#include "Label.h"
-#include "LeaveRoomDialog.h"
-#include "Menu.h"
-#include "OverlayModal.h"
-#include "RoomSettings.h"
+class Avatar;
+class FlatButton;
+class Label;
+class LeaveRoomDialog;
+class Menu;
+class OverlayModal;
+class RoomSettings;
static const QString URL_HTML = "<a href=\"\\1\" style=\"color: #333333\">\\1</a>";
static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");
diff --git a/include/TrayIcon.h b/include/TrayIcon.h
index 6073ea69..a3536cc3 100644
--- a/include/TrayIcon.h
+++ b/include/TrayIcon.h
@@ -20,7 +20,6 @@
#include <QAction>
#include <QIcon>
#include <QIconEngine>
-#include <QMenu>
#include <QPainter>
#include <QRect>
#include <QSystemTrayIcon>
diff --git a/include/UserInfoWidget.h b/include/UserInfoWidget.h
index b2c7b876..111f5808 100644
--- a/include/UserInfoWidget.h
+++ b/include/UserInfoWidget.h
@@ -17,15 +17,13 @@
#pragma once
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QWidget>
+#include <QLabel>
+#include <QLayout>
-#include "Avatar.h"
-#include "FlatButton.h"
-#include "LogoutDialog.h"
-#include "OverlayModal.h"
+class Avatar;
+class FlatButton;
+class LogoutDialog;
+class OverlayModal;
class UserInfoWidget : public QWidget
{
diff --git a/include/Versions.h b/include/Versions.h
index 31d8af82..a603e391 100644
--- a/include/Versions.h
+++ b/include/Versions.h
@@ -20,7 +20,7 @@
#include <QJsonDocument>
#include <QVector>
-#include "Deserializable.h"
+class Deserializable;
class VersionsResponse : public Deserializable
{
diff --git a/include/WelcomePage.h b/include/WelcomePage.h
index 7cd83fd1..73b612a8 100644
--- a/include/WelcomePage.h
+++ b/include/WelcomePage.h
@@ -17,7 +17,9 @@
#pragma once
-#include "RaisedButton.h"
+#include <QWidget>
+
+class RaisedButton;
class WelcomePage : public QWidget
{
diff --git a/include/ui/FlatButton.h b/include/ui/FlatButton.h
index 816563e3..9c2bf425 100644
--- a/include/ui/FlatButton.h
+++ b/include/ui/FlatButton.h
@@ -5,9 +5,9 @@
#include <QPushButton>
#include <QStateMachine>
-#include "RippleOverlay.h"
#include "Theme.h"
+class RippleOverlay;
class FlatButton;
class FlatButtonStateMachine : public QStateMachine
|
