From 5f7c3ff6a2e227418d363069ff89cf9d7f01fbc1 Mon Sep 17 00:00:00 2001
From: Jon Maloy <jon.maloy@ericsson.com>
Date: Fri, 13 Jan 2006 10:45:44 +0000
Subject: [PATCH] [TIPC] Minor changes to #includes

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
---
 net/tipc/bearer.h   | 2 +-
 net/tipc/config.h   | 3 +--
 net/tipc/core.h     | 5 +++++
 net/tipc/discover.h | 2 +-
 net/tipc/msg.h      | 2 +-
 net/tipc/port.h     | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net/tipc/bearer.h b/net/tipc/bearer.h
index 21e63d3f01..0c40cc2b43 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 646377d404..e74d94f753 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 b69b60b2cc..1a34cc95b9 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 2a6114d916..f4acb360d6 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 662c81862a..6574aab11f 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 e829a99d3b..f4a8c2be3f 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"
-- 
2.39.5