diff --git a/Makefile.common b/Makefile.common
index d7c950a..b586567 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -27,11 +27,15 @@ ifeq ($(CPU_ARCH), x86_32)
 SOURCES_ASM += $(CORE_DIR)/x86/x86_stub.S
 endif
 ifeq ($(CPU_ARCH), arm)
-SOURCES_C   += $(CORE_DIR)/arm/warm.c
-SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S \
-	$(CORE_DIR)/arm/video_blend.S
+SOURCES_ASM += $(CORE_DIR)/arm/arm_stub.S
 endif
 
 endif
 
+# Special optimized routines
+ifeq ($(CPU_ARCH), arm)
+SOURCES_C   += $(CORE_DIR)/arm/warm.c
+SOURCES_ASM += $(CORE_DIR)/arm/video_blend.S
+endif
+
 INCFLAGS := -I$(CORE_DIR)
diff --git a/libretro.c b/libretro.c
index 0a4827e..db5e0f5 100644
--- a/libretro.c
+++ b/libretro.c
@@ -163,7 +163,6 @@ void retro_reset(void)
    init_context_switch();
 }
 
-
 size_t retro_serialize_size(void)
 {
    return GBA_STATE_MEM_SIZE;