Fixed stupid libultraship conflicts

src/factories/BaseFactory.h

@@ -12,8 +12,8 @@
 #include <optional>
 #include <yaml-cpp/yaml.h>
 #include <strhash64/StrHash64.h>
-#include <binarytools/BinaryWriter.h>
-#include <binarytools/BinaryReader.h>
+#include "lib/binarytools/BinaryWriter.h"
+#include "lib/binarytools/BinaryReader.h"
 
 #define REGISTER(type, c) { ExportType::type, std::make_shared<c>() },
 

src/main.cpp

@@ -2,9 +2,10 @@
 #include "CLI11.hpp"
 #include "Companion.h"
 
-#ifdef STANDALONE
 Companion* Companion::Instance;
 
+#ifdef STANDALONE
+
 int main(int argc, char *argv[]) {
     CLI::App app{"Torch - [T]orch is [O]ur [R]esource [C]onversion [H]elper\n\
         * It extracts from a baserom and generates code or an otr.\n\

src/utils/Decompressor.h

@@ -6,7 +6,7 @@
 #include <yaml-cpp/yaml.h>
 #include <optional>
 #include <cstdint>
-#include "BinaryReader.h"
+#include "lib/binarytools/BinaryReader.h"
 
 enum class CompressionType {
     None,