diff -Naur libsepol/include/sepol/context.h libsepol.new/include/sepol/context.h
--- libsepol/include/sepol/context.h	2005-08-21 12:56:15.000000000 -0400
+++ libsepol.new/include/sepol/context.h	2005-09-12 07:40:39.000000000 -0400
@@ -19,6 +19,7 @@
 #ifndef _SEPOL_CONTEXT_H_
 #define _SEPOL_CONTEXT_H_
 
+#include <stddef.h>
 #include <sepol/ebitmap.h>
 #include <sepol/mls_types.h>
 #include <sepol/context_record.h>
diff -Naur libsepol/include/sepol/expand.h libsepol.new/include/sepol/expand.h
--- libsepol/include/sepol/expand.h	2005-08-21 12:56:16.000000000 -0400
+++ libsepol.new/include/sepol/expand.h	2005-09-12 07:40:34.000000000 -0400
@@ -22,6 +22,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <stddef.h>
 #include <sepol/conditional.h>
 
 #ifndef _SEPOL_EXPAND_H
diff -Naur libsepol/include/sepol/interfaces.h libsepol.new/include/sepol/interfaces.h
--- libsepol/include/sepol/interfaces.h	2005-08-21 12:56:16.000000000 -0400
+++ libsepol.new/include/sepol/interfaces.h	2005-09-12 07:40:13.000000000 -0400
@@ -1,5 +1,6 @@
 #include <sepol/policydb.h>
 #include <sepol/context_record.h>
+#include <stddef.h>
 
 /* High level representation of an interface */
 typedef struct sepol_iface {
diff -Naur libsepol/include/sepol/link.h libsepol.new/include/sepol/link.h
--- libsepol/include/sepol/link.h	2005-07-13 15:42:37.000000000 -0400
+++ libsepol.new/include/sepol/link.h	2005-09-12 07:40:23.000000000 -0400
@@ -23,6 +23,7 @@
  */
 
 #include <sepol/policydb.h>
+#include <stddef.h>
 
 #ifndef _SEPOL_LINK_H
 #define _SEPOL_LINK_H
diff -Naur libsepol/include/sepol/module.h libsepol.new/include/sepol/module.h
--- libsepol/include/sepol/module.h	2005-08-02 15:41:19.000000000 -0400
+++ libsepol.new/include/sepol/module.h	2005-09-12 07:40:19.000000000 -0400
@@ -21,6 +21,7 @@
 #define _SEPOL_MODULE_H_
 
 #include <stdlib.h>
+#include <stddef.h>
 
 #include <sepol/policydb.h>
 #include <sepol/conditional.h>
diff -Naur libsepol/include/sepol/policydb.h libsepol.new/include/sepol/policydb.h
--- libsepol/include/sepol/policydb.h	2005-08-21 12:56:16.000000000 -0400
+++ libsepol.new/include/sepol/policydb.h	2005-09-12 07:39:43.000000000 -0400
@@ -52,6 +52,7 @@
 #define _POLICYDB_H_
 
 #include <stdio.h>
+#include <stddef.h>
 
 #include <sepol/flask_types.h>
 #include <sepol/symtab.h>
diff -Naur libsepol/include/sepol/ports.h libsepol.new/include/sepol/ports.h
--- libsepol/include/sepol/ports.h	2005-08-21 12:56:16.000000000 -0400
+++ libsepol.new/include/sepol/ports.h	2005-09-12 07:39:29.000000000 -0400
@@ -3,6 +3,7 @@
 
 #include <sepol/policydb.h>
 #include <sepol/port_record.h>
+#include <stddef.h>
 
 /* Create a port structure from high level representation */
 extern int sepol_port_struct_create(
diff -Naur libsepol/include/sepol/sepol.h libsepol.new/include/sepol/sepol.h
--- libsepol/include/sepol/sepol.h	2005-04-13 10:56:10.000000000 -0400
+++ libsepol.new/include/sepol/sepol.h	2005-09-12 07:39:15.000000000 -0400
@@ -1,7 +1,7 @@
 #ifndef _SEPOL_H_
 #define _SEPOL_H_
 
-#include <sys/types.h>
+#include <stddef.h>
 #include <stdio.h>
 
 /* Given an existing binary policy (starting at 'data', with length 'len')
diff -Naur libsepol/include/sepol/services.h libsepol.new/include/sepol/services.h
--- libsepol/include/sepol/services.h	2005-07-13 15:42:37.000000000 -0400
+++ libsepol.new/include/sepol/services.h	2005-09-12 07:37:54.000000000 -0400
@@ -14,6 +14,7 @@
 
 #include <sepol/flask_types.h>
 #include <sepol/policydb.h>
+#include <stddef.h>
 
 /* Set the policydb and sidtab structures to be used by
    the service functions.  If not set, then these default
diff -Naur libsepol/include/sepol/user_record.h libsepol.new/include/sepol/user_record.h
--- libsepol/include/sepol/user_record.h	2005-08-02 09:16:53.000000000 -0400
+++ libsepol.new/include/sepol/user_record.h	2005-09-12 07:36:40.000000000 -0400
@@ -1,6 +1,8 @@
 #ifndef _SEPOL_USER_RECORD_H_
 #define _SEPOL_USER_RECORD_H_
 
+#include <stddef.h>
+
 struct sepol_user;
 struct sepol_user_key;
 typedef struct sepol_user* sepol_user_t;
diff -Naur libsepol/include/sepol/users.h libsepol.new/include/sepol/users.h
--- libsepol/include/sepol/users.h	2005-08-21 12:56:16.000000000 -0400
+++ libsepol.new/include/sepol/users.h	2005-09-12 07:36:45.000000000 -0400
@@ -3,7 +3,7 @@
 
 #include <sepol/policydb.h>
 #include <sepol/user_record.h>
-#include <sys/types.h>
+#include <stddef.h>
 
 /* Clear unused users */
 extern void sepol_clear_unused_users(