diff --git a/tools/Makefile b/tools/Makefile
index c46756a50..959a60073 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 := \
 	bpp2png \
@@ -27,11 +27,10 @@ pokemon_animation_graphics: common.h
 scan_includes: common.h
 stadium: common.h
 
-bpp2png: CFLAGS += -flto
 bpp2png: bpp2png.c lodepng/lodepng.c common.h lodepng/lodepng.h
 	$(CC) $(CFLAGS) -o $@ bpp2png.c lodepng/lodepng.c
 
-lzcomp: CFLAGS += -flto -Wno-strict-overflow -Wno-sign-compare
+lzcomp: CFLAGS += -Wno-strict-overflow -Wno-sign-compare
 lzcomp: $(wildcard lz/*.c) $(wildcard lz/*.h)
 	$(CC) $(CFLAGS) -o $@ lz/*.c
 
diff --git a/tools/common.h b/tools/common.h
index 147e2520e..ac72cd3ad 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>