diff --git a/easy_profiler_core/current_time.h b/easy_profiler_core/current_time.h
index f6b4bea..3f49a11 100644
--- a/easy_profiler_core/current_time.h
+++ b/easy_profiler_core/current_time.h
@@ -33,7 +33,7 @@ along with this program.If not, see .
#ifndef EASY_PROFILER_CURRENT_TIME_H
#define EASY_PROFILER_CURRENT_TIME_H
-#include "easy/profiler.h"
+#include
#ifdef _WIN32
#include
diff --git a/easy_profiler_core/easy_socket.cpp b/easy_profiler_core/easy_socket.cpp
index b1366e7..41c6396 100644
--- a/easy_profiler_core/easy_socket.cpp
+++ b/easy_profiler_core/easy_socket.cpp
@@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License
along with this program.If not, see .
**/
-#include "easy/easy_socket.h"
+#include
#include
#include
diff --git a/easy_profiler_core/event_trace_win.cpp b/easy_profiler_core/event_trace_win.cpp
index 663634d..14ce6d2 100644
--- a/easy_profiler_core/event_trace_win.cpp
+++ b/easy_profiler_core/event_trace_win.cpp
@@ -50,7 +50,7 @@
#include
#include
#include
-#include "easy/profiler.h"
+#include
#include "profile_manager.h"
#include "current_time.h"
diff --git a/easy_profiler_core/include/easy/easy_socket.h b/easy_profiler_core/include/easy/easy_socket.h
index 843fc53..7e071de 100644
--- a/easy_profiler_core/include/easy/easy_socket.h
+++ b/easy_profiler_core/include/easy/easy_socket.h
@@ -33,7 +33,7 @@ along with this program.If not, see .
#define EASY________SOCKET_________H
#include
-#include "easy/profiler.h"
+#include
#ifndef _WIN32
#include
#include
diff --git a/easy_profiler_core/include/easy/profiler.h b/easy_profiler_core/include/easy/profiler.h
index 1bef5ff..c72dc52 100644
--- a/easy_profiler_core/include/easy/profiler.h
+++ b/easy_profiler_core/include/easy/profiler.h
@@ -33,7 +33,7 @@ along with this program.If not, see .
#ifndef EASY_PROFILER_H
#define EASY_PROFILER_H
-#include "easy/profiler_aux.h"
+#include
#if defined ( __clang__ )
# pragma clang diagnostic push
@@ -59,7 +59,7 @@ along with this program.If not, see .
/** Macro for beginning of a block with custom name and color.
\code
- #include "easy/profiler.h"
+ #include
void foo()
{
// some code ...
@@ -99,7 +99,7 @@ Block will be automatically completed by destructor.
/** Macro for beginning of a block with function name and custom color.
\code
- #include "easy/profiler.h"
+ #include
void foo(){
EASY_FUNCTION(); // Block with name="foo" and default color
//some code...
@@ -129,7 +129,7 @@ Name of the block automatically created with function name.
/** Macro for completion of last opened block.
\code
-#include "easy/profiler.h"
+#include
int foo()
{
// some code ...
diff --git a/easy_profiler_core/include/easy/profiler_aux.h b/easy_profiler_core/include/easy/profiler_aux.h
index 164b409..82c9b2b 100644
--- a/easy_profiler_core/include/easy/profiler_aux.h
+++ b/easy_profiler_core/include/easy/profiler_aux.h
@@ -46,8 +46,9 @@
#define EASY_PROFILER_AUX_H
#include
-#include "easy/easy_compiler_support.h"
-#include "easy/profiler_colors.h"
+
+#include
+#include
//////////////////////////////////////////////////////////////////////////
diff --git a/easy_profiler_core/include/easy/reader.h b/easy_profiler_core/include/easy/reader.h
index 23b8a52..87190b5 100644
--- a/easy_profiler_core/include/easy/reader.h
+++ b/easy_profiler_core/include/easy/reader.h
@@ -39,8 +39,9 @@ along with this program.If not, see .
#include
#include
#include
-#include "easy/profiler.h"
-#include "easy/serialized_block.h"
+
+#include
+#include
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/easy_profiler_core/include/easy/serialized_block.h b/easy_profiler_core/include/easy/serialized_block.h
index 4b34db4..6966502 100644
--- a/easy_profiler_core/include/easy/serialized_block.h
+++ b/easy_profiler_core/include/easy/serialized_block.h
@@ -33,7 +33,7 @@ along with this program.If not, see .
#ifndef EASY_PROFILER_SERIALIZED_BLOCK_H
#define EASY_PROFILER_SERIALIZED_BLOCK_H
-#include "easy/profiler.h"
+#include
namespace profiler {
diff --git a/easy_profiler_core/profile_manager.cpp b/easy_profiler_core/profile_manager.cpp
index 51f42e9..eb7ff05 100644
--- a/easy_profiler_core/profile_manager.cpp
+++ b/easy_profiler_core/profile_manager.cpp
@@ -41,9 +41,11 @@
#include
#include
#include "profile_manager.h"
-#include "easy/serialized_block.h"
-#include "easy/easy_net.h"
-#include "easy/easy_socket.h"
+
+#include
+#include
+#include
+
#include "event_trace_win.h"
#include "current_time.h"
diff --git a/easy_profiler_core/profile_manager.h b/easy_profiler_core/profile_manager.h
index 657d4c8..4010d08 100644
--- a/easy_profiler_core/profile_manager.h
+++ b/easy_profiler_core/profile_manager.h
@@ -33,11 +33,13 @@ along with this program.If not, see .
#ifndef EASY_PROFILER_MANAGER_H
#define EASY_PROFILER_MANAGER_H
-#include "easy/profiler.h"
-#include "easy/easy_socket.h"
+#include
+#include
+
#include "spin_lock.h"
#include "outstream.h"
#include "hashed_cstr.h"
+
#include