diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5970bbf4e..18e5dae74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,14 @@ ENDIF()
 
 PROJECT( MegaGlest )
 
+# This helps prevent certain errors such as what's mentioned in
+# https://github.com/MegaGlest/megaglest-source/pull/300
+# and also some consider it good practice to specify a standard
+#
+# https://cmake.org/cmake/help/v3.7/prop_tgt/CXX_STANDARD.html?highlight=cxx_standard
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 #SET(CMAKE_VERBOSE_MAKEFILE ON)
 
 #
diff --git a/mk/macos/CMakeLists.txt b/mk/macos/CMakeLists.txt
index 747f0c2b3..83d2f03b8 100644
--- a/mk/macos/CMakeLists.txt
+++ b/mk/macos/CMakeLists.txt
@@ -8,10 +8,6 @@
 # Seems like a good place to add version specific compiler flags too.
 
 IF(NOT CONFIG_HAS_BEEN_RUN_BEFORE)
-	IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "(Apple)?Clang")
-		SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++")
-		#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-	ENDIF()
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftree-vectorize" CACHE STRING "Flags used by the compiler during all build types." FORCE)
 ENDIF()
 
diff --git a/source/g3d_viewer/CMakeLists.txt b/source/g3d_viewer/CMakeLists.txt
index 58430e61f..d7b16c6ea 100644
--- a/source/g3d_viewer/CMakeLists.txt
+++ b/source/g3d_viewer/CMakeLists.txt
@@ -7,16 +7,6 @@ SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6")
 IF(BUILD_MEGAGLEST_MODEL_VIEWER)
 	MESSAGE(STATUS "Will try to build MegaGlest model viewer")
 
-	IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-		IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.7 OR NOT "${CMAKE_CXX_COMPILER_VERSION}")
-			ADD_DEFINITIONS("-std=gnu++0x")
-		ELSEIF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 5.1)
-			ADD_DEFINITIONS("-std=c++11")
-		ENDIF()
-
-		# Was required at least on bsd and macos.
-	ENDIF()
-
 	IF(NOT VCPKG_TARGET_TRIPLET)
 		FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED)
 	ELSE()
diff --git a/source/glest_map_editor/CMakeLists.txt b/source/glest_map_editor/CMakeLists.txt
index 2dc0c3437..dba069651 100644
--- a/source/glest_map_editor/CMakeLists.txt
+++ b/source/glest_map_editor/CMakeLists.txt
@@ -7,16 +7,6 @@ SET(TARGET_NAME_MANPAGE "${TARGET_NAME}.6")
 IF(BUILD_MEGAGLEST_MAP_EDITOR)
 	MESSAGE(STATUS "Will try to build MegaGlest map editor")
 
-	IF(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
-		IF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.7 OR NOT "${CMAKE_CXX_COMPILER_VERSION}")
-			ADD_DEFINITIONS("-std=gnu++0x")
-		ELSEIF("${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 5.1)
-			ADD_DEFINITIONS("-std=c++11")
-		ENDIF()
-
-		# Was required at least on bsd and macos.
-	ENDIF()
-
 	IF(NOT VCPKG_TARGET_TRIPLET)
 		FIND_PACKAGE(${SDL_VERSION_NAME} REQUIRED)
 	ELSE()