6 files changed, 10 insertions, 6 deletions
diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 21e63d3..0c40cc2 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 646377d..e74d94f 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 b69b60b..1a34cc9 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 2a6114d..f4acb36 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 662c818..6574aab 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 e829a99..f4a8c2b 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"