diff --git a/output/dll/pcfx.wbx.gz b/output/dll/pcfx.wbx.gz
index 3baadb5f79..4f341d79a0 100644
Binary files a/output/dll/pcfx.wbx.gz and b/output/dll/pcfx.wbx.gz differ
diff --git a/output/dll/picodrive.wbx.gz b/output/dll/picodrive.wbx.gz
index 163bc98cdd..eb42b96194 100644
Binary files a/output/dll/picodrive.wbx.gz and b/output/dll/picodrive.wbx.gz differ
diff --git a/output/dll/sameboy.wbx.gz b/output/dll/sameboy.wbx.gz
index 2e37770361..fbe710d0eb 100644
Binary files a/output/dll/sameboy.wbx.gz and b/output/dll/sameboy.wbx.gz differ
diff --git a/output/dll/snes9x.wbx.gz b/output/dll/snes9x.wbx.gz
index 50ffef962b..b409f66a3b 100644
Binary files a/output/dll/snes9x.wbx.gz and b/output/dll/snes9x.wbx.gz differ
diff --git a/output/dll/ss.wbx.gz b/output/dll/ss.wbx.gz
index 07854c4973..e58f76c53a 100644
Binary files a/output/dll/ss.wbx.gz and b/output/dll/ss.wbx.gz differ
diff --git a/output/dll/vb.wbx.gz b/output/dll/vb.wbx.gz
index abbb202674..0aeedbce20 100644
Binary files a/output/dll/vb.wbx.gz and b/output/dll/vb.wbx.gz differ
diff --git a/waterbox/sameboy/Makefile b/waterbox/sameboy/Makefile
index 0ed75959c5..6634f26730 100644
--- a/waterbox/sameboy/Makefile
+++ b/waterbox/sameboy/Makefile
@@ -1,12 +1,12 @@
-FLAGS := -Wall -Werror=pointer-to-int-cast -Werror=int-to-pointer-cast -Werror=implicit-function-declaration \
+FLAGS := -Wall -Werror=int-to-pointer-cast \
 	-Wno-multichar \
-	-fomit-frame-pointer
+	-fomit-frame-pointer -DGB_INTERNAL -D_GNU_SOURCE
 
 CCFLAGS := $(FLAGS) \
 	-std=gnu99 \
-	-DLSB_FIRST -D_GNU_SOURCE -DGB_INTERNAL
+	-DLSB_FIRST -Werror=pointer-to-int-cast -Werror=implicit-function-declaration
 
-CXXFLAGS := $(FLAGS) -DSPC_NO_COPY_STATE_FUNCS -std=c++0x -D_GNU_SOURCE -DGB_INTERNAL
+CXXFLAGS := $(FLAGS) -DSPC_NO_COPY_STATE_FUNCS -std=c++0x -fno-exceptions -fno-rtti
 
 TARGET := sameboy.wbx