diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 21e63d3f0183499ebe86d274abb0dc9ebfbd0474..0c40cc2b43ccd2cf5f1a67e0ece64e90d5a1a407 100644
--- a/net/tipc/bearer.h
+++ b/net/tipc/bearer.h
@@ -37,7 +37,7 @@
 #ifndef _TIPC_BEARER_H
 #define _TIPC_BEARER_H
 
-#include <net/tipc/tipc_bearer.h>
+#include "core.h"
 #include "bcast.h"
 
 #define MAX_BEARERS 8
diff --git a/net/tipc/config.h b/net/tipc/config.h
index 646377d40454a5caa52abba1aeb59ab78d54b57b..e74d94f753c9a56ac3fbd16c9a00e7c0eca6b2ae 100644
--- a/net/tipc/config.h
+++ b/net/tipc/config.h
@@ -39,8 +39,7 @@
 
 /* ---------------------------------------------------------------------- */
 
-#include <linux/tipc.h>
-#include <linux/tipc_config.h>
+#include "core.h"
 #include "link.h"
 
 struct sk_buff *cfg_reply_alloc(int payload_size);
diff --git a/net/tipc/core.h b/net/tipc/core.h
index b69b60b2cc866d6c2bb3db751fa8ac19e2692077..1a34cc95b9e0968504d7ba064e12c839b552c2e8 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -37,6 +37,11 @@
 #ifndef _TIPC_CORE_H
 #define _TIPC_CORE_H
 
+#include <linux/tipc.h>
+#include <linux/tipc_config.h>
+#include <net/tipc/tipc_msg.h>
+#include <net/tipc/tipc_port.h>
+#include <net/tipc/tipc_bearer.h>
 #include <net/tipc/tipc.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
diff --git a/net/tipc/discover.h b/net/tipc/discover.h
index 2a6114d91626030e1b1538a8e5f3715f22b5b01f..f4acb360d6c3c9fe6dba578cf87f468c0629dfa3 100644
--- a/net/tipc/discover.h
+++ b/net/tipc/discover.h
@@ -37,7 +37,7 @@
 #ifndef _TIPC_DISCOVER_H
 #define _TIPC_DISCOVER_H
 
-#include <linux/tipc.h>
+#include "core.h"
 
 struct link_req;
 
diff --git a/net/tipc/msg.h b/net/tipc/msg.h
index 662c81862a0c6211441900bc3a428fdf2ce4ae5b..6574aab11fa4d0de107b6aa8a811c02b28ff7030 100644
--- a/net/tipc/msg.h
+++ b/net/tipc/msg.h
@@ -37,7 +37,7 @@
 #ifndef _TIPC_MSG_H
 #define _TIPC_MSG_H
 
-#include <net/tipc/tipc_msg.h>
+#include "core.h"
 
 #define TIPC_VERSION              2
 #define DATA_LOW                  TIPC_LOW_IMPORTANCE
diff --git a/net/tipc/port.h b/net/tipc/port.h
index e829a99d3b7fd904af1703aa808055044040acff..f4a8c2be3faa2f48ad3a3b2247aac26ddf598ab9 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -37,7 +37,7 @@
 #ifndef _TIPC_PORT_H
 #define _TIPC_PORT_H
 
-#include <net/tipc/tipc_port.h>
+#include "core.h"
 #include "ref.h"
 #include "net.h"
 #include "msg.h"