7 files changed, 38 insertions, 42 deletions
diff --git a/xmrstak/backend/amd/amd_gpu/gpu.cpp b/xmrstak/backend/amd/amd_gpu/gpu.cpp
index 04e442a..deb0fc7 100644
--- a/xmrstak/backend/amd/amd_gpu/gpu.cpp
+++ b/xmrstak/backend/amd/amd_gpu/gpu.cpp
@@ -23,7 +23,6 @@
 
 #ifdef _WIN32
 #include <windows.h>
-const char* sSourcePath = "opencl\\cryptonight.cl";
 
 static inline void port_sleep(size_t sec)
 {
@@ -31,7 +30,6 @@ static inline void port_sleep(size_t sec)
 }
 #else
 #include <unistd.h>
-const char* sSourcePath = "opencl/cryptonight.cl";
 
 static inline void port_sleep(size_t sec)
 {
@@ -46,7 +44,7 @@ static inline long long unsigned int int_port(size_t i)
 }
 #endif
 
-#include "gpu.h"
+#include "gpu.hpp"
 
 const char* err_to_str(cl_int ret)
 {
diff --git a/xmrstak/backend/amd/amd_gpu/gpu.hpp b/xmrstak/backend/amd/amd_gpu/gpu.hpp
index 8a71cfa..5ff7ea1 100644
--- a/xmrstak/backend/amd/amd_gpu/gpu.hpp
+++ b/xmrstak/backend/amd/amd_gpu/gpu.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "xmrstak/misc/console.hpp"
+
 #if defined(__APPLE__)
 #include <OpenCL/cl.h>
 #else
@@ -8,7 +10,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include "../../../console.h"
 
 #define ERR_SUCCESS (0)
 #define ERR_OCL_API (2)
diff --git a/xmrstak/backend/amd/autoAdjust.hpp b/xmrstak/backend/amd/autoAdjust.hpp
index 442d8f1..84541ae 100644
--- a/xmrstak/backend/amd/autoAdjust.hpp
+++ b/xmrstak/backend/amd/autoAdjust.hpp
@@ -1,14 +1,13 @@
 
 #pragma once
 
+#include "amd_gpu/gpu.hpp"
 #include "autoAdjust.hpp"
+#include "jconf.hpp"
 
-
-#include "jconf.h"
-#include "../../console.h"
-#include "../../ConfigEditor.hpp"
-#include "amd_gpu/gpu.h"
-#include "../../Params.hpp"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/misc/configEditor.hpp"
+#include "xmrstak/params.hpp"
 
 #include <vector>
 #include <cstdio>
diff --git a/xmrstak/backend/amd/jconf.cpp b/xmrstak/backend/amd/jconf.cpp
index f8a551e..2132ebf 100644
--- a/xmrstak/backend/amd/jconf.cpp
+++ b/xmrstak/backend/amd/jconf.cpp
@@ -22,11 +22,9 @@
   */
 
 
-#include "jconf.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "jconf.hpp"
+#include "xmrstak/misc/jext.hpp"
+#include "xmrstak/misc/console.hpp"
 
 #ifdef _WIN32
 #define strcasecmp _stricmp
@@ -35,10 +33,10 @@
 #include <cpuid.h>
 #endif
 
-#include "../../rapidjson/document.h"
-#include "../../rapidjson/error/en.h"
-#include "../../jext.h"
-#include "../../console.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 
 namespace xmrstak
 {
diff --git a/xmrstak/backend/amd/jconf.hpp b/xmrstak/backend/amd/jconf.hpp
index 9fef331..db41dff 100644
--- a/xmrstak/backend/amd/jconf.hpp
+++ b/xmrstak/backend/amd/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/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp
index f2f5ff4..b2f5620 100644
--- a/xmrstak/backend/amd/minethd.cpp
+++ b/xmrstak/backend/amd/minethd.cpp
@@ -21,28 +21,25 @@
   *
   */
 
+#include "minethd.hpp"
+#include "autoAdjust.hpp"
+#include "amd_gpu/gpu.hpp"
+
+#include "xmrstak/backend/cpu/crypto/cryptonight_aesni.h"
+#include "xmrstak/backend/cpu/crypto/cryptonight.h"
+#include "xmrstak/misc/configEditor.hpp"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/backend/cpu/minethd.hpp"
+#include "xmrstak/jconf.hpp"
+#include "xmrstak/misc/executor.hpp"
+#include "xmrstak/misc/environment.hpp"
+#include "xmrstak/params.hpp"
+
 #include <assert.h>
 #include <cmath>
 #include <chrono>
 #include <thread>
-
-#include "../../ConfigEditor.hpp"
-#include "autoAdjust.hpp"
-
 #include <vector>
-#include "../../console.h"
-#include "../../crypto/cryptonight_aesni.h"
-#include "../cpu/minethd.h"
-#include "../../jconf.h"
-
-#include "../../executor.h"
-#include "minethd.h"
-#include "../../jconf.h"
-#include "../../crypto/cryptonight.h"
-#include "../../Environment.hpp"
-#include "../../Params.hpp"
-#include "amd_gpu/gpu.h"
-
 
 namespace xmrstak
 {
diff --git a/xmrstak/backend/amd/minethd.hpp b/xmrstak/backend/amd/minethd.hpp
index 4fb3b13..7e71082 100644
--- a/xmrstak/backend/amd/minethd.hpp
+++ b/xmrstak/backend/amd/minethd.hpp
@@ -1,11 +1,12 @@
 #pragma once
+
+#include "amd_gpu/gpu.hpp"
+#include "jconf.hpp"
+#include "xmrstak/backend/iBackend.hpp"
+#include "xmrstak/misc/environment.hpp"
+
 #include <thread>
 #include <atomic>
-#include "./jconf.h"
-#include "../IBackend.hpp"
-#include "../../Environment.hpp"
-
-#include "amd_gpu/gpu.h"
 
 namespace xmrstak
 {