diff --git a/CMakeLists.txt b/CMakeLists.txt
index abfc0be..52c00ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+set(CMAKE_C_STANDARD 11)
+set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_C_EXTENSIONS ON)
+
 
 ###
 # General project settings
diff --git a/cmake/modules/c_flags.cmake b/cmake/modules/c_flags.cmake
index 5ed0c4d..44052bb 100644
--- a/cmake/modules/c_flags.cmake
+++ b/cmake/modules/c_flags.cmake
@@ -17,8 +17,6 @@ function(add_cflag_if_supported flag)
     endif ()
 endfunction()
 
-add_cflag_if_supported("-std=gnu11")
-add_cflag_if_supported("-std=gnu18")
 add_cflag_if_supported("-Wall")
 add_cflag_if_supported("-Wextra")
 add_cflag_if_supported("-Wshadow")
@@ -47,8 +45,6 @@ endif ()
 
 if (${CMAKE_BUILD_TYPE} MATCHES "Debug")
     add_cflag_if_supported("-ggdb")
-    add_cflag_if_supported("-O0")
 else ()
-    add_cflag_if_supported("-O2")
     add_cflag_if_supported("-Werror")
 endif ()