diff --git a/components/livestatus/livestatus.vcxproj b/components/livestatus/livestatus.vcxproj
index ee9f21de1..d63feeddf 100644
--- a/components/livestatus/livestatus.vcxproj
+++ b/components/livestatus/livestatus.vcxproj
@@ -31,7 +31,6 @@
     <ClInclude Include="hoststable.h" />
     <ClInclude Include="i2-livestatus.h" />
     <ClInclude Include="component.h" />
-    <ClInclude Include="connection.h" />
     <ClInclude Include="negatefilter.h" />
     <ClInclude Include="orfilter.h" />
     <ClInclude Include="query.h" />
@@ -46,7 +45,6 @@
     <ClCompile Include="combinerfilter.cpp" />
     <ClCompile Include="commentstable.cpp" />
     <ClCompile Include="component.cpp" />
-    <ClCompile Include="connection.cpp" />
     <ClCompile Include="contactgroupstable.cpp" />
     <ClCompile Include="contactstable.cpp" />
     <ClCompile Include="downtimestable.cpp" />
diff --git a/components/livestatus/livestatus.vcxproj.filters b/components/livestatus/livestatus.vcxproj.filters
index 4c09babc3..33da808b8 100644
--- a/components/livestatus/livestatus.vcxproj.filters
+++ b/components/livestatus/livestatus.vcxproj.filters
@@ -12,9 +12,6 @@
     <ClInclude Include="i2-livestatus.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="connection.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="component.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -71,9 +68,6 @@
     <ClCompile Include="component.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="connection.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="query.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
diff --git a/lib/base/base.vcxproj b/lib/base/base.vcxproj
index 121e3987d..d9136d56b 100644
--- a/lib/base/base.vcxproj
+++ b/lib/base/base.vcxproj
@@ -22,11 +22,12 @@
     <ClCompile Include="application.cpp" />
     <ClCompile Include="array.cpp" />
     <ClCompile Include="attribute.cpp" />
-    <ClCompile Include="connection.cpp" />
+    <ClCompile Include="bufferedstream.cpp" />
     <ClCompile Include="convert.cpp" />
     <ClCompile Include="dynamicobject.cpp" />
     <ClCompile Include="dictionary.cpp" />
     <ClCompile Include="dynamictype.cpp" />
+    <ClCompile Include="networkstream.cpp" />
     <ClCompile Include="threadpool.cpp" />
     <ClCompile Include="exception.cpp" />
     <ClCompile Include="fifo.cpp" />
@@ -60,11 +61,12 @@
     <ClInclude Include="application.h" />
     <ClInclude Include="array.h" />
     <ClInclude Include="attribute.h" />
-    <ClInclude Include="connection.h" />
+    <ClInclude Include="bufferedstream.h" />
     <ClInclude Include="convert.h" />
     <ClInclude Include="dynamicobject.h" />
     <ClInclude Include="dictionary.h" />
     <ClInclude Include="dynamictype.h" />
+    <ClInclude Include="networkstream.h" />
     <ClInclude Include="threadpool.h" />
     <ClInclude Include="fifo.h" />
     <ClInclude Include="logger_fwd.h" />
@@ -255,4 +257,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib/base/base.vcxproj.filters b/lib/base/base.vcxproj.filters
index 5a15e4634..64c600a3b 100644
--- a/lib/base/base.vcxproj.filters
+++ b/lib/base/base.vcxproj.filters
@@ -43,9 +43,6 @@
     <ClCompile Include="scriptfunction.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="scripttask.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="fifo.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -70,9 +67,6 @@
     <ClCompile Include="stream_bio.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="connection.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="unixsocket.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -94,9 +88,6 @@
     <ClCompile Include="process-windows.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="eventqueue.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="attribute.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
@@ -109,6 +100,10 @@
     <ClCompile Include="tlsutility.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="threadpool.cpp" />
+    <ClCompile Include="scriptfunctionwrapper.cpp" />
+    <ClCompile Include="bufferedstream.cpp" />
+    <ClCompile Include="networkstream.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="application.h">
@@ -156,15 +151,9 @@
     <ClInclude Include="sysloglogger.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="asynctask.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="process.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="scripttask.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="scriptfunction.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -192,9 +181,6 @@
     <ClInclude Include="stream_bio.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="connection.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="unixsocket.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -210,9 +196,6 @@
     <ClInclude Include="objectlock.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="eventqueue.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="attribute.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -234,6 +217,10 @@
     <ClInclude Include="singleton.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="threadpool.h" />
+    <ClInclude Include="scriptfunctionwrapper.h" />
+    <ClInclude Include="bufferedstream.h" />
+    <ClInclude Include="networkstream.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Quelldateien">
diff --git a/lib/base/socket.cpp b/lib/base/socket.cpp
index 2672af43d..0ee91e2c0 100644
--- a/lib/base/socket.cpp
+++ b/lib/base/socket.cpp
@@ -220,7 +220,7 @@ void Socket::Listen(void)
  */
 size_t Socket::Write(const void *buffer, size_t count)
 {
-	int rc = send(GetFD(), buffer, count, 0);
+	int rc = send(GetFD(), (const char *)buffer, count, 0);
 
 	if (rc < 0) {
 #ifndef _WIN32
@@ -242,7 +242,7 @@ size_t Socket::Write(const void *buffer, size_t count)
  */
 size_t Socket::Read(void *buffer, size_t count)
 {
-	int rc = recv(GetFD(), buffer, count, 0);
+	int rc = recv(GetFD(), (char *)buffer, count, 0);
 
 	if (rc < 0) {
 #ifndef _WIN32
diff --git a/lib/icinga/legacytimeperiod.cpp b/lib/icinga/legacytimeperiod.cpp
index 8d09a7277..5f961fe21 100644
--- a/lib/icinga/legacytimeperiod.cpp
+++ b/lib/icinga/legacytimeperiod.cpp
@@ -340,8 +340,8 @@ Dictionary::Ptr LegacyTimePeriod::ProcessTimeRange(const String& timerange, tm *
 	end.tm_hour = Convert::ToLong(hd2[0]);
 
 	Dictionary::Ptr segment = boost::make_shared<Dictionary>();
-	segment->Set("begin", mktime(&begin));
-	segment->Set("end", mktime(&end));
+	segment->Set("begin", (long)mktime(&begin));
+	segment->Set("end", (long)mktime(&end));
 
 	return segment;
 }
diff --git a/lib/remoting/remoting.vcxproj b/lib/remoting/remoting.vcxproj
index 49f87f94b..ab92ceca0 100644
--- a/lib/remoting/remoting.vcxproj
+++ b/lib/remoting/remoting.vcxproj
@@ -22,7 +22,7 @@
     <ClInclude Include="endpoint.h" />
     <ClInclude Include="endpointmanager.h" />
     <ClInclude Include="i2-remoting.h" />
-    <ClInclude Include="jsonrpcconnection.h" />
+    <ClInclude Include="jsonrpc.h" />
     <ClInclude Include="requestmessage.h" />
     <ClInclude Include="responsemessage.h" />
     <ClInclude Include="messagepart.h" />
@@ -30,7 +30,7 @@
   <ItemGroup>
     <ClCompile Include="endpoint.cpp" />
     <ClCompile Include="endpointmanager.cpp" />
-    <ClCompile Include="jsonrpcconnection.cpp" />
+    <ClCompile Include="jsonrpc.cpp" />
     <ClCompile Include="remoting-type.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
diff --git a/lib/remoting/remoting.vcxproj.filters b/lib/remoting/remoting.vcxproj.filters
index 7e7514746..b3662201f 100644
--- a/lib/remoting/remoting.vcxproj.filters
+++ b/lib/remoting/remoting.vcxproj.filters
@@ -16,12 +16,10 @@
     <ClCompile Include="endpointmanager.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="jsonrpcconnection.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
     <ClCompile Include="remoting-type.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="jsonrpc.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="messagepart.h">
@@ -42,9 +40,7 @@
     <ClInclude Include="endpointmanager.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="jsonrpcconnection.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
+    <ClInclude Include="jsonrpc.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Headerdateien">
diff --git a/test/test.vcxproj b/test/test.vcxproj
index 37d8e842e..39476a28a 100644
--- a/test/test.vcxproj
+++ b/test/test.vcxproj
@@ -159,7 +159,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="base-array.cpp" />
+    <ClCompile Include="base-convert.cpp" />
     <ClCompile Include="base-dictionary.cpp" />
+    <ClCompile Include="base-fifo.cpp" />
+    <ClCompile Include="base-match.cpp" />
+    <ClCompile Include="base-object.cpp" />
+    <ClCompile Include="base-shellescape.cpp" />
+    <ClCompile Include="base-timer.cpp" />
     <ClCompile Include="test.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/test/test.vcxproj.filters b/test/test.vcxproj.filters
index 75fd96994..7ad20b45b 100644
--- a/test/test.vcxproj.filters
+++ b/test/test.vcxproj.filters
@@ -21,5 +21,26 @@
     <ClCompile Include="test.cpp">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="base-array.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="base-convert.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="base-fifo.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="base-match.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="base-object.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="base-shellescape.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="base-timer.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file