diff --git a/Makefile b/Makefile
index deb8d10..06cf9ac 100644
--- a/Makefile
+++ b/Makefile
@@ -160,7 +160,8 @@ $(OFILES_SRC)	: $(HFILES_BIN)
 	@$(CC) -MMD -MP -MF $(DEPSDIR)/$*.d -x assembler-with-cpp $(ASFLAGS) -c $< -o $@ $(ERROR_FILTER)
     
 wumsloader_elf.h: $(wumsloader_elf)
-	bin2s -a 32 -H `(echo $(<F) | tr . _)`.h $< | $(AS) -o $(<F).o
+	@echo $(notdir $<)
+	@$(bin2o)
 
 -include $(DEPENDS)
 
diff --git a/wumsloader/src/utils/imports.h b/wumsloader/src/utils/imports.h
index 52d09ba..ae4bab3 100644
--- a/wumsloader/src/utils/imports.h
+++ b/wumsloader/src/utils/imports.h
@@ -36,6 +36,8 @@ IMPORT(OSDynLoad_GetAllocator);
 IMPORT(OSDynLoad_SetAllocator);
 IMPORT(__KernelGetInfo);
 IMPORT(OSCheckActiveThreads);
+IMPORT(OSGetCurrentThread);
+IMPORT(OSSetThreadCleanupCallback);
 
 IMPORT(FSTimeToCalendarTime);
 IMPORT(FSInit);