diff --git a/.circleci/config.yml b/.circleci/config.yml
index c186f8483..e9c3db1f5 100755
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -651,7 +651,7 @@ workflows:
       #- build_python_api_ubuntuDebug
       #- build_python_api_ubuntu
       #- build_python_api_osx
-      # - build_win10_installer
+      - build_win10_installer
       # - build_macOS_installers
       # - build_appleSilicon_installer
       # - build_macOSx86_installer
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91b68687a..17e9be34a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,8 +71,9 @@ set (VERSION_STRING_FULL ${VERSION_STRING}.${VERSION_COMMIT})
 if (APPLE)
 	add_definitions (-DDarwin)
 elseif (WIN32)
-	add_definitions (-DWIN32 -DNOMINMAX)
-	add_definitions (-DGLAD_API_CALL_EXPORT)
+    add_definitions (-DWIN32 -DNOMINMAX)
+    add_definitions (-DGLAD_API_CALL_EXPORT)
+    add_compile_definitions(_HAS_STD_BYTE=0)
 endif()
 
 # compiler warning flags
diff --git a/apps/vaporgui/CLIToolInstaller.cpp b/apps/vaporgui/CLIToolInstaller.cpp
index a1cf99e82..841beb9b6 100644
--- a/apps/vaporgui/CLIToolInstaller.cpp
+++ b/apps/vaporgui/CLIToolInstaller.cpp
@@ -3,6 +3,11 @@
 #include <common.h>
 #include <vapor/ResourcePath.h>
 
+#ifdef WIN32
+    #include "windowsUtils.h"
+#endif
+
+using namespace std;
 using namespace Wasp;
 
 void CLIToolInstaller::Install()
@@ -99,4 +104,4 @@ void CLIToolInstaller::Install()
 #endif
 
     box.exec();
-}
\ No newline at end of file
+}
diff --git a/apps/vaporgui/windowsUtils.h b/apps/vaporgui/windowsUtils.h
index a9abba87f..dcb05cf47 100644
--- a/apps/vaporgui/windowsUtils.h
+++ b/apps/vaporgui/windowsUtils.h
@@ -4,6 +4,7 @@
 
     #include <Windows.h>
 
+    #define WIN32_LEAN_AND_MEAN
     #define WINDOWS_SUCCESS              ERROR_SUCCESS
     #define WINDOWS_ERROR_FILE_NOT_FOUND ERROR_FILE_NOT_FOUND
     #define WINDOWS_HKEY_CLASSES_ROOT    HKEY_CLASSES_ROOT
@@ -19,4 +20,4 @@ LONG        Windows_SetRegistryString(HKEY hKey, const std::string &strValueName
 std::string Windows_GetErrorString(LONG errorCode);
 
 #endif
-#endif
\ No newline at end of file
+#endif