diff --git a/Makefile b/Makefile
index 4be67dc..c21e8c3 100644
--- a/Makefile
+++ b/Makefile
@@ -42,10 +42,8 @@ INCLUDES	:=  src
 #---------------------------------------------------------------------------------
 # options for code generation
 #---------------------------------------------------------------------------------
-CFLAGS	:=  -std=gnu11 -mcpu=750 -meabi -mhard-float -ffast-math \
-		    -O2 -Wall -Wextra -Wno-unused-parameter -Wno-strict-aliasing $(INCLUDE)
-CXXFLAGS := -std=gnu++11 -mcpu=750 -meabi -mhard-float -ffast-math \
-		    -O2 -Wall -Wextra -Wno-unused-parameter -Wno-strict-aliasing $(INCLUDE)
+CFLAGS	:=  -std=c2x -g -Wall -O2 -ffunction-sections -DESPRESSO -mcpu=750 -meabi -mhard-float $(INCLUDE)
+CXXFLAGS := -std=c++20 -g -Wall -O2 -ffunction-sections -DESPRESSO -mcpu=750 -meabi -mhard-float $(INCLUDE)
 ASFLAGS	:= -mregnames
 LDFLAGS	:= -nostartfiles -Wl,--gc-sections,--allow-multiple-definition
 
diff --git a/src/imports.h b/src/imports.h
index 6bd078c..d375a95 100644
--- a/src/imports.h
+++ b/src/imports.h
@@ -53,6 +53,10 @@ IMPORT(OSGetSemaphoreCount);
 IMPORT(OSSignalSemaphore);
 IMPORT(OSWaitSemaphore);
 IMPORT(OSTryWaitSemaphore);
+IMPORT(OSCompareAndSwapAtomicEx);
+IMPORT(OSCompareAndSwapAtomic);
+IMPORT(OSGetThreadSpecific);
+IMPORT(OSSetThreadSpecific);
 
 IMPORT(exit);
 IMPORT(_Exit);