move util out of include

meson.build

@@ -93,12 +93,6 @@ if host_machine.system() == 'linux'
   deps += cpp.find_library('sdbus-c++')
 endif
 
-
-incdir = include_directories(
-  'include',
-  is_system: true # Ignores warnings from include dir
-)
-
 objc_args = []
 link_args = []
 
@@ -112,6 +106,5 @@ executable(
   sources,
   objc_args: objc_args,
   link_args: link_args,
-  dependencies: deps,
+  dependencies: deps
-  include_directories: incdir,
 )

src/config/config.h

@@ -3,7 +3,7 @@
 #include <rfl.hpp>
 #include <string>
 
-#include "util/macros.h"
+#include "../util/macros.h"
 #include "weather.h"
 
 // TODO: Make config values optional and supply defaults

src/config/weather.cpp

@@ -5,7 +5,7 @@
 
 #include "weather.h"
 
-#include "util/result.h"
+#include "../util/result.h"
 
 using WeatherOutput = Weather::WeatherOutput;
 

src/config/weather.h

@@ -6,8 +6,8 @@
 #include <string>
 #include <variant>
 
-#include "util/macros.h"
+#include "../util/macros.h"
-#include "util/numtypes.h"
+#include "../util/numtypes.h"
 
 class Weather {
  public:

src/os/macos/bridge.h

@@ -1,20 +1,25 @@
 #pragma once
 
 #ifdef __APPLE__
+
+#include "../../util/macros.h"
+
 #ifdef __OBJC__
+
 #import <Foundation/Foundation.h>
 
 @interface Bridge : NSObject
 + (NSDictionary*)currentPlayingMetadata;
 + (NSString*)macOSVersion;
 @end
+
 #else
-#include "util/macros.h"
 
 extern "C" {
   fn GetCurrentPlayingTitle() -> const char*;
   fn GetCurrentPlayingArtist() -> const char*;
   fn GetMacOSVersion() -> const char*;
 }
+
 #endif
 #endif

src/os/macos/bridge.mm

@@ -90,8 +90,6 @@ using MRMediaRemoteGetNowPlayingInfoFunction =
 }
 @end
 
-#include "util/macros.h"
-
 extern "C" {
   fn GetCurrentPlayingTitle() -> const char* {
     NSDictionary* metadata = [Bridge currentPlayingMetadata];

src/os/os.h

@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "util/macros.h"
+#include "../util/macros.h"
-#include "util/numtypes.h"
+#include "../util/numtypes.h"
 
 /**
  * @brief Get the amount of installed RAM in bytes.

src/util/result.h

@@ -5,7 +5,7 @@
 #include <utility>
 #include <variant>
 
-#include "util/macros.h"
+#include "macros.h"
 
 /**
  * @class Error