10 files changed, 15 insertions, 14 deletions
diff --git a/src/io/cxxstdio.hpp b/src/io/cxxstdio.hpp
index 65d32cd..c040d90 100644
--- a/src/io/cxxstdio.hpp
+++ b/src/io/cxxstdio.hpp
@@ -19,7 +19,7 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+# include "fwd.hpp"
 
 # include <cstdarg>
 # include <cstdio>
@@ -28,8 +28,6 @@
 
 # include "../generic/enum.hpp"
 
-# include "fwd.hpp"
-
 
 namespace cxxstdio
 {
diff --git a/src/io/fd.hpp b/src/io/fd.hpp
index cf91ed1..a7460a8 100644
--- a/src/io/fd.hpp
+++ b/src/io/fd.hpp
@@ -24,8 +24,6 @@
 # include <sys/select.h>
 # include <sys/socket.h>
 
-# include <unistd.h>
-
 # include "../strings/fwd.hpp"
 
 
diff --git a/src/io/line.cpp b/src/io/line.cpp
index 8451b87..adefe53 100644
--- a/src/io/line.cpp
+++ b/src/io/line.cpp
@@ -18,12 +18,10 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <fcntl.h>
-#include <unistd.h>
-
 #include "../strings/astring.hpp"
 #include "../strings/mstring.hpp"
 #include "../strings/zstring.hpp"
+#include "../strings/xstring.hpp"
 
 #include "cxxstdio.hpp"
 
diff --git a/src/io/line.hpp b/src/io/line.hpp
index fb1984d..510a8f5 100644
--- a/src/io/line.hpp
+++ b/src/io/line.hpp
@@ -22,10 +22,9 @@
 # include "fwd.hpp"
 
 # include "../strings/rstring.hpp"
-# include "../strings/astring.hpp"
 # include "../strings/zstring.hpp"
+# include "../strings/literal.hpp"
 
-# include "fd.hpp"
 # include "read.hpp"
 
 
diff --git a/src/io/line_test.cpp b/src/io/line_test.cpp
index 921e4c8..6a4a55c 100644
--- a/src/io/line_test.cpp
+++ b/src/io/line_test.cpp
@@ -20,6 +20,7 @@
 
 #include <gtest/gtest.h>
 
+#include "../strings/astring.hpp"
 #include "../strings/zstring.hpp"
 
 #include "../poison.hpp"
diff --git a/src/io/lock.cpp b/src/io/lock.cpp
index 3f83611..f6bbb01 100644
--- a/src/io/lock.cpp
+++ b/src/io/lock.cpp
@@ -22,9 +22,12 @@
 #include <unistd.h>
 
 #include <cerrno>
+#include <cstdio>
 #include <cstdlib>
 
+#include "../strings/astring.hpp"
 #include "../strings/zstring.hpp"
+#include "../strings/literal.hpp"
 
 #include "cxxstdio.hpp"
 #include "fd.hpp"
diff --git a/src/io/read.cpp b/src/io/read.cpp
index 61a6256..803d486 100644
--- a/src/io/read.cpp
+++ b/src/io/read.cpp
@@ -19,11 +19,11 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <fcntl.h>
-#include <unistd.h>
 
 #include "../strings/astring.hpp"
 #include "../strings/mstring.hpp"
 #include "../strings/zstring.hpp"
+#include "../strings/literal.hpp"
 
 #include "../io/cxxstdio.hpp"
 
diff --git a/src/io/read_test.cpp b/src/io/read_test.cpp
index 398c01e..77b2286 100644
--- a/src/io/read_test.cpp
+++ b/src/io/read_test.cpp
@@ -20,7 +20,9 @@
 
 #include <gtest/gtest.h>
 
+#include "../strings/astring.hpp"
 #include "../strings/zstring.hpp"
+#include "../strings/literal.hpp"
 
 #include "../poison.hpp"
 
diff --git a/src/io/write.cpp b/src/io/write.cpp
index 817e6c0..18c4f9d 100644
--- a/src/io/write.cpp
+++ b/src/io/write.cpp
@@ -18,13 +18,14 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <sys/uio.h>
-
 #include <fcntl.h>
-#include <unistd.h>
 
+#include <cstdio>
 #include <cstdlib>
 
+#include <algorithm>
+
+#include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
 #include "../poison.hpp"
diff --git a/src/io/write_test.cpp b/src/io/write_test.cpp
index 5419501..970be42 100644
--- a/src/io/write_test.cpp
+++ b/src/io/write_test.cpp
@@ -26,6 +26,7 @@
 #include "../strings/astring.hpp"
 #include "../strings/mstring.hpp"
 #include "../strings/xstring.hpp"
+#include "../strings/literal.hpp"
 
 #include "../poison.hpp"