From 6329a7711dd96a802957cfd3b125afb6d64ee106 Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Thu, 29 Dec 2022 21:39:03 +0100
Subject: [PATCH] Fix includes

---
 src/core/mac_startup.mm                             | 3 +--
 src/globalshortcuts/globalshortcutgrabber.mm        | 2 +-
 src/globalshortcuts/globalshortcutsbackend-macos.mm | 2 --
 tests/src/collectionbackend_test.cpp                | 2 +-
 tests/src/organizeformat_test.cpp                   | 2 +-
 tests/src/utilities_test.cpp                        | 8 +++++++-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/core/mac_startup.mm b/src/core/mac_startup.mm
index 5b80b016..837ac1bd 100644
--- a/src/core/mac_startup.mm
+++ b/src/core/mac_startup.mm
@@ -48,10 +48,9 @@
 #include "platforminterface.h"
 #include "mac_delegate.h"
 #include "mac_startup.h"
-#include "mac_utilities.h"
 #include "scoped_cftyperef.h"
 #include "core/logging.h"
-#include "core/scoped_nsautorelease_pool.h"
+#include "scoped_nsautorelease_pool.h"
 #include "globalshortcuts/globalshortcutsmanager.h"
 #include "globalshortcuts/globalshortcutsbackend-macos.h"
 
diff --git a/src/globalshortcuts/globalshortcutgrabber.mm b/src/globalshortcuts/globalshortcutgrabber.mm
index ee9df649..06cf3230 100644
--- a/src/globalshortcuts/globalshortcutgrabber.mm
+++ b/src/globalshortcuts/globalshortcutgrabber.mm
@@ -29,7 +29,7 @@
 
 #include <QKeySequence>
 
-#import "core/mac_utilities.h"
+#import "core/mac_startup.h"
 
 class MacMonitorWrapper {
  public:
diff --git a/src/globalshortcuts/globalshortcutsbackend-macos.mm b/src/globalshortcuts/globalshortcutsbackend-macos.mm
index ffbc9ee2..45793c81 100644
--- a/src/globalshortcuts/globalshortcutsbackend-macos.mm
+++ b/src/globalshortcuts/globalshortcutsbackend-macos.mm
@@ -40,9 +40,7 @@
 #include "globalshortcutsmanager.h"
 #include "core/logging.h"
 #include "core/mac_startup.h"
-#include "core/utilities.h"
 
-#import "core/mac_utilities.h"
 #import "core/SBSystemPreferences.h"
 
 class GlobalShortcutsBackendMacOSPrivate : boost::noncopyable {
diff --git a/tests/src/collectionbackend_test.cpp b/tests/src/collectionbackend_test.cpp
index 420101e0..1e5a5381 100644
--- a/tests/src/collectionbackend_test.cpp
+++ b/tests/src/collectionbackend_test.cpp
@@ -30,10 +30,10 @@
 
 #include "test_utils.h"
 
-#include "core/timeconstants.h"
 #include "core/song.h"
 #include "core/database.h"
 #include "core/logging.h"
+#include "utilities/timeconstants.h"
 #include "collection/collectionbackend.h"
 #include "collection/collection.h"
 
diff --git a/tests/src/organizeformat_test.cpp b/tests/src/organizeformat_test.cpp
index 4e2df859..7d0b14f1 100644
--- a/tests/src/organizeformat_test.cpp
+++ b/tests/src/organizeformat_test.cpp
@@ -23,7 +23,7 @@
 #include "test_utils.h"
 
 #include "organize/organizeformat.h"
-#include "core/timeconstants.h"
+#include "utilities/timeconstants.h"
 #include "core/song.h"
 #include "core/logging.h"
 
diff --git a/tests/src/utilities_test.cpp b/tests/src/utilities_test.cpp
index bef1ebc4..f100df23 100644
--- a/tests/src/utilities_test.cpp
+++ b/tests/src/utilities_test.cpp
@@ -27,7 +27,13 @@
 #include <QtDebug>
 
 #include "test_utils.h"
-#include "core/utilities.h"
+#include "utilities/envutils.h"
+#include "utilities/strutils.h"
+#include "utilities/timeutils.h"
+#include "utilities/randutils.h"
+#include "utilities/cryptutils.h"
+#include "utilities/colorutils.h"
+#include "utilities/transliterate.h"
 #include "core/logging.h"
 
 TEST(UtilitiesTest, PrettyTimeDelta) {