diff --git a/include/sqlpp11/data_types/boolean/operand.h b/include/sqlpp11/data_types/boolean/operand.h
index b22c7820..03171ea2 100644
--- a/include/sqlpp11/data_types/boolean/operand.h
+++ b/include/sqlpp11/data_types/boolean/operand.h
@@ -26,7 +26,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ciso646>  // Required for some compilers to use aliases for boolean operators
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
 
 #include <sqlpp11/type_traits.h>
 #include <sqlpp11/alias_operators.h>
diff --git a/include/sqlpp11/logic.h b/include/sqlpp11/logic.h
index be3ffd33..fa006645 100644
--- a/include/sqlpp11/logic.h
+++ b/include/sqlpp11/logic.h
@@ -26,7 +26,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ciso646>  // Required for some compilers to use aliases for boolean operators
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <type_traits>
 
 namespace sqlpp
diff --git a/include/sqlpp11/mysql/bind_result.h b/include/sqlpp11/mysql/bind_result.h
index 0a212672..ac1b2239 100644
--- a/include/sqlpp11/mysql/bind_result.h
+++ b/include/sqlpp11/mysql/bind_result.h
@@ -26,18 +26,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <limits>
+#include <iostream>
+#include <memory>
 
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/exception.h>
 #include <sqlpp11/mysql/detail/prepared_statement_handle.h>
 #include <sqlpp11/mysql/sqlpp_mysql.h>
 
-#include <iostream>
-#ifdef _MSC_VER
-#include <iso646.h>
-#endif
-#include <memory>
 
 namespace sqlpp
 {
diff --git a/include/sqlpp11/mysql/char_result.h b/include/sqlpp11/mysql/char_result.h
index a3cfc6f9..979fd4d5 100644
--- a/include/sqlpp11/mysql/char_result.h
+++ b/include/sqlpp11/mysql/char_result.h
@@ -26,7 +26,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <ciso646>
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <cstdlib>
 #include <iostream>
 #include <memory>
diff --git a/include/sqlpp11/postgresql/bind_result.h b/include/sqlpp11/postgresql/bind_result.h
index 9dc7086e..15c83876 100644
--- a/include/sqlpp11/postgresql/bind_result.h
+++ b/include/sqlpp11/postgresql/bind_result.h
@@ -27,6 +27,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/data_types.h>
 #include <sqlpp11/detail/parse_date_time.h>
@@ -39,7 +43,6 @@
 #include "detail/prepared_statement_handle.h"
 
 #ifdef _MSC_VER
-#include <iso646.h>
 #pragma warning(disable : 4800)  // int to bool
 #endif
 namespace sqlpp
diff --git a/include/sqlpp11/sqlite3/bind_result.h b/include/sqlpp11/sqlite3/bind_result.h
index 95405f18..f4394980 100644
--- a/include/sqlpp11/sqlite3/bind_result.h
+++ b/include/sqlpp11/sqlite3/bind_result.h
@@ -26,6 +26,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <sqlpp11/chrono.h>
 #include <sqlpp11/detail/parse_date_time.h>
 #include <sqlpp11/exception.h>
@@ -36,7 +40,6 @@
 #include <memory>
 
 #ifdef _MSC_VER
-#include <iso646.h>
 #pragma warning(push)
 #pragma warning(disable : 4251)
 #endif
diff --git a/include/sqlpp11/sqlite3/prepared_statement.h b/include/sqlpp11/sqlite3/prepared_statement.h
index 4c84232c..78a6dc67 100644
--- a/include/sqlpp11/sqlite3/prepared_statement.h
+++ b/include/sqlpp11/sqlite3/prepared_statement.h
@@ -26,8 +26,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <memory>
-#include <ciso646>
 #include <cmath>
 #include <string>
 #include <vector>
diff --git a/include/sqlpp11/transaction.h b/include/sqlpp11/transaction.h
index 9635edbd..0eb9a0c3 100644
--- a/include/sqlpp11/transaction.h
+++ b/include/sqlpp11/transaction.h
@@ -26,9 +26,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef _MSC_VER
+#include <ciso646>  // Required to support boolean operator aliases
+#endif
+
 #include <stdexcept>
 #include <string>
-#include <ciso646>
+
 
 namespace sqlpp
 {