cleanup includes

7 files changed, 33 insertions, 20 deletions

diff --git a/xmrstak/misc/console.cpp b/xmrstak/misc/console.cpp
index 0c73b1d..ba34bb3 100644
--- a/xmrstak/misc/console.cpp
+++ b/xmrstak/misc/console.cpp
@@ -21,7 +21,8 @@
   *
   */
 
-#include "console.h"
+#include "xmrstak/misc/console.hpp"
+
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/xmrstak/misc/console.hpp b/xmrstak/misc/console.hpp
index ac2ed3c..c68bba3 100644
--- a/xmrstak/misc/console.hpp
+++ b/xmrstak/misc/console.hpp
@@ -1,6 +1,9 @@
 #pragma once
+
+#include "xmrstak/misc/environment.hpp"
+
 #include <mutex>
-#include "Environment.hpp"
+
 
 enum out_colours { K_RED, K_GREEN, K_BLUE, K_YELLOW, K_CYAN, K_MAGENTA, K_WHITE, K_NONE };
 
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 64f3d40..455412e 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -21,24 +21,25 @@
   *
   */
 
+#include "executor.hpp"
+#include "xmrstak/net/jpsock.hpp"
+
+#include "telemetry.hpp"
+#include "xmrstak/backend/miner_work.hpp"
+#include "xmrstak/backend/globalStates.hpp"
+#include "xmrstak/backend/backendConnector.hpp"
+
+#include "xmrstak/jconf.hpp"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/donate-level.hpp"
+#include "xmrstak/http/webdesign.hpp"
+
 #include <thread>
 #include <string>
 #include <cmath>
 #include <algorithm>
 #include <assert.h>
 #include <time.h>
-#include "executor.h"
-#include "jpsock.h"
-
-#include "telemetry.h"
-#include "backend/miner_work.h"
-#include "backend/GlobalStates.hpp"
-#include "backend/BackendConnector.hpp"
-
-#include "jconf.h"
-#include "console.h"
-#include "donate-level.h"
-#include "webdesign.h"
 
 #ifdef _WIN32
 #define strncasecmp _strnicmp
diff --git a/xmrstak/misc/executor.hpp b/xmrstak/misc/executor.hpp
index a3a0828..8be5f56 100644
--- a/xmrstak/misc/executor.hpp
+++ b/xmrstak/misc/executor.hpp
@@ -1,16 +1,18 @@
 #pragma once
+
 #include "thdq.hpp"
-#include "msgstruct.h"
+#include "telemetry.hpp"
+#include "xmrstak/backend/iBackend.hpp"
+#include "xmrstak/misc/environment.hpp"
+#include "xmrstak/net/msgstruct.hpp"
+
 #include <atomic>
 #include <array>
 #include <list>
 #include <future>
-#include "telemetry.h"
-#include "backend/IBackend.hpp"
-#include "Environment.hpp"
 
-class jpsock;
 
+class jpsock;
 
 namespace xmrstak
 {
diff --git a/xmrstak/misc/jext.hpp b/xmrstak/misc/jext.hpp
index dce73a0..f4a333c 100644
--- a/xmrstak/misc/jext.hpp
+++ b/xmrstak/misc/jext.hpp
@@ -1,5 +1,8 @@
 #pragma once
 
+#include "xmrstak/rapidjson/document.h"
+#include "xmrstak/rapidjson/error/en.h"
+
 using namespace rapidjson;
 
 /* This macro brings rapidjson more in line with other libs */
diff --git a/xmrstak/misc/telemetry.cpp b/xmrstak/misc/telemetry.cpp
index fafccd5..c5cce23 100644
--- a/xmrstak/misc/telemetry.cpp
+++ b/xmrstak/misc/telemetry.cpp
@@ -21,10 +21,12 @@
   *
   */
 
+#include "telemetry.hpp"
+
 #include <cmath>
 #include <cstring>
 #include <chrono>
-#include "telemetry.h"
+
 
 namespace xmrstak
 {
diff --git a/xmrstak/misc/telemetry.hpp b/xmrstak/misc/telemetry.hpp
index 0538090..b35bbbf 100644
--- a/xmrstak/misc/telemetry.hpp
+++ b/xmrstak/misc/telemetry.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <cstring>
 
 namespace xmrstak
 {