diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5835bcd10..18343e353 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -152,7 +152,7 @@ if(NOT ZLIB_SUPPORTS_GZIP)
     message(FATAL_ERROR "zlib 1.2.x or higher is required to use the gzip format")
 endif(NOT ZLIB_SUPPORTS_GZIP)
 
-include_directories(${QT_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
+include_directories(SYSTEM ${QT_INCLUDE_DIR} ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
 add_subdirectory(src)
 add_subdirectory(share)
diff --git a/src/core/Endian.cpp b/src/core/Endian.cpp
index 6f2130da3..f96301a4e 100644
--- a/src/core/Endian.cpp
+++ b/src/core/Endian.cpp
@@ -17,14 +17,7 @@
 
 #include "Endian.h"
 
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 3))
-#pragma GCC push_options
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
 #include <QtCore/QtEndian>
-#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 3))
-#pragma GCC pop_options
-#endif
 #include <QtCore/QIODevice>
 
 namespace Endian {