diff --git a/Makefile.gc b/Makefile.gc
index dd00aca..dbc6383 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -20,8 +20,7 @@ BUILD		:=	build_cube
 SOURCES		:=	core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \
 			gx gx/utils gx/gui gx/fileio gx/images gx/sounds
 INCLUDES	:=	core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \
-			gx gx/utils gx/gui gx/fileio gx/images gx/sounds \
-			$(BUILD) 
+			gx gx/utils gx/gui gx/fileio gx/images gx/sounds
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -127,19 +126,20 @@ $(OUTPUT).elf: $(OFILES)
 #---------------------------------------------------------------------------------
 %.jpg.o	:	%.jpg
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
+
 
 %.png.o	:	%.png
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 %.pcm.o	:	%.pcm
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 %.ogg.o	:	%.ogg
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 -include $(DEPENDS)
 
diff --git a/Makefile.wii b/Makefile.wii
index 68c5d53..7f3c635 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -24,8 +24,7 @@ SOURCES		:=	core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_
 			gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds
 INCLUDES	:=	core core/m68k core/z80 core/sound core/tremor core/ntsc core/input_hw core/cd_hw core/cart_hw core/cart_hw/svp \
 			$(CHDLIBDIR)/src $(CHDLIBDIR)/deps/libFLAC/include $(CHDLIBDIR)/deps/lzma \
-			gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds \
-			$(BUILD) 
+			gx gx/utils gx/utils/wiidrc gx/gui gx/fileio gx/images gx/sounds
 
 #---------------------------------------------------------------------------------
 # options for code generation
@@ -131,19 +130,19 @@ $(OUTPUT).elf: $(OFILES)
 #---------------------------------------------------------------------------------
 %.jpg.o	:	%.jpg
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 %.png.o	:	%.png
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 %.pcm.o	:	%.pcm
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 %.ogg.o	:	%.ogg
 	@echo $(notdir $<)
-	$(bin2o)
+	bin2s -a 32 $< | $(AS) -o $(@)
 
 -include $(DEPENDS)