diff --git a/src/sticker/Sticker.hxx b/src/sticker/Sticker.hxx
new file mode 100644
index 000000000..7312db3b5
--- /dev/null
+++ b/src/sticker/Sticker.hxx
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2003-2019 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_STICKER_HXX
+#define MPD_STICKER_HXX
+
+#include <map>
+#include <string>
+
+struct Sticker {
+	std::map<std::string, std::string> table;
+};
+
+#endif
diff --git a/src/sticker/StickerDatabase.cxx b/src/sticker/StickerDatabase.cxx
index 73011e7ba..a649e4e72 100644
--- a/src/sticker/StickerDatabase.cxx
+++ b/src/sticker/StickerDatabase.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "StickerDatabase.hxx"
+#include "Sticker.hxx"
 #include "lib/sqlite/Util.hxx"
 #include "fs/Path.hxx"
 #include "Idle.hxx"
@@ -25,15 +26,8 @@
 #include "util/StringCompare.hxx"
 #include "util/ScopeExit.hxx"
 
-#include <string>
-#include <map>
-
 #include <assert.h>
 
-struct Sticker {
-	std::map<std::string, std::string> table;
-};
-
 enum sticker_sql {
 	STICKER_SQL_GET,
 	STICKER_SQL_LIST,