Another step towards proper header ordering

25 files changed, 36 insertions, 25 deletions

diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 55596b3..5256121 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -10,11 +10,11 @@
 #include "../strings/xstring.hpp"
 #include "../strings/vstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 #include "../io/write.hpp"
 
 #include "../common/core.hpp"
-#include "../common/cxxstdio.hpp"
 #include "../common/extract.hpp"
 #include "../common/human_time_diff.hpp"
 #include "../common/mmo.hpp"
diff --git a/src/map/battle.cpp b/src/map/battle.cpp
index 457c37a..05bacd4 100644
--- a/src/map/battle.cpp
+++ b/src/map/battle.cpp
@@ -5,9 +5,9 @@
 #include "../strings/fstring.hpp"
 #include "../strings/zstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/nullpo.hpp"
 #include "../common/random.hpp"
 
diff --git a/src/map/chrif.cpp b/src/map/chrif.cpp
index 8e62e4d..4afccb7 100644
--- a/src/map/chrif.cpp
+++ b/src/map/chrif.cpp
@@ -7,7 +7,8 @@
 #include "../strings/fstring.hpp"
 #include "../strings/zstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/nullpo.hpp"
 #include "../common/socket.hpp"
 #include "../common/timer.hpp"
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index d4cedc6..5b7c21d 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -10,9 +10,9 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/write.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/md5calc.hpp"
 #include "../common/random.hpp"
 #include "../common/nullpo.hpp"
diff --git a/src/map/grfio.cpp b/src/map/grfio.cpp
index c486cf4..c5a55f5 100644
--- a/src/map/grfio.cpp
+++ b/src/map/grfio.cpp
@@ -15,9 +15,9 @@
 #include "../strings/mstring.hpp"
 #include "../strings/fstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/extract.hpp"
 
 #include "../poison.hpp"
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index 18415d0..8673aef 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -7,7 +7,8 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/nullpo.hpp"
 #include "../common/socket.hpp"
 
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp
index 5a11aa1..313ff23 100644
--- a/src/map/itemdb.cpp
+++ b/src/map/itemdb.cpp
@@ -7,9 +7,9 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
 #include "../common/nullpo.hpp"
diff --git a/src/map/magic-expr.cpp b/src/map/magic-expr.cpp
index b360cca..acdefc2 100644
--- a/src/map/magic-expr.cpp
+++ b/src/map/magic-expr.cpp
@@ -10,7 +10,8 @@
 #include "../strings/zstring.hpp"
 #include "../strings/vstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/random.hpp"
 
 #include "battle.hpp"
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index e86e86b..0ba145a 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -6,7 +6,8 @@
 #include "../strings/fstring.hpp"
 #include "../strings/xstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/timer.hpp"
 
 #include "magic-expr.hpp"
diff --git a/src/map/magic-interpreter-lexer.lpp b/src/map/magic-interpreter-lexer.lpp
index b5a16b2..2b68acf 100644
--- a/src/map/magic-interpreter-lexer.lpp
+++ b/src/map/magic-interpreter-lexer.lpp
@@ -3,7 +3,7 @@
 #
 #include "magic-interpreter-parser.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
 
 #ifdef HEADING
 # error "what platform is this? please tell me who #defined HEADING"
diff --git a/src/map/magic-interpreter-parser.ypp b/src/map/magic-interpreter-parser.ypp
index 8a654cd..0657ade 100644
--- a/src/map/magic-interpreter-parser.ypp
+++ b/src/map/magic-interpreter-parser.ypp
@@ -13,8 +13,9 @@
 #include "../strings/fstring.hpp"
 #include "../strings/zstring.hpp"
 
+#include "../io/cxxstdio.hpp"
+
 #include "../common/const_array.hpp"
-#include "../common/cxxstdio.hpp"
 
 #include "itemdb.hpp"
 #include "magic-expr.hpp"
diff --git a/src/map/magic-stmt.cpp b/src/map/magic-stmt.cpp
index a0e2b7c..682d9bc 100644
--- a/src/map/magic-stmt.cpp
+++ b/src/map/magic-stmt.cpp
@@ -4,7 +4,8 @@
 
 #include "../strings/zstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/random2.hpp"
 #include "../common/timer.hpp"
 
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index 75a76ae..0602dfa 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -2,7 +2,7 @@
 
 #include "../strings/xstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
 
 #include "magic-interpreter.hpp"
 
diff --git a/src/map/map.cpp b/src/map/map.cpp
index d259451..137adff 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -15,11 +15,11 @@
 #include "../strings/xstring.hpp"
 #include "../strings/vstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/write.hpp"
 #include "../io/read.hpp"
 
 #include "../common/core.hpp"
-#include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
 #include "../common/random2.hpp"
diff --git a/src/map/map.hpp b/src/map/map.hpp
index e1f8422..7eeaa8c 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -12,7 +12,8 @@
 #include "../strings/fstring.hpp"
 #include "../strings/vstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/db.hpp"
 #include "../common/matrix.hpp"
 #include "../common/socket.hpp"
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 34374a7..960c58e 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -11,9 +11,9 @@
 #include "../strings/fstring.hpp"
 #include "../strings/xstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/extract.hpp"
 #include "../common/nullpo.hpp"
 #include "../common/random.hpp"
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index e6c7445..f5a1f21 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -12,9 +12,9 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
 #include "../common/nullpo.hpp"
diff --git a/src/map/party.cpp b/src/map/party.cpp
index 0ba251f..9d7cae2 100644
--- a/src/map/party.cpp
+++ b/src/map/party.cpp
@@ -4,7 +4,8 @@
 
 #include "../strings/xstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/db.hpp"
 #include "../common/nullpo.hpp"
 #include "../common/socket.hpp"
diff --git a/src/map/path.cpp b/src/map/path.cpp
index f7fffbe..d66640e 100644
--- a/src/map/path.cpp
+++ b/src/map/path.cpp
@@ -2,7 +2,8 @@
 
 #include <cassert>
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/random.hpp"
 #include "../common/nullpo.hpp"
 
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index 157046f..0b648d1 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -7,9 +7,9 @@
 #include "../strings/fstring.hpp"
 #include "../strings/zstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/nullpo.hpp"
 #include "../common/random.hpp"
 #include "../common/socket.hpp"
diff --git a/src/map/script.cpp b/src/map/script.cpp
index f7a87a5..f3635c4 100644
--- a/src/map/script.cpp
+++ b/src/map/script.cpp
@@ -12,10 +12,10 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/lock.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/db.hpp"
 #include "../common/extract.hpp"
 #include "../common/intern-pool.hpp"
diff --git a/src/map/skill-pools.cpp b/src/map/skill-pools.cpp
index 2774922..31998f8 100644
--- a/src/map/skill-pools.cpp
+++ b/src/map/skill-pools.cpp
@@ -1,6 +1,6 @@
 #include "skill.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
 
 #include "battle.hpp"
 #include "pc.hpp"
diff --git a/src/map/skill.cpp b/src/map/skill.cpp
index 9187335..3fdd45d 100644
--- a/src/map/skill.cpp
+++ b/src/map/skill.cpp
@@ -9,9 +9,9 @@
 #include "../strings/fstring.hpp"
 #include "../strings/xstring.hpp"
 
+#include "../io/cxxstdio.hpp"
 #include "../io/read.hpp"
 
-#include "../common/cxxstdio.hpp"
 #include "../common/extract.hpp"
 #include "../common/nullpo.hpp"
 #include "../common/random.hpp"
diff --git a/src/map/tmw.cpp b/src/map/tmw.cpp
index d4beef4..9841a75 100644
--- a/src/map/tmw.cpp
+++ b/src/map/tmw.cpp
@@ -7,7 +7,8 @@
 #include "../strings/zstring.hpp"
 #include "../strings/xstring.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/nullpo.hpp"
 
 #include "atcommand.hpp"
diff --git a/src/map/trade.cpp b/src/map/trade.cpp
index 785a4da..7fc01ae 100644
--- a/src/map/trade.cpp
+++ b/src/map/trade.cpp
@@ -1,6 +1,7 @@
 #include "trade.hpp"
 
-#include "../common/cxxstdio.hpp"
+#include "../io/cxxstdio.hpp"
+
 #include "../common/nullpo.hpp"
 
 #include "battle.hpp"