diff --git a/Makefile.am b/Makefile.am
index 87ca79a70..74909e27d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -244,9 +244,9 @@ endif
 if ENABLE_SQLITE
 src_mpd_SOURCES += \
 	src/command/StickerCommands.cxx src/command/StickerCommands.hxx \
-	src/StickerDatabase.cxx src/StickerDatabase.hxx \
-	src/StickerPrint.cxx src/StickerPrint.hxx \
-	src/SongSticker.cxx src/SongSticker.hxx
+	src/sticker/StickerDatabase.cxx src/sticker/StickerDatabase.hxx \
+	src/sticker/StickerPrint.cxx src/sticker/StickerPrint.hxx \
+	src/sticker/SongSticker.cxx src/sticker/SongSticker.hxx
 endif
 
 # Generic utility library
diff --git a/src/Main.cxx b/src/Main.cxx
index 912e28a62..815f26f0a 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -72,7 +72,7 @@
 #endif
 
 #ifdef ENABLE_SQLITE
-#include "StickerDatabase.hxx"
+#include "sticker/StickerDatabase.hxx"
 #endif
 
 #ifdef ENABLE_ARCHIVE
diff --git a/src/command/AllCommands.cxx b/src/command/AllCommands.cxx
index ed1858ea8..ce753b300 100644
--- a/src/command/AllCommands.cxx
+++ b/src/command/AllCommands.cxx
@@ -37,7 +37,7 @@
 
 #ifdef ENABLE_SQLITE
 #include "StickerCommands.hxx"
-#include "StickerDatabase.hxx"
+#include "sticker/StickerDatabase.hxx"
 #endif
 
 #include <assert.h>
diff --git a/src/command/StickerCommands.cxx b/src/command/StickerCommands.cxx
index 4272dee69..cf1be076b 100644
--- a/src/command/StickerCommands.cxx
+++ b/src/command/StickerCommands.cxx
@@ -24,9 +24,9 @@
 #include "DatabasePlugin.hxx"
 #include "DatabaseGlue.hxx"
 #include "DatabaseSimple.hxx"
-#include "SongSticker.hxx"
-#include "StickerPrint.hxx"
-#include "StickerDatabase.hxx"
+#include "sticker/SongSticker.hxx"
+#include "sticker/StickerPrint.hxx"
+#include "sticker/StickerDatabase.hxx"
 #include "CommandError.hxx"
 #include "protocol/Result.hxx"
 #include "util/Error.hxx"
diff --git a/src/SongSticker.cxx b/src/sticker/SongSticker.cxx
similarity index 100%
rename from src/SongSticker.cxx
rename to src/sticker/SongSticker.cxx
diff --git a/src/SongSticker.hxx b/src/sticker/SongSticker.hxx
similarity index 100%
rename from src/SongSticker.hxx
rename to src/sticker/SongSticker.hxx
diff --git a/src/StickerDatabase.cxx b/src/sticker/StickerDatabase.cxx
similarity index 100%
rename from src/StickerDatabase.cxx
rename to src/sticker/StickerDatabase.cxx
diff --git a/src/StickerDatabase.hxx b/src/sticker/StickerDatabase.hxx
similarity index 100%
rename from src/StickerDatabase.hxx
rename to src/sticker/StickerDatabase.hxx
diff --git a/src/StickerPrint.cxx b/src/sticker/StickerPrint.cxx
similarity index 100%
rename from src/StickerPrint.cxx
rename to src/sticker/StickerPrint.cxx
diff --git a/src/StickerPrint.hxx b/src/sticker/StickerPrint.hxx
similarity index 100%
rename from src/StickerPrint.hxx
rename to src/sticker/StickerPrint.hxx
diff --git a/src/update/UpdateRemove.cxx b/src/update/UpdateRemove.cxx
index bed7a92ab..30898b00b 100644
--- a/src/update/UpdateRemove.cxx
+++ b/src/update/UpdateRemove.cxx
@@ -30,8 +30,8 @@
 #include "Log.hxx"
 
 #ifdef ENABLE_SQLITE
-#include "StickerDatabase.hxx"
-#include "SongSticker.hxx"
+#include "sticker/StickerDatabase.hxx"
+#include "sticker/SongSticker.hxx"
 #endif
 
 #include <assert.h>