From b3bccf44c4f0fecd64e9a1c6e326956b699e8223 Mon Sep 17 00:00:00 2001
From: Paul Moore <paul.moore@hp.com>
Date: Tue, 29 Aug 2006 17:56:04 -0700
Subject: [PATCH] --- yaml --- r: 34657 b: refs/heads/master c:
 7a0e1d602288370801c353221c6a938eab925053 h: refs/heads/master i:   34655:
 6f3a3b35b2820c9cc0228aff926da9c1948b0fdf v: v3

---
 [refs]                                            | 2 +-
 trunk/include/net/cipso_ipv4.h                    | 2 ++
 trunk/include/net/netlabel.h                      | 1 +
 trunk/net/netlabel/netlabel_domainhash.h          | 4 ++++
 trunk/net/netlabel/netlabel_user.h                | 5 +++--
 trunk/security/selinux/include/selinux_netlabel.h | 9 +++++++++
 6 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4ee0c69b3d67..4c527dd9e9ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e448e931309e703f51d71a557973c620ff12fbda
+refs/heads/master: 7a0e1d602288370801c353221c6a938eab925053
diff --git a/trunk/include/net/cipso_ipv4.h b/trunk/include/net/cipso_ipv4.h
index 5aed72ab652b..59406e0dc5b2 100644
--- a/trunk/include/net/cipso_ipv4.h
+++ b/trunk/include/net/cipso_ipv4.h
@@ -37,6 +37,8 @@
 #include <linux/types.h>
 #include <linux/rcupdate.h>
 #include <linux/list.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
 #include <net/netlabel.h>
 
 /* known doi values */
diff --git a/trunk/include/net/netlabel.h b/trunk/include/net/netlabel.h
index 7cae730832c7..fc2b72fc7e07 100644
--- a/trunk/include/net/netlabel.h
+++ b/trunk/include/net/netlabel.h
@@ -31,6 +31,7 @@
 #define _NETLABEL_H
 
 #include <linux/types.h>
+#include <linux/net.h>
 #include <linux/skbuff.h>
 #include <net/netlink.h>
 
diff --git a/trunk/net/netlabel/netlabel_domainhash.h b/trunk/net/netlabel/netlabel_domainhash.h
index 9217863ce0d3..99a2287de246 100644
--- a/trunk/net/netlabel/netlabel_domainhash.h
+++ b/trunk/net/netlabel/netlabel_domainhash.h
@@ -32,6 +32,10 @@
 #ifndef _NETLABEL_DOMAINHASH_H
 #define _NETLABEL_DOMAINHASH_H
 
+#include <linux/types.h>
+#include <linux/rcupdate.h>
+#include <linux/list.h>
+
 /* Domain hash table size */
 /* XXX - currently this number is an uneducated guess */
 #define NETLBL_DOMHSH_BITSIZE       7
diff --git a/trunk/net/netlabel/netlabel_user.h b/trunk/net/netlabel/netlabel_user.h
index ccf237b3a128..385a6c7488c6 100644
--- a/trunk/net/netlabel/netlabel_user.h
+++ b/trunk/net/netlabel/netlabel_user.h
@@ -31,11 +31,12 @@
 #ifndef _NETLABEL_USER_H
 #define _NETLABEL_USER_H
 
+#include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/capability.h>
-#include <linux/genetlink.h>
-#include <net/netlabel.h>
+#include <net/netlink.h>
 #include <net/genetlink.h>
+#include <net/netlabel.h>
 
 /* NetLabel NETLINK helper functions */
 
diff --git a/trunk/security/selinux/include/selinux_netlabel.h b/trunk/security/selinux/include/selinux_netlabel.h
index d69ec650cdbe..ecab4bddaaf4 100644
--- a/trunk/security/selinux/include/selinux_netlabel.h
+++ b/trunk/security/selinux/include/selinux_netlabel.h
@@ -27,6 +27,15 @@
 #ifndef _SELINUX_NETLABEL_H_
 #define _SELINUX_NETLABEL_H_
 
+#include <linux/types.h>
+#include <linux/fs.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+
+#include "avc.h"
+#include "objsec.h"
+
 #ifdef CONFIG_NETLABEL
 void selinux_netlbl_cache_invalidate(void);
 int selinux_netlbl_socket_post_create(struct socket *sock,