diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3cc0f84a..6bea2207 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,9 +137,15 @@ if(NOT WIN32)
   set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG")
 
 else()
-  add_compile_definitions(_HAS_STD_BYTE=0)
+  add_compile_definitions(
+	  _HAS_STD_BYTE=0
+	  _CRT_SECURE_NO_WARNINGS
+	  WIN32
+	  MINIMAL_BUILD
+	  WIN32_LEAN_AND_MEAN 
+  )
 
-  set(FALCO_SECURITY_FLAGS_WIN "-D_CRT_SECURE_NO_WARNINGS -DWIN32 -DMINIMAL_BUILD /EHsc /W3 /Zi")
+  set(FALCO_SECURITY_FLAGS_WIN "/EHsc /W3 /Zi")
   set(FALCO_SECURITY_FLAGS_WIN_DEBUG "/MTd /Od")
   set(FALCO_SECURITY_FLAGS_WIN_RELEASE "/MT")
 
diff --git a/userspace/falco/app/actions/print_page_size.cpp b/userspace/falco/app/actions/print_page_size.cpp
index df84ce6a..8779adf0 100644
--- a/userspace/falco/app/actions/print_page_size.cpp
+++ b/userspace/falco/app/actions/print_page_size.cpp
@@ -16,6 +16,10 @@ limitations under the License.
 */
 
 #include "actions.h"
+#ifdef _WIN32
+#define WIN32_MEAN_AND_LEAN
+#include <windows.h>
+#endif
 
 using namespace falco::app;
 using namespace falco::app::actions;
diff --git a/userspace/falco/app/actions/print_support.cpp b/userspace/falco/app/actions/print_support.cpp
index 698ba4e7..6c7fb2e4 100644
--- a/userspace/falco/app/actions/print_support.cpp
+++ b/userspace/falco/app/actions/print_support.cpp
@@ -17,6 +17,9 @@ limitations under the License.
 
 #ifndef _WIN32
 #include <sys/utsname.h>
+#else
+#define WIN32_MEAN_AND_LEAN
+#include <windows.h>
 #endif
 #include <iostream>