- Rebasing on master.

- Fixes so all tests pass.

daggy/include/daggy/Defines.hpp

@@ -1,9 +1,10 @@
 #pragma once
 
+#include <chrono>
 #include <string>
-#include <vector>
 #include <unordered_map>
 #include <variant>
+#include <vector>
 
 namespace daggy {
     // Commands and parameters

daggy/include/daggy/Serialization.hpp

@@ -7,8 +7,7 @@
 
 #include <rapidjson/document.h>
 
-#include "Logger.hpp"
-#include "TaskExecutor.hpp"
+#include "Defines.hpp"
 #include "Task.hpp"
 
 namespace rj = rapidjson;