diff --git a/I2PControl.cpp b/I2PControl.cpp
index 49085f5e..31e5dbf4 100644
--- a/I2PControl.cpp
+++ b/I2PControl.cpp
@@ -1,3 +1,5 @@
+#include "I2PControl.h"
+
 #include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -8,7 +10,6 @@
 #include "Daemon.h"
 #include "Tunnel.h"
 #include "Timestamp.h"
-#include "I2PControl.h"
 
 namespace i2p
 {
diff --git a/Win32/i2pd.vcxproj b/Win32/i2pd.vcxproj
index 745ebe10..e34ead3d 100644
--- a/Win32/i2pd.vcxproj
+++ b/Win32/i2pd.vcxproj
@@ -22,7 +22,7 @@
     <ClCompile Include="..\AddressBook.cpp" />
     <ClCompile Include="..\aes.cpp" />
     <ClCompile Include="..\base64.cpp" />
-	<ClCompile Include="..\BOB.cpp" />
+    <ClCompile Include="..\BOB.cpp" />
     <ClCompile Include="..\CryptoConst.cpp" />
     <ClCompile Include="..\Daemon.cpp" />
     <ClCompile Include="..\DaemonWin32.cpp" />
@@ -32,6 +32,7 @@
     <ClCompile Include="..\I2NPProtocol.cpp" />
     <ClCompile Include="..\i2p.cpp" />
     <ClCompile Include="..\I2PEndian.cpp" />
+    <ClCompile Include="..\I2PService.cpp" />
     <ClCompile Include="..\Identity.cpp" />
     <ClCompile Include="..\LeaseSet.cpp" />
     <ClCompile Include="..\Log.cpp" />
@@ -57,14 +58,14 @@
     <ClCompile Include="..\util.cpp" />
     <ClCompile Include="..\SOCKS.cpp" />
     <ClCompile Include="..\I2PTunnel.cpp" />
-	<ClCompile Include="..\I2PControl.cpp" />
+    <ClCompile Include="..\I2PControl.cpp" />
     <ClCompile Include="..\ClientContext.cpp" />
     <ClCompile Include="Win32Service.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\AddressBook.h" />
     <ClInclude Include="..\base64.h" />
-	<ClInclude Include="..\BOB.h" />
+    <ClInclude Include="..\BOB.h" />
     <ClInclude Include="..\CryptoConst.h" />
     <ClInclude Include="..\Daemon.h" />
     <ClInclude Include="..\ElGamal.h" />
@@ -73,6 +74,7 @@
     <ClInclude Include="..\HTTPServer.h" />
     <ClInclude Include="..\I2NPProtocol.h" />
     <ClInclude Include="..\I2PEndian.h" />
+    <ClInclude Include="..\I2PService.h" />
     <ClInclude Include="..\Identity.h" />
     <ClInclude Include="..\LeaseSet.h" />
     <ClInclude Include="..\LittleBigEndian.h" />
@@ -103,7 +105,7 @@
     <ClInclude Include="..\util.h" />
     <ClInclude Include="..\SOCKS.h" />
     <ClInclude Include="..\I2PTunnel.h" />
-	<ClInclude Include="..\I2PControl.h" />
+    <ClInclude Include="..\I2PControl.h" />
     <ClInclude Include="..\version.h" />
     <ClInclude Include="..\Signature.h" />
     <ClInclude Include="..\ClientContext.h" />
@@ -282,4 +284,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Win32/i2pd.vcxproj.filters b/Win32/i2pd.vcxproj.filters
index 31d2a995..5392e604 100644
--- a/Win32/i2pd.vcxproj.filters
+++ b/Win32/i2pd.vcxproj.filters
@@ -135,6 +135,15 @@
     <ClCompile Include="..\ClientContext.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\BOB.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\I2PControl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\I2PService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Identity.h">
@@ -275,6 +284,15 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\BOB.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\I2PControl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\I2PService.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">