diff --git a/.gitignore b/.gitignore
index bbd2c4e0..3998c610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.o
+openjazz
 OpenJazz
 openjazz.cfg
 
@@ -28,3 +29,6 @@ depcomp
 install-sh
 configure
 missing
+
+openjazz-*.tar.*
+OpenJazz-*.zip
diff --git a/Makefile.am b/Makefile.am
index da18df85..bcebb978 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,39 +5,105 @@ AM_CPPFLAGS = -DUSE_SOCKETS -DSCALE -I${top_srcdir}/src \
 AM_CFLAGS   = -Wall
 AM_CXXFLAGS = -Wall
 
-pkgdata_DATA = openjazz.000
+dist_pkgdata_DATA = openjazz.000
 
 bin_PROGRAMS = openjazz
 openjazz_SOURCES = \
-	src/game/clientgame.cpp src/game/game.cpp src/game/gamemode.cpp \
-	src/game/localgame.cpp src/game/servergame.cpp \
-	src/io/gfx/anim.cpp src/io/gfx/font.cpp src/io/gfx/paletteeffects.cpp \
-	src/io/gfx/sprite.cpp src/io/gfx/video.cpp \
-	src/io/gfx/scale2x/getopt.cpp src/io/gfx/scale2x/pixel.cpp \
-	src/io/gfx/scale2x/scale2x.cpp src/io/gfx/scale2x/scale3x.cpp \
-	src/io/gfx/scale2x/scalebit.cpp src/io/gfx/scale2x/simple2x.cpp \
-	src/io/controls.cpp src/io/file.cpp src/io/network.cpp src/io/sound.cpp \
-	src/jj1bonuslevel/jj1bonuslevelplayer/jj1bonuslevelplayer.cpp \
+	src/game/clientgame.cpp \
+	src/game/game.cpp \
+	src/game/game.h \
+	src/game/gamemode.cpp \
+	src/game/gamemode.h \
+	src/game/localgame.cpp \
+	src/game/servergame.cpp \
+	src/io/controls.cpp \
+	src/io/controls.h \
+	src/io/file.cpp \
+	src/io/file.h \
+	src/io/gfx/anim.cpp \
+	src/io/gfx/anim.h \
+	src/io/gfx/font.cpp \
+	src/io/gfx/font.h \
+	src/io/gfx/paletteeffects.cpp \
+	src/io/gfx/paletteeffects.h \
+	src/io/gfx/scale2x/getopt.cpp \
+	src/io/gfx/scale2x/pixel.cpp \
+	src/io/gfx/scale2x/pixel.h \
+	src/io/gfx/scale2x/portable.h \
+	src/io/gfx/scale2x/scale2x.cpp \
+	src/io/gfx/scale2x/scale2x.h \
+	src/io/gfx/scale2x/scale3x.cpp \
+	src/io/gfx/scale2x/scale3x.h \
+	src/io/gfx/scale2x/scalebit.cpp \
+	src/io/gfx/scale2x/scalebit.h \
+	src/io/gfx/scale2x/simple2x.cpp \
+	src/io/gfx/sprite.cpp \
+	src/io/gfx/sprite.h \
+	src/io/gfx/video.cpp \
+	src/io/gfx/video.h \
+	src/io/network.cpp \
+	src/io/network.h \
+	src/io/sound.cpp \
+	src/io/sound.h \
 	src/jj1bonuslevel/jj1bonuslevel.cpp \
-	src/jj1level/jj1event/jj1bridge.cpp src/jj1level/jj1event/jj1event.cpp \
+	src/jj1bonuslevel/jj1bonuslevel.h \
+	src/jj1bonuslevel/jj1bonuslevelplayer/jj1bonuslevelplayer.cpp \
+	src/jj1bonuslevel/jj1bonuslevelplayer/jj1bonuslevelplayer.h \
+	src/jj1level/jj1bullet.cpp \
+	src/jj1level/jj1bullet.h \
+	src/jj1level/jj1demolevel.cpp \
+	src/jj1level/jj1event/jj1bridge.cpp \
+	src/jj1level/jj1event/jj1event.cpp \
+	src/jj1level/jj1event/jj1event.h \
 	src/jj1level/jj1event/jj1guardians.cpp \
+	src/jj1level/jj1event/jj1guardians.h \
 	src/jj1level/jj1event/jj1standardevent.cpp \
+	src/jj1level/jj1level.cpp \
+	src/jj1level/jj1levelframe.cpp \
+	src/jj1level/jj1level.h \
+	src/jj1level/jj1levelload.cpp \
 	src/jj1level/jj1levelplayer/jj1bird.cpp \
+	src/jj1level/jj1levelplayer/jj1bird.h \
 	src/jj1level/jj1levelplayer/jj1levelplayer.cpp \
 	src/jj1level/jj1levelplayer/jj1levelplayerframe.cpp \
-	src/jj1level/jj1bullet.cpp src/jj1level/jj1demolevel.cpp \
-	src/jj1level/jj1level.cpp src/jj1level/jj1levelframe.cpp \
-	src/jj1level/jj1levelload.cpp \
+	src/jj1level/jj1levelplayer/jj1levelplayer.h \
 	src/jj1planet/jj1planet.cpp \
-	src/jj1scene/jj1scene.cpp src/jj1scene/jj1sceneload.cpp \
-	src/jj2level/jj2event/jj2event.cpp src/jj2level/jj2event/jj2eventframe.cpp \
+	src/jj1planet/jj1planet.h \
+	src/jj1scene/jj1scene.cpp \
+	src/jj1scene/jj1scene.h \
+	src/jj1scene/jj1sceneload.cpp \
+	src/jj2level/jj2event/jj2event.cpp \
+	src/jj2level/jj2event/jj2eventframe.cpp \
+	src/jj2level/jj2event/jj2event.h \
+	src/jj2level/jj2layer.cpp \
+	src/jj2level/jj2level.cpp \
+	src/jj2level/jj2levelframe.cpp \
+	src/jj2level/jj2level.h \
+	src/jj2level/jj2levelload.cpp \
 	src/jj2level/jj2levelplayer/jj2levelplayer.cpp \
 	src/jj2level/jj2levelplayer/jj2levelplayerframe.cpp \
-	src/jj2level/jj2layer.cpp src/jj2level/jj2level.cpp \
-	src/jj2level/jj2levelframe.cpp src/jj2level/jj2levelload.cpp \
-	src/level/level.cpp src/level/movable.cpp src/level/levelplayer.cpp \
-	src/menu/gamemenu.cpp src/menu/mainmenu.cpp src/menu/menu.cpp \
-	src/menu/plasma.cpp src/menu/setupmenu.cpp \
+	src/jj2level/jj2levelplayer/jj2levelplayer.h \
+	src/level/level.cpp \
+	src/level/level.h \
+	src/level/levelplayer.cpp \
+	src/level/levelplayer.h \
+	src/level/movable.cpp \
+	src/level/movable.h \
+	src/loop.h \
+	src/main.cpp \
+	src/menu/gamemenu.cpp \
+	src/menu/mainmenu.cpp \
+	src/menu/menu.cpp \
+	src/menu/menu.h \
+	src/menu/plasma.cpp \
+	src/menu/plasma.h \
+	src/menu/setupmenu.cpp \
+	src/OpenJazz.h \
 	src/player/player.cpp \
-	src/main.cpp src/setup.cpp src/util.cpp
+	src/player/player.h \
+	src/setup.cpp \
+	src/setup.h \
+	src/util.cpp \
+	src/util.h
+
 openjazz_LDADD = ${libSDL_LIBS} ${libmodplug_LIBS} ${libxmp_LIBS} ${zlib_LIBS}
diff --git a/src/main.cpp b/src/main.cpp
index 96eb124e..c8cfdc16 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -61,8 +61,9 @@
 
 #include <string.h>
 
-#include "platforms/wiz.h"
-
+#if defined(WIZ) || defined(GP2X)
+	#include "platforms/wiz.h"
+#endif
 
 #ifdef __SYMBIAN32__
 extern char KOpenJazzPath[256];