diff --git a/Makefile b/Makefile
index 6938bef..7415f6a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,8 @@
 
 # Default compiler flags
 COMMONCFLAGS = -Wall -Os -MD -m32 -march=i386 -mregparm=2 \
-               -ffreestanding -fwhole-program -fomit-frame-pointer
+               -ffreestanding -fwhole-program -fomit-frame-pointer \
+               -fno-delete-null-pointer-checks
 COMMONCFLAGS += $(call cc-option,$(CC),-nopie,)
 COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
 COMMONCFLAGS += $(call cc-option,$(CC),-fno-stack-protector-all,)
diff --git a/src/types.h b/src/types.h
index b1bf2ef..0a7e2f7 100644
--- a/src/types.h
+++ b/src/types.h
@@ -34,6 +34,8 @@
 
 #define barrier() __asm__ __volatile__("": : :"memory")
 
+#define inline inline __attribute__((always_inline))
+
 #define __stringify_1(x)        #x
 #define __stringify(x)          __stringify_1(x)