diff --git a/i2cspi_BaS_gcc/Makefile b/i2cspi_BaS_gcc/Makefile
index 17071e9..f84903c 100644
--- a/i2cspi_BaS_gcc/Makefile
+++ b/i2cspi_BaS_gcc/Makefile
@@ -10,7 +10,7 @@
 
 # can be either "Y" or "N" (without quotes). "Y" for using the m68k-elf-, "N" for using the m68k-atari-mint
 # toolchain
-COMPILE_ELF=Y
+COMPILE_ELF=N
 
 ifeq (Y,$(COMPILE_ELF))
 TCPREFIX=m68k-elf-
@@ -73,7 +73,12 @@ CSRCS= \
 	$(SRCDIR)/s19reader.c \
         $(SRCDIR)/flash.c \
         $(SRCDIR)/fifo.c \
-        $(SRCDIR)/i2c_firebee.c
+        $(SRCDIR)/i2c_firebee.c \
+	$(SRCDIR)/usb.c \
+	$(SRCDIR)/usb_kbd.c \
+	$(SRCDIR)/usb_mem.c \
+	$(SRCDIR)/usb_mouse.c \
+	$(SRCDIR)/usb_storage.c
 
 ASRCS= \
 	$(SRCDIR)/startcf.S \
@@ -82,7 +87,7 @@ ASRCS= \
 	$(SRCDIR)/exceptions.S \
 	$(SRCDIR)/supervisor.S \
 	$(SRCDIR)/illegal_instruction.S
-	
+
 COBJS=$(patsubst $(SRCDIR)/%.o,$(OBJDIR)/%.o,$(patsubst %.c,%.o,$(CSRCS)))
 AOBJS=$(patsubst $(SRCDIR)/%.o,$(OBJDIR)/%.o,$(patsubst %.S,%.o,$(ASRCS)))
 
@@ -138,7 +143,7 @@ endif
 $(LIBBAS): $(OBJS)
 	$(AR) rv $@ $(OBJS)
 	$(RANLIB) $@
-	
+
 # compile init_fpga with -mbitfield for testing purposes
 #$(OBJDIR)/init_fpga.o:	CFLAGS += -mbitfield
 
@@ -156,7 +161,7 @@ $(OBJDIR)/%.o:$(SRCDIR)/%.S
 depend: $(ASRCS) $(CSRCS)
 		$(CC) $(CFLAGS) $(INCLUDE) -M $(ASRCS) $(CSRCS) | sed -e 's/^\(.*\).o:/$(OBJDIR)\/\1.o:/' > depend
 
-	
+
 ifneq (clean,$(MAKECMDGOALS))
 -include depend
 endif
diff --git a/i2cspi_BaS_gcc/include/bas_printf.h b/i2cspi_BaS_gcc/include/bas_printf.h
index f968588..edc6c25 100644
--- a/i2cspi_BaS_gcc/include/bas_printf.h
+++ b/i2cspi_BaS_gcc/include/bas_printf.h
@@ -17,10 +17,12 @@
  *
  */
 
+#include <stdarg.h>
+
 #ifndef _BAS_PRINTF_H_
 #define _BAS_PRINTF_H_
-#include <stdarg.h>
-typedef uint32_t size_t;
+
+#include <stddef.h>
 
 extern void xvsnprintf(char *str, size_t size, const char *fmt, va_list va);
 extern void xvprintf(const char *fmt, va_list va);
diff --git a/i2cspi_BaS_gcc/include/i2c_firebee.h b/i2cspi_BaS_gcc/include/i2c_firebee.h
index 0d0c4c6..1e6bfc4 100644
--- a/i2cspi_BaS_gcc/include/i2c_firebee.h
+++ b/i2cspi_BaS_gcc/include/i2c_firebee.h
@@ -19,9 +19,12 @@
 #define I2CTLDEV    (('i'<<8) | 5)
 
 // Set a specific bit
-#define set_bit(p,bit)          p |= bit
+#define set_bit(p,bit)          p |= (bit)
+#define set_bit_nr(p,nr)        set_bit(p,(1<<(nr)))
+
 // Clear a specific bit
-#define clear_bit(p,bit)        p &= ~bit
+#define clear_bit(p,bit)        p &= ~(bit)
+#define clear_bit_nr(p,nr)      clear_bit(p,(1<<(nr)))
 
 #define ELAPSED(t)              (t - ReadTimer())