diff --git a/config.mk b/config.mk
index 86f4764..8886f23 100644
--- a/config.mk
+++ b/config.mk
@@ -1,10 +1,12 @@
+# -*- make -*-
+
 # === C Compiler Configuration ===
-CC := gcc
-CFLAGS := -Wall -Wextra -std=gnu23 -O
+CC := gcc -xc -std=gnu23
+CFLAGS := -Wall -Wextra -O
 CDEBUG := -g
 
 # === C++ Compiler Configuration ===
-CXX := gcc -xc++ -lstdc++ -shared-libgcc
+CXX := gcc -xc++ -std=gnu++17 -lstdc++ -shared-libgcc
 CXXFLAGS := -Wall -Wextra -O
 CXXDEBUG := -g