Merge master and fix conflicts

1 files changed, 5 insertions, 2 deletions

diff --git a/src/UserInfoWidget.h b/src/UserInfoWidget.h

index e1a925a4..575ade52 100644
--- a/src/UserInfoWidget.h
+++ b/src/UserInfoWidget.h
@@ -17,13 +17,16 @@
 
 #pragma once
 
-#include <QLabel>
-#include <QLayout>
+#include <QWidget>
 
 class Avatar;
 class FlatButton;
 class OverlayModal;
 
+class QLabel;
+class QHBoxLayout;
+class QVBoxLayout;
+
 class UserInfoWidget : public QWidget
 {
         Q_OBJECT