diff --git a/clean_build.bat b/clean_build.bat
index edce29c0..8f9fa8b9 100644
--- a/clean_build.bat
+++ b/clean_build.bat
@@ -67,9 +67,11 @@ if exist bin\Debug (
 )
 
 echo Build completed successfully
+set BUILD_FAILED=0
 goto done
 
 :failed
+set BUILD_FAILED=%ERRORLEVEL%
 echo Build failed
 
 :done
@@ -84,3 +86,5 @@ set BONJOUR_SDK_HOME=
 set B_QT_FULLPATH=
 set savedir=
 set cmake_gen=
+
+EXIT /B %BUILD_FAILED%
diff --git a/src/lib/arch/win32/ArchInternetWindows.cpp b/src/lib/arch/win32/ArchInternetWindows.cpp
index ac6968cd..8a28fde4 100644
--- a/src/lib/arch/win32/ArchInternetWindows.cpp
+++ b/src/lib/arch/win32/ArchInternetWindows.cpp
@@ -18,6 +18,7 @@
 #include "arch/win32/ArchInternetWindows.h"
 #include "arch/win32/XArchWindows.h"
 #include "arch/Arch.h"
+#include "base/String.h"
 #include "common/Version.h"
 
 #include <sstream>
diff --git a/src/lib/arch/win32/XArchWindows.cpp b/src/lib/arch/win32/XArchWindows.cpp
index a25f019b..e116edaf 100644
--- a/src/lib/arch/win32/XArchWindows.cpp
+++ b/src/lib/arch/win32/XArchWindows.cpp
@@ -18,6 +18,7 @@
 
 #include "arch/win32/XArchWindows.h"
 #include "arch/win32/ArchNetworkWinsock.h"
+#include "base/String.h"
 
 //
 // XArchEvalWindows
diff --git a/src/lib/arch/win32/XArchWindows.h b/src/lib/arch/win32/XArchWindows.h
index 10106b16..4fb2a237 100644
--- a/src/lib/arch/win32/XArchWindows.h
+++ b/src/lib/arch/win32/XArchWindows.h
@@ -30,7 +30,7 @@ public:
     XArchEvalWindows(DWORD error) : m_error(error) { }
     virtual ~XArchEvalWindows() { }
 
-    virtual std::string    eval() const;
+    virtual std::string    eval() const noexcept;
 
 private:
     DWORD                m_error;
@@ -42,7 +42,7 @@ public:
     XArchEvalWinsock(int error) : m_error(error) { }
     virtual ~XArchEvalWinsock() { }
 
-    virtual std::string    eval() const;
+    virtual std::string    eval() const noexcept;
 
 private:
     int                    m_error;
diff --git a/src/lib/barrier/PlatformScreen.h b/src/lib/barrier/PlatformScreen.h
index f8d0cf98..38bf8de4 100644
--- a/src/lib/barrier/PlatformScreen.h
+++ b/src/lib/barrier/PlatformScreen.h
@@ -20,6 +20,7 @@
 
 #include "barrier/IPlatformScreen.h"
 #include "barrier/DragInformation.h"
+#include <stdexcept>
 
 //! Base screen implementation
 /*!
diff --git a/src/lib/base/IEventQueue.h b/src/lib/base/IEventQueue.h
index e99460b5..66695073 100644
--- a/src/lib/base/IEventQueue.h
+++ b/src/lib/base/IEventQueue.h
@@ -20,6 +20,7 @@
 
 #include "common/IInterface.h"
 #include "base/Event.h"
+#include <string>
 
 class IEventJob;
 class IEventQueueBuffer;
diff --git a/src/lib/platform/MSWindowsDesks.cpp b/src/lib/platform/MSWindowsDesks.cpp
index ec82705c..768ccb4b 100644
--- a/src/lib/platform/MSWindowsDesks.cpp
+++ b/src/lib/platform/MSWindowsDesks.cpp
@@ -902,7 +902,7 @@ MSWindowsDesks::closeDesktop(HDESK desk)
 std::string MSWindowsDesks::getDesktopName(HDESK desk)
 {
     if (desk == NULL) {
-        return {}
+        return {};
     }
     else {
         DWORD size;
diff --git a/src/lib/platform/MSWindowsUtil.cpp b/src/lib/platform/MSWindowsUtil.cpp
index 3804f596..b6b809fa 100644
--- a/src/lib/platform/MSWindowsUtil.cpp
+++ b/src/lib/platform/MSWindowsUtil.cpp
@@ -19,6 +19,7 @@
 #include "platform/MSWindowsUtil.h"
 
 #include <stdio.h>
+#include "base/String.h"
 
 //
 // MSWindowsUtil
diff --git a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp
index f3f9e32c..9373d14e 100644
--- a/src/test/integtests/platform/MSWindowsKeyStateTests.cpp
+++ b/src/test/integtests/platform/MSWindowsKeyStateTests.cpp
@@ -40,7 +40,6 @@ class MSWindowsKeyStateTests : public ::testing::Test
 protected:
 	virtual void SetUp()
 	{
-		m_hook.loadLibrary();
 		m_screensaver = new MSWindowsScreenSaver();
 	}