diff --git a/src/core/download.cc b/src/core/download.cc
index 018921f0..aea59490 100644
--- a/src/core/download.cc
+++ b/src/core/download.cc
@@ -42,11 +42,11 @@
 #include <sigc++/signal.h>
 #include <rak/path.h>
 #include <torrent/exceptions.h>
-#include <torrent/file_list.h>
 #include <torrent/rate.h>
 #include <torrent/torrent.h>
 #include <torrent/tracker.h>
 #include <torrent/tracker_list.h>
+#include <torrent/data/file_list.h>
 
 #include "utils/variable_generic.h"
 
diff --git a/src/display/utils.cc b/src/display/utils.cc
index cc41616a..c097d555 100644
--- a/src/display/utils.cc
+++ b/src/display/utils.cc
@@ -43,10 +43,10 @@
 #include <rak/timer.h>
 #include <torrent/exceptions.h>
 #include <torrent/connection_manager.h>
-#include <torrent/file_list.h>
 #include <torrent/rate.h>
 #include <torrent/tracker.h>
 #include <torrent/tracker_list.h>
+#include <torrent/data/file_list.h>
 #include <torrent/peer/client_info.h>
 
 #include "core/download.h"
diff --git a/src/display/window_file_list.cc b/src/display/window_file_list.cc
index 438b2ad8..7a6bd771 100644
--- a/src/display/window_file_list.cc
+++ b/src/display/window_file_list.cc
@@ -38,9 +38,9 @@
 
 #include <stdexcept>
 #include <rak/algorithm.h>
-#include <torrent/file.h>
-#include <torrent/file_list.h>
 #include <torrent/path.h>
+#include <torrent/data/file.h>
+#include <torrent/data/file_list.h>
 
 #include "core/download.h"
 
diff --git a/src/option_handler_rules.cc b/src/option_handler_rules.cc
index 03506020..450e0d8c 100644
--- a/src/option_handler_rules.cc
+++ b/src/option_handler_rules.cc
@@ -49,13 +49,13 @@
 #include <torrent/chunk_manager.h>
 #include <torrent/connection_manager.h>
 #include <torrent/exceptions.h>
-#include <torrent/file.h>
-#include <torrent/file_list.h>
 #include <torrent/path.h>
 #include <torrent/rate.h>
 #include <torrent/torrent.h>
 #include <torrent/tracker.h>
 #include <torrent/tracker_list.h>
+#include <torrent/data/file.h>
+#include <torrent/data/file_list.h>
 
 #include "core/download.h"
 #include "core/download_list.h"
diff --git a/src/ui/download.cc b/src/ui/download.cc
index 7e2f3d62..a7dd62d4 100644
--- a/src/ui/download.cc
+++ b/src/ui/download.cc
@@ -42,9 +42,9 @@
 #include <torrent/exceptions.h>
 #include <torrent/chunk_manager.h>
 #include <torrent/connection_manager.h>
-#include <torrent/file_list.h>
 #include <torrent/torrent.h>
 #include <torrent/tracker_list.h>
+#include <torrent/data/file_list.h>
 
 #include "core/download.h"
 #include "input/manager.h"
diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc
index 5ce14798..6166a000 100644
--- a/src/ui/element_file_list.cc
+++ b/src/ui/element_file_list.cc
@@ -37,7 +37,8 @@
 #include "config.h"
 
 #include <torrent/exceptions.h>
-#include <torrent/file_list.h>
+#include <torrent/data/file.h>
+#include <torrent/data/file_list.h>
 
 #include "display/frame.h"
 #include "display/manager.h"
diff --git a/src/ui/element_file_list.h b/src/ui/element_file_list.h
index a046144e..66978b60 100644
--- a/src/ui/element_file_list.h
+++ b/src/ui/element_file_list.h
@@ -37,7 +37,7 @@
 #ifndef RTORRENT_UI_ELEMENT_FILE_LIST_H
 #define RTORRENT_UI_ELEMENT_FILE_LIST_H
 
-#include <torrent/file.h>
+#include <torrent/common.h>
 
 #include "core/download.h"