diff --git a/Makefile.am b/Makefile.am
index 1a61ea5a7..353f28a4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -419,7 +419,7 @@ noinst_LIBRARIES += libstorage.a
 
 libstorage_a_SOURCES = \
 	src/storage/StorageInterface.cxx src/storage/StorageInterface.hxx \
-	src/storage/LocalStorage.cxx src/storage/LocalStorage.hxx \
+	src/storage/plugins/LocalStorage.cxx src/storage/plugins/LocalStorage.hxx \
 	src/storage/FileInfo.hxx
 
 STORAGE_LIBS = libstorage.a
diff --git a/src/Main.cxx b/src/Main.cxx
index 108c0abcb..65993ea8e 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -69,7 +69,7 @@
 #include "db/DatabaseGlue.hxx"
 #include "db/DatabaseSimple.hxx"
 #include "db/plugins/SimpleDatabasePlugin.hxx"
-#include "storage/LocalStorage.hxx"
+#include "storage/plugins/LocalStorage.hxx"
 #endif
 
 #ifdef ENABLE_NEIGHBOR_PLUGINS
diff --git a/src/storage/LocalStorage.cxx b/src/storage/plugins/LocalStorage.cxx
similarity index 99%
rename from src/storage/LocalStorage.cxx
rename to src/storage/plugins/LocalStorage.cxx
index f0a1726e0..f06e447b5 100644
--- a/src/storage/LocalStorage.cxx
+++ b/src/storage/plugins/LocalStorage.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "LocalStorage.hxx"
-#include "FileInfo.hxx"
+#include "storage/FileInfo.hxx"
 #include "util/Error.hxx"
 #include "fs/FileSystem.hxx"
 
diff --git a/src/storage/LocalStorage.hxx b/src/storage/plugins/LocalStorage.hxx
similarity index 98%
rename from src/storage/LocalStorage.hxx
rename to src/storage/plugins/LocalStorage.hxx
index 4acea3d2a..d9c2fcb64 100644
--- a/src/storage/LocalStorage.hxx
+++ b/src/storage/plugins/LocalStorage.hxx
@@ -21,7 +21,7 @@
 #define MPD_STORAGE_LOCAL_HXX
 
 #include "check.h"
-#include "StorageInterface.hxx"
+#include "storage/StorageInterface.hxx"
 #include "fs/AllocatedPath.hxx"
 #include "fs/DirectoryReader.hxx"