diff --git a/Makefile.wii b/Makefile.wii
index 28fe19a..820e27e 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -24,17 +24,48 @@ SYMLINKS=src/machdep src/osdep src/gfxdep src/joydep src/guidep src/sounddep src
 
 # Source files.
 SRCS := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/caps/*.c $(SRC_DIR)/dms/*.c $(SRC_DIR)/keymap/*.c) \
-	$(SRC_DIR)/machdep/support.c $(SRC_DIR)/gfxdep/rawkeys.c  $(SRC_DIR)/guidep/gui-sdl.c $(SRC_DIR)/sounddep/sound.c \
-	$(SRC_DIR)/gfxdep/sdlgfx.c $(SRC_DIR)/guidep/menu.c $(SRC_DIR)/osdep/main.c $(SRC_DIR)/threaddep/thread.c \
-	$(SRC_DIR)/gfxdep/sdlkeys.c $(SRC_DIR)/joydep/joystick.c $(SRC_DIR)/osdep/memory.c
-
-
-SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support.c src/svgancui.c src/build68k.c src/catweasel.c \
-	src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
-	src/genblitter.c src/gencomp.c src/gencpu.c \
-	src/genlinetoscr.c src/compemu.c src/compstbl.c \
-	src/enforcer.c src/ar.c src/debug.c \
-	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
+	$(SRC_DIR)/gfxdep/rawkeys.c  \
+	$(SRC_DIR)/gfxdep/sdlgfx.c \
+	$(SRC_DIR)/gfxdep/sdlkeys.c \
+	$(SRC_DIR)/guidep/gui-sdl.c \
+	$(SRC_DIR)/guidep/menu.c \
+	$(SRC_DIR)/joydep/joystick.c \
+	$(SRC_DIR)/machdep/support.c \
+	$(SRC_DIR)/osdep/main.c \
+	$(SRC_DIR)/osdep/memory.c\
+	$(SRC_DIR)/sounddep/sound.c \
+	$(SRC_DIR)/threaddep/thread.c
+	
+SRCS := $(filter-out \
+	src/akiko.c \
+	src/ar.c \
+	src/blitops.c \
+	src/blkdev-libscg.c \
+	src/blkdev.c \
+	src/bsdsocket-posix-new.c \
+	src/build68k.c \
+	src/catweasel.c \
+	src/cdrom.c \
+	src/compemu.c \
+	src/compemu_fpp.c \
+	src/compemu_raw_x86.c \
+	src/compemu_support.c \
+	src/compstbl.c \
+	src/debug.c \
+	src/enforcer.c \
+	src/fdi2raw.c \
+	src/filesys_bootrom.c \
+	src/genblitter.c \
+	src/gencomp.c \
+	src/gencpu.c \
+	src/gengenblitter.c \
+	src/genlinetoscr.c \
+	src/linetoscr.c \
+	src/readdisk.c \
+	src/scsiemul.c \
+	src/svgancui.c \
+	src/tui.c \
+	, $(SRCS))
 
 genlinetoscr_args="-b"
 
@@ -134,7 +165,7 @@ uae.dol: uae.elf
 	@echo ----
 
 # Compilation flags.
-COMMON_FLAGS	:= -g -O3 $(MACHDEP) -Wall -Wno-unused -Wno-format
+COMMON_FLAGS	:= -g -O2 -ftree-vectorize -ffast-math -pipe  -fomit-frame-pointer -fdiagnostics-show-option $(MACHDEP) -Wall -Wno-unused -Wno-format
 INCLUDES	:=  -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL -I$(PORTLIBS)/include
 DEFINES		:=  -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \
 		    -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS \
diff --git a/src/serial.c b/src/serial.c
index c52b3a4..01638b1 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -21,7 +21,7 @@
 
 #ifdef SERIAL_PORT
 # ifndef WIN32
-#  include "osdep/serial.h"
+#  include "serial.h"
 # else
 #  include "od-win32/parser.h"
 # endif
diff --git a/src/sysconfig.h.wii b/src/sysconfig.h.wii
index 6a89461..20760c5 100644
--- a/src/sysconfig.h.wii
+++ b/src/sysconfig.h.wii
@@ -149,8 +149,8 @@
 /* #undef HAVE_STRICMP */
 
 /* Define to 1 if you have the <strings.h> header file. */
-/*#define HAVE_STRINGS_H 1*/
-#undef HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
+/*#undef HAVE_STRINGS_H */
 
 
 /* Define to 1 if you have the <string.h> header file. */
@@ -223,8 +223,8 @@
 #undef HAVE_SYS_STATFS_H
 
 /* Define to 1 if you have the <sys/statvfs.h> header file. */
-/*#define HAVE_SYS_STATVFS_H 1*/
-#undef HAVE_SYS_STATVFS_H
+#define HAVE_SYS_STATVFS_H 1
+/* #undef HAVE_SYS_STATVFS_H1 */
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #define HAVE_SYS_STAT_H 1
diff --git a/src/tools/Makefile.wii b/src/tools/Makefile.wii
index 33a25d8..7c1773e 100644
--- a/src/tools/Makefile.wii
+++ b/src/tools/Makefile.wii
@@ -1,51 +1,51 @@
-#
-# Makefile.in for UAE tools
-#
-
-export PATH	:=	$(DEVKITPPC)/../MinGW/bin:$(PATH):.
-
-
-CC        = gcc
-LDFLAGS   =
-CFLAGS    = -I../include
-LIBRARIES =
-
-all: gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe
-
-install:
-
-
-clean:
-	-rm -f *.o
-	-rm cpudefs.c
-	-rm -f gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe
-
-
-distclean: clean
-	-rm -f config.cache config.log config.status
-	-rm -f Makefile sysconfig.h
-	-rm -f *.c
-
-genblitter.exe: genblitter.o blitops.o writelog.o
-	$(CC) $(LDFLAGS) -o genblitter.exe genblitter.o blitops.o writelog.o
-build68k.exe: build68k.o writelog.o
-	$(CC) $(LDFLAGS) -o build68k.exe build68k.o writelog.o
-gencpu.exe: gencpu.o readcpu.o cpudefs.o missing.o writelog.o
-	$(CC) $(LDFLAGS) -o gencpu.exe gencpu.o readcpu.o cpudefs.o missing.o writelog.o
-gencomp.exe: gencomp.o readcpu.o cpudefs.o missing.o
-	$(CC) $(LDFLAGS) -o gencomp.exe gencomp.o readcpu.o missing.o cpudefs.o writelog.o
-genlinetoscr.exe: genlinetoscr.o
-	$(CC) $(LDFLAGS) -o genlinetoscr.exe genlinetoscr.o
-
-custom.o: blit.h
-drawing.o: linetoscr.c
-
-cpudefs.c: build68k.exe ../table68k
-	build68k.exe < ../table68k >cpudefs.c
-
-.c.o:
-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
-.c.s:
-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
-.c.i:
-	$(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< > $@
+#
+# Makefile.in for UAE tools
+#
+
+export PATH	:=	$(DEVKITPRO)/MinGW/bin:$(PATH):.
+
+
+CC        = gcc
+LDFLAGS   =
+CFLAGS    = -I../include
+LIBRARIES =
+
+all: gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe
+
+install:
+
+
+clean:
+	-rm -f *.o
+	-rm cpudefs.c
+	-rm -f gencpu.exe gencomp.exe build68k.exe genblitter.exe genlinetoscr.exe
+
+
+distclean: clean
+	-rm -f config.cache config.log config.status
+	-rm -f Makefile sysconfig.h
+	-rm -f *.c
+
+genblitter.exe: genblitter.o blitops.o writelog.o
+	$(CC) $(LDFLAGS) -o genblitter.exe genblitter.o blitops.o writelog.o
+build68k.exe: build68k.o writelog.o
+	$(CC) $(LDFLAGS) -o build68k.exe build68k.o writelog.o
+gencpu.exe: gencpu.o readcpu.o cpudefs.o missing.o writelog.o
+	$(CC) $(LDFLAGS) -o gencpu.exe gencpu.o readcpu.o cpudefs.o missing.o writelog.o
+gencomp.exe: gencomp.o readcpu.o cpudefs.o missing.o
+	$(CC) $(LDFLAGS) -o gencomp.exe gencomp.o readcpu.o missing.o cpudefs.o writelog.o
+genlinetoscr.exe: genlinetoscr.o
+	$(CC) $(LDFLAGS) -o genlinetoscr.exe genlinetoscr.o
+
+custom.o: blit.h
+drawing.o: linetoscr.c
+
+cpudefs.c: build68k.exe ../table68k
+	build68k.exe < ../table68k >cpudefs.c
+
+.c.o:
+	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
+.c.s:
+	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< -o $@
+.c.i:
+	$(CC) $(INCLUDES) -E $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $< > $@