diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 67405088b5..d6c53f4f68 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -50,7 +50,7 @@ flags = [
 # a "-std=<something>".
 # For a C project, you would set this to something like 'c99' instead of
 # 'c++11'.
-'-std=c++11',
+'-std=c++17',
 # ...and the same thing goes for the magic -x option which specifies the
 # language that the files to be compiled are written in. This is mostly
 # relevant for c++ headers.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15b730f326..de86641d03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -393,7 +393,7 @@ if(NOT MSVC)
 	endif()
 
 	if(ANDROID)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 	endif()
 	if(CLANG)
 		add_definitions(
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index 8827dfb1a0..bda2abd416 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -4,7 +4,7 @@
 LOCAL_CFLAGS := -DUSE_FFMPEG -DWITH_UPNP -DUSING_GLES2 -DMOBILE_DEVICE -O3 -fsigned-char -Wall -Wno-multichar -Wno-unused-variable -fno-strict-aliasing -D__STDC_CONSTANT_MACROS -DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS
 # yes, it's really CPPFLAGS for C++
 # deprecated-register is generated by Android default code and causes noise.
-LOCAL_CPPFLAGS := -fexceptions -std=gnu++17 -fno-rtti -Wno-reorder -Wno-deprecated-register -Wno-nullability-completeness
+LOCAL_CPPFLAGS := -fexceptions -std=c++17 -fno-rtti -Wno-reorder -Wno-deprecated-register -Wno-nullability-completeness
 LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)/../../Common \
   $(LOCAL_PATH)/../.. \
diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk
index a08eaf0ec5..3617d4daeb 100644
--- a/ext/glslang-build/Android.mk
+++ b/ext/glslang-build/Android.mk
@@ -58,7 +58,7 @@ LOCAL_SRC_FILES := \
 
 
 LOCAL_CFLAGS := -O3 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS -DENABLE_HLSL
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
+LOCAL_CPPFLAGS := -fno-exceptions -std=c++17 -fno-rtti -Wno-reorder
 # Note: LOCAL_PATH is the directory this file is in.
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../libzip $(LOCAL_PATH)/../glslang ..
 
diff --git a/ext/miniupnp-build/Android.mk b/ext/miniupnp-build/Android.mk
index 0bd7ce276a..4f90cae88a 100644
--- a/ext/miniupnp-build/Android.mk
+++ b/ext/miniupnp-build/Android.mk
@@ -24,7 +24,7 @@ LOCAL_SRC_FILES := \
     ../miniupnp/miniupnpc/src/upnpreplyparse.c
 
 LOCAL_CFLAGS := -O3 -fsigned-char -fno-strict-aliasing -Wall -Wno-multichar -D__STDC_CONSTANT_MACROS
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti -Wno-reorder
+LOCAL_CPPFLAGS := -fno-exceptions -std=c++17 -fno-rtti -Wno-reorder
 # Note: LOCAL_PATH is the directory this file is in.
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. $(LOCAL_PATH)/../miniupnp/miniupnpc/src $(LOCAL_PATH)/../miniupnp/miniupnpc/include ..