cleanup includes

6 files changed, 23 insertions, 16 deletions

diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp
index d287375..ae20e52 100644
--- a/xmrstak/net/jpsock.cpp
+++ b/xmrstak/net/jpsock.cpp
@@ -24,15 +24,15 @@
 #include <stdarg.h>
 #include <assert.h>
 
-#include "jpsock.h"
-#include "executor.h"
-#include "jconf.h"
-
-#include "rapidjson/document.h"
-#include "jext.h"
-#include "socks.h"
-#include "socket.h"
-#include "version.h"
+#include "jpsock.hpp"
+#include "socks.hpp"
+#include "socket.hpp"
+
+#include "xmrstak/misc/executor.hpp"
+#include "xmrstak/jconf.hpp"
+#include "xmrstak/misc/jext.hpp"
+#include "xmrstak/version.hpp"
+
 
 #define AGENTID_STR XMR_STAK_NAME "/" XMR_STAK_VERSION
 
diff --git a/xmrstak/net/jpsock.hpp b/xmrstak/net/jpsock.hpp
index 4baaade..c2194ad 100644
--- a/xmrstak/net/jpsock.hpp
+++ b/xmrstak/net/jpsock.hpp
@@ -1,11 +1,13 @@
 #pragma once
+
+#include "msgstruct.hpp"
+
 #include <mutex>
 #include <atomic>
 #include <condition_variable>
 #include <thread>
 #include <string>
 
-#include "msgstruct.h"
 
 /* Our pool can have two kinds of errors:
 	- Parsing or connection error
diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp
index f3a39b2..05d15fe 100644
--- a/xmrstak/net/msgstruct.hpp
+++ b/xmrstak/net/msgstruct.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <string>
 #include <string.h>
 #include <assert.h>
diff --git a/xmrstak/net/socket.cpp b/xmrstak/net/socket.cpp
index 52f46b5..b93376e 100644
--- a/xmrstak/net/socket.cpp
+++ b/xmrstak/net/socket.cpp
@@ -21,11 +21,11 @@
   *
   */
 
-#include "socket.h"
-#include "jpsock.h"
-#include "jconf.h"
-#include "console.h"
-#include "executor.h"
+#include "socket.hpp"
+#include "jpsock.hpp"
+#include "xmrstak/jconf.hpp"
+#include "xmrstak/misc/console.hpp"
+#include "xmrstak/misc/executor.hpp"
 
 #ifndef CONF_NO_TLS
 #include <openssl/ssl.h>
diff --git a/xmrstak/net/socket.hpp b/xmrstak/net/socket.hpp
index 94bbf03..192a32c 100644
--- a/xmrstak/net/socket.hpp
+++ b/xmrstak/net/socket.hpp
@@ -1,5 +1,7 @@
 #pragma once
-#include "socks.h"
+
+#include "socks.hpp"
+
 class jpsock;
 
 class base_socket
diff --git a/xmrstak/net/socks.hpp b/xmrstak/net/socks.hpp
index 82bfa2f..1d25d3a 100644
--- a/xmrstak/net/socks.hpp
+++ b/xmrstak/net/socks.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 #ifdef _WIN32
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0601  /* Windows 7 */
@@ -7,6 +8,7 @@
 #include <ws2tcpip.h>
 #include <windows.h>
 
+
 inline void sock_init()
 {
 	static bool bWSAInit = false;