diff --git a/CMakeLists.txt b/CMakeLists.txt
index 862b72de9..f9097556a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,11 +146,6 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif()
 
-##
-# Additional settings for MSYS
-##
-include("${colobot_SOURCE_DIR}/cmake/msys.cmake")
-
 ##
 # Additional functions for colobot-lint
 ##
diff --git a/cmake/msys.cmake b/cmake/msys.cmake
deleted file mode 100644
index f1c6b89c2..000000000
--- a/cmake/msys.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-# Hacks for MSYS
-if (MSYS)
-    message(STATUS "Detected MSYS build")
-
-    add_compile_options(-U__STRICT_ANSI__) # fixes putenv()
-endif()
diff --git a/cmake/systems/Windows.cmake b/cmake/systems/Windows.cmake
index d85f2c92b..99ba52f3d 100644
--- a/cmake/systems/Windows.cmake
+++ b/cmake/systems/Windows.cmake
@@ -14,6 +14,7 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wingetopt)
 
 list(APPEND WINDOWS_ADDITIONAL_LIBRARIES
     wingetopt
+    Dbghelp
 )
 
 # Additional libraries for static runtime
@@ -45,7 +46,6 @@ if(COLOBOT_MSVC_STATIC_RUNTIME)
         wsock32.lib
         ws2_32.lib
         setupapi.lib
-        Dbghelp
     )
 endif()