From 8082daaa3f9bdb6c49e91961c110f0fbb1e49de9 Mon Sep 17 00:00:00 2001
From: Andrew Kaster <akaster@serenityos.org>
Date: Tue, 16 Jul 2024 23:57:20 -0600
Subject: [PATCH] LibAudio+LibCore: Remove workarounds for system header
 conflicts

This commit could possibly be cherry-picked to serenity
---
 Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp | 5 -----
 Userland/Libraries/LibCore/FileWatcherMacOS.mm          | 9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
index 56b2d3997b5..abc3a61b36a 100644
--- a/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
+++ b/Userland/Libraries/LibAudio/PlaybackStreamAudioUnit.cpp
@@ -11,12 +11,7 @@
 #include <LibCore/SharedCircularQueue.h>
 #include <LibCore/ThreadedPromise.h>
 
-// Several AK types conflict with MacOS types.
-#define FixedPoint FixedPointMacOS
-#define Duration DurationMacOS
 #include <AudioUnit/AudioUnit.h>
-#undef FixedPoint
-#undef Duration
 
 namespace Audio {
 
diff --git a/Userland/Libraries/LibCore/FileWatcherMacOS.mm b/Userland/Libraries/LibCore/FileWatcherMacOS.mm
index fcebf99335d..a4cbe50cb27 100644
--- a/Userland/Libraries/LibCore/FileWatcherMacOS.mm
+++ b/Userland/Libraries/LibCore/FileWatcherMacOS.mm
@@ -18,13 +18,8 @@
 static_assert(false, "This file must only be used for macOS");
 #endif
 
-// Several AK types conflict with MacOS types.
-#define FixedPoint FixedPointMacOS
-#define Duration DurationMacOS
-#include <CoreServices/CoreServices.h>
-#include <dispatch/dispatch.h>
-#undef FixedPoint
-#undef Duration
+#import <CoreServices/CoreServices.h>
+#import <dispatch/dispatch.h>
 
 namespace Core {