cleanup includes

7 files changed, 43 insertions, 37 deletions

diff --git a/xmrstak/backend/cpu/autoAdjust.hpp b/xmrstak/backend/cpu/autoAdjust.hpp
index 32c8576..f686224 100644
--- a/xmrstak/backend/cpu/autoAdjust.hpp
+++ b/xmrstak/backend/cpu/autoAdjust.hpp
@@ -1,9 +1,11 @@
 #pragma once
-#include "jconf.h"
-#include "../../console.h"
-#include "../../jconf.h"
-#include "../../ConfigEditor.hpp"
-#include "../../Params.hpp"
+
+#include "jconf.hpp"
+
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/jconf.hpp"
+#include "xmrstak/misc/configEditor.hpp"
+#include "xmrstak/params.hpp"
 #include <string>
 
 #ifdef _WIN32
diff --git a/xmrstak/backend/cpu/autoAdjustHwloc.hpp b/xmrstak/backend/cpu/autoAdjustHwloc.hpp
index e1916e0..055a7f5 100644
--- a/xmrstak/backend/cpu/autoAdjustHwloc.hpp
+++ b/xmrstak/backend/cpu/autoAdjustHwloc.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "../../console.h"
-#include <hwloc.h>
-#include <stdio.h>
-#include "../../Params.hpp"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/misc/configEditor.hpp"
+#include "xmrstak/params.hpp"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -12,7 +11,10 @@
 #endif // _WIN32
 
 #include <string>
-#include "../../ConfigEditor.hpp"
+
+#include <hwloc.h>
+#include <stdio.h>
+
 
 namespace xmrstak
 {
diff --git a/xmrstak/backend/cpu/hwlocMemory.hpp b/xmrstak/backend/cpu/hwlocMemory.hpp
index f471951..719c1bb 100644
--- a/xmrstak/backend/cpu/hwlocMemory.hpp
+++ b/xmrstak/backend/cpu/hwlocMemory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "console.h"
+#include "xmrstak/misc/console.hpp"
 
 #ifndef CONF_NO_HWLOC
 
diff --git a/xmrstak/backend/cpu/jconf.cpp b/xmrstak/backend/cpu/jconf.cpp
index 021d607..2ded8c0 100644
--- a/xmrstak/backend/cpu/jconf.cpp
+++ b/xmrstak/backend/cpu/jconf.cpp
@@ -21,13 +21,14 @@
   *
   */
 
-#include "jconf.h"
-#include "../../console.h"
-#include <iostream>
+#include "jconf.hpp"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/misc/jext.hpp"
 
+#include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 
 #ifdef _WIN32
 #define strcasecmp _stricmp
@@ -36,9 +37,6 @@
 #include <cpuid.h>
 #endif
 
-#include "../../rapidjson/document.h"
-#include "../../rapidjson/error/en.h"
-#include "../../jext.h"
 
 namespace xmrstak
 {
diff --git a/xmrstak/backend/cpu/jconf.hpp b/xmrstak/backend/cpu/jconf.hpp
index 1f92765..03dfcc1 100644
--- a/xmrstak/backend/cpu/jconf.hpp
+++ b/xmrstak/backend/cpu/jconf.hpp
@@ -1,7 +1,9 @@
 #pragma once
+
+#include "xmrstak/params.hpp"
+
 #include <stdlib.h>
 #include <string>
-#include "../../Params.hpp"
 
 namespace xmrstak
 {
diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp
index 3ffdf99..6037161 100644
--- a/xmrstak/backend/cpu/minethd.cpp
+++ b/xmrstak/backend/cpu/minethd.cpp
@@ -27,19 +27,19 @@
 #include <cstring>
 #include <thread>
 #include <bitset>
-#include "../../console.h"
-#include "../IBackend.hpp"
-#include "../GlobalStates.hpp"
-#include "../../ConfigEditor.hpp"
-#include "../../Params.hpp"
-#include "../../jconf.h"
-
-#include "../../executor.h"
-#include "minethd.h"
-#include "./jconf.h"
-#include "../../crypto/cryptonight_aesni.h"
-#include "../../hwlocMemory.hpp"
-#include "../miner_work.h"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/backend/iBackend.hpp"
+#include "xmrstak/backend//globalStates.hpp"
+#include "xmrstak/misc/configEditor.hpp"
+#include "xmrstak/params.hpp"
+#include "xmrstak/jconf.hpp"
+
+#include "xmrstak/misc/executor.hpp"
+#include "minethd.hpp"
+#include "xmrstak/jconf.hpp"
+#include "xmrstak/backend/crypto/cryptonight_aesni.h"
+#include "hwlocMemory.hpp"
+#include "xmrstak/backend/miner_work.hpp"
 
 #ifndef CONF_NO_HWLOC
 #   include "autoAdjustHwloc.hpp"
diff --git a/xmrstak/backend/cpu/minethd.hpp b/xmrstak/backend/cpu/minethd.hpp
index 40383cf..1dcca86 100644
--- a/xmrstak/backend/cpu/minethd.hpp
+++ b/xmrstak/backend/cpu/minethd.hpp
@@ -1,13 +1,15 @@
 #pragma once
+
+#include "crypto/cryptonight.h"
+#include "xmrstak/backend/miner_work.hpp"
+#include "xmrstak/backend/iBackend.hpp"
+#include "xmrstak/backend/globalStates.hpp"
+
+#include <iostream>
 #include <thread>
 #include <vector>
 #include <atomic>
 #include <mutex>
-#include "../../crypto/cryptonight.h"
-#include "../miner_work.h"
-#include "../IBackend.hpp"
-#include "../GlobalStates.hpp"
-#include <iostream>
 
 namespace xmrstak
 {