diff --git a/Makefile.ctr b/Makefile.ctr
index 1a89ed25fc..e369bebe51 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -53,6 +53,8 @@ else
 	OBJS += libretro-common/formats/png/rpng.o
 	OBJS += libretro-common/formats/png/rpng_encode.o
 	OBJS += libretro-common/formats/bmp/rbmp_encode.o
+   OBJS += libretro-common/gfx/math/matrix_4x4.o
+   OBJS += libretro-common/gfx/math/matrix_3x3.o
 	OBJS += gfx/drivers/ctr_gfx.o
 	OBJS += gfx/drivers/nullgfx.o
 	OBJS += gfx/font_renderer_driver.o
@@ -208,6 +210,7 @@ else
 	OBJS += menu/intl/menu_hash_us.o
 	OBJS += menu/drivers/null.o
 	OBJS += menu/drivers/menu_generic.o
+   OBJS += menu/drivers_display/menu_display_null.o
 	OBJS += menu/drivers/rgui.o
 	OBJS += command_event.o
 	OBJS += deps/zlib/adler32.o
diff --git a/runloop.c b/runloop.c
index 88199ef6b0..16785a37bc 100644
--- a/runloop.c
+++ b/runloop.c
@@ -22,7 +22,9 @@
 
 #include <compat/strl.h>
 
+#ifdef HAVE_CHEEVOS
 #include "cheevos.h"
+#endif
 #include "configuration.h"
 #include "performance.h"
 #include "retroarch.h"