diff --git a/common/settings/parameters.cpp b/common/settings/parameters.cpp
index d7d5442c27..66c61465ae 100644
--- a/common/settings/parameters.cpp
+++ b/common/settings/parameters.cpp
@@ -55,7 +55,6 @@ bool PARAM_PATH_LIST::MatchesFile( JSON_SETTINGS* aSettings ) const
 }
 
 
-
 void PARAM_WXSTRING_MAP::Load( JSON_SETTINGS* aSettings, bool aResetIfMissing ) const
 {
     if( m_readOnly )
@@ -116,7 +115,7 @@ bool PARAM_WXSTRING_MAP::MatchesFile( JSON_SETTINGS* aSettings ) const
     return false;
 }
 
-
+#if !defined( __MINGW32__ )
 // Instantiate all required templates here and export
 template class KICOMMON_API PARAM_LAMBDA<bool>;
 template class KICOMMON_API PARAM_LAMBDA<int>;
@@ -137,4 +136,5 @@ template class KICOMMON_API PARAM_SET<wxString>;
 
 template class KICOMMON_API PARAM_MAP<int>;
 template class KICOMMON_API PARAM_MAP<double>;
-template class KICOMMON_API PARAM_MAP<bool>;
\ No newline at end of file
+template class KICOMMON_API PARAM_MAP<bool>;
+#endif
\ No newline at end of file
diff --git a/include/settings/parameters.h b/include/settings/parameters.h
index 15a3826d9a..7e9af4f248 100644
--- a/include/settings/parameters.h
+++ b/include/settings/parameters.h
@@ -368,7 +368,7 @@ private:
     std::function<void( ValueType )> m_setter;
 };
 
-#ifdef _MSC_VER
+#ifdef __WINDOWS__
 template class KICOMMON_API PARAM_LAMBDA<bool>;
 template class KICOMMON_API PARAM_LAMBDA<int>;
 template class KICOMMON_API PARAM_LAMBDA<nlohmann::json>;
@@ -557,7 +557,7 @@ protected:
 };
 
 
-#ifdef _MSC_VER
+#ifdef __WINDOWS__
 template class KICOMMON_API PARAM_LIST<bool>;
 template class KICOMMON_API PARAM_LIST<int>;
 template class KICOMMON_API PARAM_LIST<double>;
@@ -656,7 +656,7 @@ protected:
     std::set<Type>  m_default;
 };
 
-#ifdef _MSC_VER
+#ifdef __WINDOWS__
 template class KICOMMON_API PARAM_SET<wxString>;
 #else
 extern template class APIVISIBLE PARAM_SET<wxString>;
@@ -797,7 +797,7 @@ private:
 };
 
 
-#ifdef _MSC_VER
+#ifdef __WINDOWS__
 template class KICOMMON_API PARAM_MAP<int>;
 template class KICOMMON_API PARAM_MAP<double>;
 template class KICOMMON_API PARAM_MAP<bool>;