5 files changed, 8 insertions, 4 deletions
diff --git a/tools/create_kyradat/create_kyradat.cpp b/tools/create_kyradat/create_kyradat.cpp
index 48a14e849a..08f20141bc 100644
--- a/tools/create_kyradat/create_kyradat.cpp
+++ b/tools/create_kyradat/create_kyradat.cpp
@@ -28,6 +28,9 @@
 
 #include "create_kyradat.h"
 
+#include "search.h"
+#include "pak.h"
+
 #include "tables.h"
 #include "extract.h"
 
diff --git a/tools/create_kyradat/create_kyradat.h b/tools/create_kyradat/create_kyradat.h
index a9432c0269..011a22ee0c 100644
--- a/tools/create_kyradat/create_kyradat.h
+++ b/tools/create_kyradat/create_kyradat.h
@@ -24,8 +24,6 @@
 #define CREATE_KYRADAT_H
 
 #include "util.h"
-#include "pak.h"
-#include "search.h"
 
 struct Language {
 	int lang;
diff --git a/tools/create_kyradat/extract.cpp b/tools/create_kyradat/extract.cpp
index 6491fdbd39..6537a270b9 100644
--- a/tools/create_kyradat/extract.cpp
+++ b/tools/create_kyradat/extract.cpp
@@ -21,7 +21,6 @@
  */
 
 
-#include "create_kyradat.h"
 #include "extract.h"
 
 // Filename creation
diff --git a/tools/create_kyradat/tables.cpp b/tools/create_kyradat/tables.cpp
index 138eaead6b..b8e687b412 100644
--- a/tools/create_kyradat/tables.cpp
+++ b/tools/create_kyradat/tables.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "tables.h"
+#include "create_kyradat.h"
 
 #define EXTRACT_END_ENTRY { UNK_LANG, kPlatformUnknown, { 0, 0, { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } } } }
 
diff --git a/tools/create_kyradat/tables.h b/tools/create_kyradat/tables.h
index 158a014d64..a970c41264 100644
--- a/tools/create_kyradat/tables.h
+++ b/tools/create_kyradat/tables.h
@@ -23,7 +23,10 @@
 #ifndef CREATE_KYRADAT_TABLES_H
 #define CREATE_KYRADAT_TABLES_H
 
-#include "create_kyradat.h"
+#include "search.h"
+#include "util.h"
+
+#include <list>
 
 struct ExtractEntrySearchData {
 	int lang;