diff --git a/Makefile b/Makefile
index f4254683..57b9f4c4 100644
--- a/Makefile
+++ b/Makefile
@@ -157,12 +157,12 @@ LINK_LIBRARIES = $(foreach i,$(LIBRARIES),-l$(i))
 ifeq ($(COMPILER),gcc)
   NON_MATCHING := 1
   MIPSISET     := -mips3
-  OPT_FLAGS    := -Ofast
+  OPT_FLAGS    := -Os
 else ifeq ($(COMPILER),clang)
   NON_MATCHING := 1
   # clang doesn't support ABI 'o32' for 'mips3'
   MIPSISET     := -mips2
-  OPT_FLAGS    := -Ofast
+  OPT_FLAGS    := -Os
 endif
 
 
@@ -398,8 +398,8 @@ export LD_LIBRARY_PATH=./tools
 AS        := $(CROSS)as
 ifeq ($(COMPILER),gcc)
   CC      := $(CROSS)gcc
-  $(BUILD_DIR)/actors/%.o:           OPT_FLAGS := -Ofast -mlong-calls
-  $(BUILD_DIR)/levels/%.o:           OPT_FLAGS := -Ofast -mlong-calls
+  $(BUILD_DIR)/actors/%.o:           OPT_FLAGS := -Os -mlong-calls
+  $(BUILD_DIR)/levels/%.o:           OPT_FLAGS := -Os -mlong-calls
 else ifeq ($(COMPILER),clang)
   CC      := clang
 endif
diff --git a/src/game/puppycam2.c b/src/game/puppycam2.c
index 28e7c033..ddb6240f 100644
--- a/src/game/puppycam2.c
+++ b/src/game/puppycam2.c
@@ -24,6 +24,7 @@
 #include "mario.h"
 #include "puppyprint.h"
 #include "debug_box.h"
+#include "main.h"
 
 #ifdef PUPPYCAM