diff --git a/tools/Makefile b/tools/Makefile
index 32f764a19..64d6fe8a7 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all clean
 
 CC := gcc
-CFLAGS := -O3 -std=c11 -Wall -Wextra -pedantic -Wno-missing-field-initializers
+CFLAGS := -O3 -flto -std=c11 -Wall -Wextra -pedantic -Wno-missing-field-initializers
 
 tools := \
 	gfx \
diff --git a/tools/common.h b/tools/common.h
index a8b694459..38b7cc6d0 100644
--- a/tools/common.h
+++ b/tools/common.h
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <stddef.h>
+#include <stdnoreturn.h>
 #include <inttypes.h>
 #include <string.h>
 #include <errno.h>