Fix includes

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"
 

src/globalshortcuts/globalshortcutgrabber.mm

@@ -29,7 +29,7 @@
 
 #include <QKeySequence>
 
-#import "core/mac_utilities.h"
+#import "core/mac_startup.h"
 
 class MacMonitorWrapper {
  public:

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 {

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"
 

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"
 

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) {