diff --git a/Makefile b/Makefile
index 0796cab9..811f588e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ BUILD		:=	build
 SOURCES		:=	source source/libwiigui source/images source/fonts source/sounds \
 				source/libwbfs source/unzip source/language source/mload source/patches \
 				source/usbloader source/xml source/network source/settings source/prompts \
-				source/ramdisc
+				source/ramdisc source/wad
 INCLUDES	:=	source
 SVNDEV		:=	-D'SVN_REV="$(shell svnversion -n ..)"'
 
diff --git a/source/menu.cpp b/source/menu.cpp
index 9c8e4f28..2c21975b 100644
--- a/source/menu.cpp
+++ b/source/menu.cpp
@@ -31,7 +31,7 @@
 #include "cheatmenu.h"
 #include "menu.h"
 #include "audio.h"
-#include "wad.h"
+#include "wad/wad.h"
 #include "input.h"
 #include "filelist.h"
 #include "sys.h"
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 19f84fe6..f506395b 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -25,7 +25,7 @@
 #include "filelist.h"
 #include "sys.h"
 #include "wpad.h"
-#include "wad.h"
+#include "wad/wad.h"
 #include "unzip/unzip.h"
 #include "zlib.h"
 
diff --git a/source/wad.cpp b/source/wad/wad.cpp
similarity index 100%
rename from source/wad.cpp
rename to source/wad/wad.cpp
diff --git a/source/wad.h b/source/wad/wad.h
similarity index 100%
rename from source/wad.h
rename to source/wad/wad.h