diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0be9bf3..e1e7ef9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,14 @@ find_package(LibClang REQUIRED)
 
 #find_package(Boost 1.55 COMPONENTS python thread log system filesystem REQUIRED)
 
-find_package(Boost 1.55 COMPONENTS thread log system filesystem locale REQUIRED)
+set(BOOST_DEP thread log system filesystem)
+
+if(MSYS)
+  list(APPEND BOOST_DEP locale)
+endif()
+
+
+find_package(Boost 1.55 COMPONENTS ${BOOST_DEP} REQUIRED)
 
 pkg_check_modules(GTKMM gtkmm-3.0 REQUIRED) # The name GTKMM is set here for the variables abouve
 
diff --git a/src/dialogs.h b/src/dialogs.h
index 5d4420e..5b71b0c 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -17,10 +17,6 @@ class Dialog {
 
 #include <windows.h>
 #include <shobjidl.h>
-
-#include <memory>
-#include <sstream>
-#include <codecvt>
 #include <vector>
 
 class CommonDialog {