diff --git a/Makefile b/Makefile
index 65a424c..8318d77 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ cpp/math.cpp
 
 OUTPUTFILE = engine.so
 
-CXXFLAGS = -Wall -Werror -O2 -msse2 -ffast-math -fpic -flto -fno-rtti -fno-exceptions
+CXXFLAGS = -std=c++17 -Wall -Werror -O2 -msse2 -fpic -flto -fno-rtti -fno-exceptions
 
 .PHONY: all
 all: clean $(OUTPUTFILE)
diff --git a/cpp/types.hpp b/cpp/types.hpp
index 6ac3fbb..e6d7433 100644
--- a/cpp/types.hpp
+++ b/cpp/types.hpp
@@ -20,6 +20,11 @@
 #include <cstdint>
 
 #define RK_EXPORT extern "C"
+#define RK_HOT gnu::hot
+#define RK_FLATTEN gnu::flatten
+#define RK_UNROLLED gnu::optimize("unroll-loops")
+#define RK_FAST gnu::optimize("Ofast")
+#define RK_INVALID_HANDLE nullptr
 #define RK_FLAG(_bit) (1 << (_bit))
 
 typedef bool rk_bool;