7 files changed, 14 insertions, 10 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 7ec5badb6..71ce562db 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-#include "resources/emotedb.h"
+#include "resources/db/emotedb.h"
 
 #include <vector>
 
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 572e4dbf2..804177a0a 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -33,7 +33,7 @@
 #include "utils/process.h"
 #include "utils/stringutils.h"
 
-#include "resources/itemdb.h"
+#include "resources/db/itemdb.h"
 
 #include <string>
 
diff --git a/src/gui/widgets/tabs/chattab.cpp b/src/gui/widgets/tabs/chattab.cpp
index 2c0628581..b7f8a1a44 100644
--- a/src/gui/widgets/tabs/chattab.cpp
+++ b/src/gui/widgets/tabs/chattab.cpp
@@ -41,7 +41,8 @@
 #include "net/net.h"
 
 #include "resources/iteminfo.h"
-#include "resources/itemdb.h"
+
+#include "resources/db/itemdb.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 53f1a5bce..3916a1ece 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -38,11 +38,12 @@
 
 #include "net/net.h"
 
-#include "resources/chardb.h"
-#include "resources/colordb.h"
-#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
+#include "resources/db/chardb.h"
+#include "resources/db/colordb.h"
+#include "resources/db/itemdb.h"
+
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 5c0b71edc..50d40dfbc 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -56,7 +56,7 @@
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
-#include "resources/itemdb.h"
+#include "resources/db/itemdb.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 6e546ef61..ea5813084 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -48,10 +48,11 @@
 #include "gui/widgets/playerbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "resources/avatardb.h"
-#include "resources/npcdb.h"
 #include "resources/resourcemanager.h"
 
+#include "resources/db/avatardb.h"
+#include "resources/db/npcdb.h"
+
 #include "net/net.h"
 #include "net/npchandler.h"
 
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 1b4fb3440..e7bd8eb2c 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -36,9 +36,10 @@
 
 #include "utils/gettext.h"
 
-#include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
+#include "resources/db/itemdb.h"
+
 #include "debug.h"
 
 class IconsModal final : public gcn::ListModel