Merge branch 'develop' of JF/PineTime into master

1 files changed, 12 insertions, 2 deletions

diff --git a/src/components/ble/AlertNotificationClient.h b/src/components/ble/AlertNotificationClient.h
index bc0df51..fa10456 100644
--- a/src/components/ble/AlertNotificationClient.h
+++ b/src/components/ble/AlertNotificationClient.h
@@ -1,13 +1,23 @@
 #pragma once
 
 #include <cstdint>
-#include <array>
+#include <functional>
+#define min // workaround: nimble's min/max macros conflict with libstdc++
+#define max
 #include <host/ble_gap.h>
+#undef max
+#undef min
 #include "BleClient.h"
 
-
 namespace Pinetime {
+
+  namespace System {
+    class SystemTask;
+  }
+
   namespace Controllers {
+    class NotificationManager;
+
     class AlertNotificationClient : public BleClient {
       public:
         explicit AlertNotificationClient(Pinetime::System::SystemTask &systemTask,