diff --git a/easy_profiler_core/block.cpp b/easy_profiler_core/block.cpp
index 5d6ea3f..de0b7b7 100644
--- a/easy_profiler_core/block.cpp
+++ b/easy_profiler_core/block.cpp
@@ -48,6 +48,7 @@
 *                   : limitations under the License.
 ************************************************************************/
 
+#include <easy/profiler.h>
 #include "profile_manager.h"
 #include "current_time.h"
 
diff --git a/easy_profiler_core/current_thread.h b/easy_profiler_core/current_thread.h
index 162db81..816979c 100644
--- a/easy_profiler_core/current_thread.h
+++ b/easy_profiler_core/current_thread.h
@@ -43,7 +43,7 @@ The Apache License, Version 2.0 (the "License");
 #ifndef EASY_PROFILER_CURRENT_THREAD_H
 #define EASY_PROFILER_CURRENT_THREAD_H
 
-#include <easy/profiler.h>
+#include <easy/details/profiler_public_types.h>
 
 #ifdef _WIN32
 # include <Windows.h>
diff --git a/easy_profiler_core/current_time.h b/easy_profiler_core/current_time.h
index 0def691..b08224e 100644
--- a/easy_profiler_core/current_time.h
+++ b/easy_profiler_core/current_time.h
@@ -43,7 +43,7 @@ The Apache License, Version 2.0 (the "License");
 #ifndef EASY_PROFILER_CURRENT_TIME_H
 #define EASY_PROFILER_CURRENT_TIME_H
 
-#include <easy/profiler.h>
+#include <easy/details/profiler_public_types.h>
 
 #if defined(_MSC_VER) && _MSC_VER <= 1800
 // std::chrono for MSVC2013 is broken - it has very low resolution of 16ms
diff --git a/easy_profiler_core/event_trace_win.cpp b/easy_profiler_core/event_trace_win.cpp
index 871a797..ed2ca32 100644
--- a/easy_profiler_core/event_trace_win.cpp
+++ b/easy_profiler_core/event_trace_win.cpp
@@ -60,7 +60,7 @@
 #include <memory.h>
 #include <chrono>
 #include <unordered_map>
-#include <easy/profiler.h>
+#include <easy/details/profiler_public_types.h>
 #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 23eebf1..064ba6a 100644
--- a/easy_profiler_core/include/easy/easy_socket.h
+++ b/easy_profiler_core/include/easy/easy_socket.h
@@ -43,26 +43,31 @@ The Apache License, Version 2.0 (the "License");
 #define EASY_PROFILER_SOCKET_H
 
 #include <stdint.h>
-#include <easy/profiler.h>
+#include <easy/details/easy_compiler_support.h>
+
 #ifndef _WIN32
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <netinet/in.h> //for android-build
+
+// Unix
+# include <sys/types.h>
+# include <sys/socket.h>
+# include <netdb.h>
+# include <stdio.h>
+# include <unistd.h>
+# include <fcntl.h>
+# include <netinet/in.h> //for android-build
+
 #else
 
-#define WIN32_LEAN_AND_MEAN
+// Windows
+# define WIN32_LEAN_AND_MEAN
+# include <winsock2.h>
+# include <windows.h>
+# include <ws2tcpip.h>
+# include <stdlib.h>
 
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#include <stdlib.h>
 #endif
 
-class PROFILER_API EasySocket
+class PROFILER_API EasySocket EASY_FINAL
 {
 public:
 
@@ -84,8 +89,6 @@ private:
 
     socket_t m_socket = 0;
     socket_t m_replySocket = 0;
-
-    int m_receiveTimeoutMs = 0;
     int m_wsaret = -1;
 
     struct hostent* m_server = nullptr;
diff --git a/easy_profiler_core/include/easy/reader.h b/easy_profiler_core/include/easy/reader.h
index 47e39aa..8868427 100644
--- a/easy_profiler_core/include/easy/reader.h
+++ b/easy_profiler_core/include/easy/reader.h
@@ -45,14 +45,12 @@ The Apache License, Version 2.0 (the "License");
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+#include <easy/serialized_block.h>
 #include <unordered_map>
 #include <vector>
 #include <string>
 #include <atomic>
 
-#include <easy/profiler.h>
-#include <easy/serialized_block.h>
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace profiler {
diff --git a/easy_profiler_core/nonscoped_block.h b/easy_profiler_core/nonscoped_block.h
index 148a600..5655f5a 100644
--- a/easy_profiler_core/nonscoped_block.h
+++ b/easy_profiler_core/nonscoped_block.h
@@ -43,7 +43,7 @@ The Apache License, Version 2.0 (the "License");
 #ifndef EASY_PROFILER_NONSCOPED_BLOCK_H
 #define EASY_PROFILER_NONSCOPED_BLOCK_H
 
-#include <easy/profiler.h>
+#include <easy/details/profiler_public_types.h>
 
 class NonscopedBlock : public profiler::Block
 {
diff --git a/easy_profiler_core/profile_manager.cpp b/easy_profiler_core/profile_manager.cpp
index 1167a34..641a328 100644
--- a/easy_profiler_core/profile_manager.cpp
+++ b/easy_profiler_core/profile_manager.cpp
@@ -53,6 +53,8 @@
 #include <future>
 #include "profile_manager.h"
 
+#include <easy/profiler.h>
+#include <easy/arbitrary_value.h>
 #include <easy/serialized_block.h>
 #include <easy/easy_net.h>
 #include <easy/easy_socket.h>
diff --git a/easy_profiler_core/profile_manager.h b/easy_profiler_core/profile_manager.h
index 9c31cb1..035e13a 100644
--- a/easy_profiler_core/profile_manager.h
+++ b/easy_profiler_core/profile_manager.h
@@ -43,9 +43,7 @@ The Apache License, Version 2.0 (the "License");
 #ifndef EASY_PROFILER_MANAGER_H
 #define EASY_PROFILER_MANAGER_H
 
-#include <easy/profiler.h>
-#include <easy/arbitrary_value.h>
-#include <easy/easy_socket.h>
+#include <easy/details/profiler_public_types.h>
 
 #include "spin_lock.h"
 #include "outstream.h"
@@ -65,6 +63,8 @@ typedef uint64_t processid_t;
 
 class BlockDescriptor;
 
+namespace profiler { class ValueId; }
+
 class ProfileManager
 {
 #ifndef EASY_MAGIC_STATIC_AVAILABLE
diff --git a/easy_profiler_core/reader.cpp b/easy_profiler_core/reader.cpp
index b0a267d..833021c 100644
--- a/easy_profiler_core/reader.cpp
+++ b/easy_profiler_core/reader.cpp
@@ -67,6 +67,7 @@
 ************************************************************************/
 
 #include <easy/reader.h>
+#include <easy/profiler.h>
 
 #include "hashed_cstr.h"
 
diff --git a/easy_profiler_core/thread_storage.h b/easy_profiler_core/thread_storage.h
index eab7878..0ec640e 100644
--- a/easy_profiler_core/thread_storage.h
+++ b/easy_profiler_core/thread_storage.h
@@ -43,8 +43,8 @@ The Apache License, Version 2.0 (the "License");
 #ifndef EASY_PROFILER_THREAD_STORAGE_H
 #define EASY_PROFILER_THREAD_STORAGE_H
 
-#include <easy/profiler.h>
-#include <easy/arbitrary_value.h>
+#include <easy/details/profiler_public_types.h>
+#include <easy/details/arbitrary_value_public_types.h>
 #include <vector>
 #include <string>
 #include <atomic>
diff --git a/profiler_gui/descriptors_tree_widget.h b/profiler_gui/descriptors_tree_widget.h
index 69d7209..5ed1121 100644
--- a/profiler_gui/descriptors_tree_widget.h
+++ b/profiler_gui/descriptors_tree_widget.h
@@ -62,7 +62,7 @@
 #include <vector>
 #include <unordered_set>
 
-#include <easy/profiler.h>
+#include <easy/details/profiler_public_types.h>
 
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/profiler_gui/easy_frame_rate_viewer.h b/profiler_gui/easy_frame_rate_viewer.h
index d74d314..1453b9f 100644
--- a/profiler_gui/easy_frame_rate_viewer.h
+++ b/profiler_gui/easy_frame_rate_viewer.h
@@ -60,7 +60,6 @@
 #include <QTimer>
 #include <vector>
 #include <deque>
-#include <easy/profiler.h>
 
 //////////////////////////////////////////////////////////////////////////
 
diff --git a/profiler_gui/globals_qobjects.h b/profiler_gui/globals_qobjects.h
index b34d924..b394b9c 100644
--- a/profiler_gui/globals_qobjects.h
+++ b/profiler_gui/globals_qobjects.h
@@ -56,7 +56,7 @@
 #define EASY_GLOBALS_QOBJECTS_H
 
 #include <QObject>
-#include <easy/profiler.h>
+#include <easy/details/profiler_public_types.h>
 
 namespace profiler_gui {
 
diff --git a/profiler_gui/main_window.cpp b/profiler_gui/main_window.cpp
index 5c17075..f0f164b 100644
--- a/profiler_gui/main_window.cpp
+++ b/profiler_gui/main_window.cpp
@@ -102,6 +102,7 @@
 #include "globals.h"
 
 #include <easy/easy_net.h>
+#include <easy/profiler.h>
 
 #ifdef max
 #undef max