diff --git a/buf/buf0buf.c b/buf/buf0buf.c
index 116d3517a70..70ec9149045 100644
--- a/buf/buf0buf.c
+++ b/buf/buf0buf.c
@@ -35,7 +35,6 @@ Created 11/5/1995 Heikki Tuuri
 #include "ibuf0ibuf.h"
 #include "dict0dict.h"
 #include "log0recv.h"
-#include "log0log.h"
 #include "trx0undo.h"
 #include "srv0srv.h"
 #include "page0zip.h"
diff --git a/dict/dict0mem.c b/dict/dict0mem.c
index dff2ad3f552..bba7837f6b6 100644
--- a/dict/dict0mem.c
+++ b/dict/dict0mem.c
@@ -16,8 +16,6 @@ Created 1/8/1996 Heikki Tuuri
 #include "data0type.h"
 #include "mach0data.h"
 #include "dict0dict.h"
-#include "que0que.h"
-#include "pars0pars.h"
 #include "lock0lock.h"
 
 #define	DICT_HEAP_SIZE		100	/* initial memory heap size when
diff --git a/fil/fil0fil.c b/fil/fil0fil.c
index 2c902e33271..663139ea4dd 100644
--- a/fil/fil0fil.c
+++ b/fil/fil0fil.c
@@ -18,7 +18,6 @@ Created 10/25/1995 Heikki Tuuri
 #include "buf0buf.h"
 #include "buf0flu.h"
 #include "buf0lru.h"
-#include "log0log.h"
 #include "log0recv.h"
 #include "fsp0fsp.h"
 #include "srv0srv.h"
diff --git a/include/dict0dict.h b/include/dict0dict.h
index bb9f257583c..c8a421f4596 100644
--- a/include/dict0dict.h
+++ b/include/dict0dict.h
@@ -18,7 +18,6 @@ Created 1/8/1996 Heikki Tuuri
 #include "sync0rw.h"
 #include "mem0mem.h"
 #include "rem0types.h"
-#include "btr0types.h"
 #include "ut0mem.h"
 #include "ut0lst.h"
 #include "hash0hash.h"
diff --git a/include/dict0mem.h b/include/dict0mem.h
index bfa0636aee5..6d21315164b 100644
--- a/include/dict0mem.h
+++ b/include/dict0mem.h
@@ -12,7 +12,6 @@ Created 1/8/1996 Heikki Tuuri
 #include "univ.i"
 #include "dict0types.h"
 #include "data0type.h"
-#include "data0data.h"
 #include "mem0mem.h"
 #include "rem0types.h"
 #include "btr0types.h"
diff --git a/include/log0recv.ic b/include/log0recv.ic
index 50ce8a87006..ba4588d1a24 100644
--- a/include/log0recv.ic
+++ b/include/log0recv.ic
@@ -6,10 +6,7 @@ Recovery
 Created 9/20/1997 Heikki Tuuri
 *******************************************************/
 
-#include "sync0sync.h"
-#include "mem0mem.h"
-#include "log0log.h"
-#include "os0file.h"
+#include "univ.i"
 
 extern ibool	recv_recovery_from_backup_on;
 
diff --git a/log/log0recv.c b/log/log0recv.c
index a36eabce9a4..baa693b3a7a 100644
--- a/log/log0recv.c
+++ b/log/log0recv.c
@@ -18,23 +18,14 @@ Created 9/20/1997 Heikki Tuuri
 #include "buf0rea.h"
 #include "srv0srv.h"
 #include "srv0start.h"
-#include "mtr0mtr.h"
 #include "mtr0log.h"
-#include "page0page.h"
 #include "page0cur.h"
 #include "page0zip.h"
-#include "btr0btr.h"
 #include "btr0cur.h"
 #include "ibuf0ibuf.h"
 #include "trx0undo.h"
 #include "trx0rec.h"
 #include "trx0roll.h"
-#include "btr0cur.h"
-#include "btr0cur.h"
-#include "btr0cur.h"
-#include "dict0boot.h"
-#include "fil0fil.h"
-#include "sync0sync.h"
 #include "row0merge.h"
 
 #ifdef UNIV_HOTBACKUP