diff --git a/libnatkit-solution/Win64-Imu-Application/Win64-Imu-Application.vcxproj b/libnatkit-solution/Win64-Imu-Application/Win64-Imu-Application.vcxproj
index 431fbed..0c140c0 100644
--- a/libnatkit-solution/Win64-Imu-Application/Win64-Imu-Application.vcxproj
+++ b/libnatkit-solution/Win64-Imu-Application/Win64-Imu-Application.vcxproj
@@ -105,7 +105,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\third-party\nlohmann\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\util\src\main\cxx;$(SolutionDir)..\lib\libnatkit-core\include;$(SolutionDir)..\libnatkit\include;$(SolutionDir)..\third-party\nlohmann\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/libnatkit/core/bridge/libnatkit-core-bridge/libnatkit-core-bridge.vcxproj b/libnatkit/core/bridge/libnatkit-core-bridge/libnatkit-core-bridge.vcxproj
index a17f5d0..15d6bc1 100644
--- a/libnatkit/core/bridge/libnatkit-core-bridge/libnatkit-core-bridge.vcxproj
+++ b/libnatkit/core/bridge/libnatkit-core-bridge/libnatkit-core-bridge.vcxproj
@@ -108,7 +108,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>C:\Program Files\mosquitto\devel;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\util\src\main\cxx;$(SolutionDir)..\lib\libnatkit-core\include;$(SolutionDir)..\libnatkit\include;C:\Program Files\mosquitto\devel;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/libnatkit/core/kafka/libnatkit-core-kafka/libnatkit-core-kafka.vcxproj b/libnatkit/core/kafka/libnatkit-core-kafka/libnatkit-core-kafka.vcxproj
index 07f641c..11e1d5a 100644
--- a/libnatkit/core/kafka/libnatkit-core-kafka/libnatkit-core-kafka.vcxproj
+++ b/libnatkit/core/kafka/libnatkit-core-kafka/libnatkit-core-kafka.vcxproj
@@ -108,7 +108,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\core\kafka\src\main\cxx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\core\kafka\src\main\cxx;$(SolutionDir)..\libnatkit\util\src\main\cxx;$(SolutionDir)..\lib\libnatkit-core\include;$(SolutionDir)..\libnatkit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/libnatkit/core/mqtt/libnatkit-core-mqtt/libnatkit-core-mqtt.vcxproj b/libnatkit/core/mqtt/libnatkit-core-mqtt/libnatkit-core-mqtt.vcxproj
index a3754fd..e98bd55 100644
--- a/libnatkit/core/mqtt/libnatkit-core-mqtt/libnatkit-core-mqtt.vcxproj
+++ b/libnatkit/core/mqtt/libnatkit-core-mqtt/libnatkit-core-mqtt.vcxproj
@@ -105,6 +105,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\include;$(SolutionDir)..\libnatkit\core\mqtt\src\main\cxx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj b/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj
index dd32045..534b7a6 100644
--- a/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj
+++ b/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj
@@ -108,7 +108,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\third-party\nlohmann\include;$(SolutionDir)..\libnatkit\core\streams\src\main\cxx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\util\src\main\cxx;$(SolutionDir)..\third-party\nlohmann\include;$(SolutionDir)..\libnatkit\core\streams\src\main\cxx;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj.filters b/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj.filters
index 52110f6..1613f29 100644
--- a/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj.filters
+++ b/libnatkit/core/streams/libnatkit-core-streams/libnatkit-core-streams.vcxproj.filters
@@ -97,7 +97,7 @@
       <Filter>Header Files\libnatkit\core\streams\stream</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\third-party\nlohmann\single_include\nlohmann\json.hpp">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files\nlohmann</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
diff --git a/libnatkit/tools/libnatkit-mosquitto-kafka-bridge-application/libnatkit-mosquitto-kafka-bridge-application.vcxproj b/libnatkit/tools/libnatkit-mosquitto-kafka-bridge-application/libnatkit-mosquitto-kafka-bridge-application.vcxproj
index 16dd1e6..69858f4 100644
--- a/libnatkit/tools/libnatkit-mosquitto-kafka-bridge-application/libnatkit-mosquitto-kafka-bridge-application.vcxproj
+++ b/libnatkit/tools/libnatkit-mosquitto-kafka-bridge-application/libnatkit-mosquitto-kafka-bridge-application.vcxproj
@@ -105,6 +105,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\util\src\main\cxx;$(SolutionDir)..\lib\libnatkit-core\include;$(SolutionDir)..\libnatkit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/libnatkit/tools/libnatkit-mosquitto-kafka-bridge/libnatkit-mosquitto-kafka-bridge.vcxproj b/libnatkit/tools/libnatkit-mosquitto-kafka-bridge/libnatkit-mosquitto-kafka-bridge.vcxproj
index 20e3a40..abdeee0 100644
--- a/libnatkit/tools/libnatkit-mosquitto-kafka-bridge/libnatkit-mosquitto-kafka-bridge.vcxproj
+++ b/libnatkit/tools/libnatkit-mosquitto-kafka-bridge/libnatkit-mosquitto-kafka-bridge.vcxproj
@@ -105,6 +105,7 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libnatkit\util\src\main\cxx;$(SolutionDir)..\lib\libnatkit-core\include;$(SolutionDir)..\libnatkit\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>