Merge branch 'master' into classic-channels

4 files changed, 12 insertions, 2 deletions

diff --git a/src/notifications/notifications.cpp b/src/notifications/notifications.cpp
index e95c1c0..1ab52a9 100644
--- a/src/notifications/notifications.cpp
+++ b/src/notifications/notifications.cpp
@@ -1,6 +1,8 @@
 #include "notifications.hpp"
-#include "misc/chatutil.hpp"
+
+#include "abaddon.hpp"
 #include "discord/message.hpp"
+#include "misc/chatutil.hpp"
 
 Notifications::Notifications() {
 }
diff --git a/src/notifications/notifications.hpp b/src/notifications/notifications.hpp
index b4ea584..8de2c6e 100644
--- a/src/notifications/notifications.hpp
+++ b/src/notifications/notifications.hpp
@@ -1,8 +1,11 @@
 #pragma once
-#include "notifier.hpp"
+
 #include <map>
 #include <vector>
 
+#include "discord/snowflake.hpp"
+#include "notifier.hpp"
+
 class Message;
 
 class Notifications {
diff --git a/src/notifications/notifier_fallback.cpp b/src/notifications/notifier_fallback.cpp
index 00e9d4a..8478fc7 100644
--- a/src/notifications/notifier_fallback.cpp
+++ b/src/notifications/notifier_fallback.cpp
@@ -1,5 +1,7 @@
 #include "notifier.hpp"
 
+#include "abaddon.hpp"
+
 /* no actual notifications, just sounds
   GNotification has no win32 backend, and WinToast uses headers msys2 doesnt provide
   maybe it can be LoadLibrary'd in :s
diff --git a/src/notifications/notifier_gio.cpp b/src/notifications/notifier_gio.cpp
index 128167f..2708407 100644
--- a/src/notifications/notifier_gio.cpp
+++ b/src/notifications/notifier_gio.cpp
@@ -1,6 +1,9 @@
 #include "notifier.hpp"
+
 #include <giomm/notification.h>
 
+#include "abaddon.hpp"
+
 Notifier::Notifier() {
 #ifdef ENABLE_NOTIFICATION_SOUNDS
     if (ma_engine_init(nullptr, &m_engine) != MA_SUCCESS) {