diff --git a/libcorpus2_whole/io/corpusreader.cpp b/libcorpus2_whole/io/corpusreader.cpp
index a7ce1393a5d0ff940852d87abbcecddbac9704f2..05485563f62a7aa9db96a6d4bfb6139ad2fd6a03 100644
--- a/libcorpus2_whole/io/corpusreader.cpp
+++ b/libcorpus2_whole/io/corpusreader.cpp
@@ -2,7 +2,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include <libcorpus2/exception.h>
-#include <libcorpus2_whole/corpusreader.h>
+#include <libcorpus2_whole/io/corpusreader.h>
 
 namespace Corpus2 {
 namespace whole {
diff --git a/libcorpus2_whole/io/corpusreader.h b/libcorpus2_whole/io/corpusreader.h
index 62d3fe59ffe5657a05788e15490bed2fe3811467..fcf0779910a1feedbbb0c581396b04e8e142d1c5 100644
--- a/libcorpus2_whole/io/corpusreader.h
+++ b/libcorpus2_whole/io/corpusreader.h
@@ -4,9 +4,9 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-#include <libcorpus2_whole/docreaderi.h>
+#include <libcorpus2_whole/io/docreaderi.h>
+#include <libcorpus2_whole/io/docreader.h>
 #include <libcorpus2_whole/corpus.h>
-#include <libcorpus2_whole/docreader.h>
 
 namespace Corpus2 {
 namespace whole {
diff --git a/libcorpus2_whole/io/docreader.cpp b/libcorpus2_whole/io/docreader.cpp
index d659ae5125f6ff0f3f5edcec40059982ed467f25..4fba578d24e019da34d39b129e6c521400859a18 100644
--- a/libcorpus2_whole/io/docreader.cpp
+++ b/libcorpus2_whole/io/docreader.cpp
@@ -15,7 +15,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 */
 
 #include <boost/make_shared.hpp>
-#include <libcorpus2_whole/docreader.h>
+#include <libcorpus2_whole/io/docreader.h>
 
 namespace Corpus2 {
 	DocumentReader::DocumentReader(const Tagset& tagset,
diff --git a/libcorpus2_whole/io/docreader.h b/libcorpus2_whole/io/docreader.h
index d022a390f8310b761b45f266428002f7eacb1717..acbb595f84ab0d872c8345ea3b82aaf106aea677 100644
--- a/libcorpus2_whole/io/docreader.h
+++ b/libcorpus2_whole/io/docreader.h
@@ -19,9 +19,9 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 
 #include <libcorpus2_whole/relation.h>
 #include <libcorpus2_whole/document.h>
-#include <libcorpus2_whole/docreaderi.h>
+#include <libcorpus2_whole/io/docreaderi.h>
 #include <libcorpus2/io/cclreader.h>
-#include <libcorpus2_whole/relreader.h>
+#include <libcorpus2_whole/io/relreader.h>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/libcorpus2_whole/io/poliqarpdocumentreader.cpp b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
index eef56ef51216990ca1476b345fa32285eff3869f..a302340b593a656ef573431a78420d82c17caf3a 100644
--- a/libcorpus2_whole/io/poliqarpdocumentreader.cpp
+++ b/libcorpus2_whole/io/poliqarpdocumentreader.cpp
@@ -1,4 +1,4 @@
-#include <libcorpus2_whole/poliqarpdocumentreader.h>
+#include <libcorpus2_whole/io/poliqarpdocumentreader.h>
 
 namespace Corpus2 {
 namespace whole {
diff --git a/libcorpus2_whole/io/poliqarpdocumentreader.h b/libcorpus2_whole/io/poliqarpdocumentreader.h
index 80450073174093bc5dfd1e22d3ba8ce8aa35930e..f59ac67b730faf5402eaf5e32bdd125dbf5ecd5f 100644
--- a/libcorpus2_whole/io/poliqarpdocumentreader.h
+++ b/libcorpus2_whole/io/poliqarpdocumentreader.h
@@ -2,7 +2,7 @@
 #define LIBCORPUS2_WHOLE_POLIQARPDOCUMENTREADER_H
 
 #include <poliqarp/pqreader.h>
-#include <libcorpus2_whole/docreaderi.h>
+#include <libcorpus2_whole/io/docreaderi.h>
 #include <libcorpus2_whole/document.h>
 
 namespace Corpus2 {
diff --git a/libcorpus2_whole/io/relreader.cpp b/libcorpus2_whole/io/relreader.cpp
index af0dcffbce51e19e8b36f765f7b578c1f86c406d..f683046072c16d4ea15c52d03f7fe6450cfa9f87 100644
--- a/libcorpus2_whole/io/relreader.cpp
+++ b/libcorpus2_whole/io/relreader.cpp
@@ -16,7 +16,7 @@ or FITNESS FOR A PARTICULAR PURPOSE.
 
 #include <libpwrutils/foreach.h>
 #include <libcorpus2/exception.h>
-#include <libcorpus2_whole/relreader.h>
+#include <libcorpus2_whole/io/relreader.h>
 
 #include <fstream>
 #include <boost/make_shared.hpp>