Index: include/stddef.h
===================================================================
RCS file: /cvsroot/src/include/stddef.h,v
retrieving revision 1.16
diff -u -r1.16 stddef.h
--- include/stddef.h	15 Nov 2009 22:21:03 -0000	1.16
+++ include/stddef.h	4 Dec 2013 04:52:32 -0000
@@ -35,23 +35,15 @@
 #define _STDDEF_H_
 
 #include <sys/cdefs.h>
+#include <sys/stddef.h>
 #include <sys/featuretest.h>
 #include <machine/ansi.h>
 
-typedef	_BSD_PTRDIFF_T_	ptrdiff_t;
-
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_	size_t;
-#undef	_BSD_SIZE_T_
-#endif
-
 #if defined(_BSD_WCHAR_T_) && !defined(__cplusplus)
 typedef	_BSD_WCHAR_T_	wchar_t;
 #undef	_BSD_WCHAR_T_
 #endif
 
-#include <sys/null.h>
-
 #if __GNUC_PREREQ__(4, 0)
 #define	offsetof(type, member)	__builtin_offsetof(type, member)
 #elif !defined(__cplusplus)
Index: sys/sys/types.h
===================================================================
RCS file: /cvsroot/src/sys/sys/types.h,v
retrieving revision 1.90
diff -u -r1.90 types.h
--- sys/sys/types.h	2 Feb 2013 14:00:37 -0000	1.90
+++ sys/sys/types.h	4 Dec 2013 04:52:32 -0000
@@ -49,6 +49,7 @@
 
 
 #include <sys/ansi.h>
+#include <sys/stddef.h>
 
 #ifndef	int8_t
 typedef	__int8_t	int8_t;
@@ -275,12 +276,6 @@
 #undef	_BSD_CLOCK_T_
 #endif
 
-#ifdef	_BSD_SIZE_T_
-typedef	_BSD_SIZE_T_		size_t;
-#define _SIZE_T
-#undef	_BSD_SIZE_T_
-#endif
-
 #ifdef	_BSD_SSIZE_T_
 typedef	_BSD_SSIZE_T_		ssize_t;
 #undef	_BSD_SSIZE_T_
Index: sys/sys/stddef.h
===================================================================
RCS file: sys/sys/stddef.h
diff -N sys/sys/stddef.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/sys/stddef.h	4 Dec 2013 04:52:32 -0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2013, Lourival Vieira Neto <lneto@NetBSD.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the Author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS_STDDEF_H_
+#define _SYS_STDDEF_H_
+
+#include <machine/ansi.h>
+
+#include <sys/null.h>
+
+#ifdef  _BSD_PTRDIFF_T_
+typedef _BSD_PTRDIFF_T_		ptrdiff_t;
+#undef  _BSD_PTRDIFF_T_
+#endif
+
+#ifdef  _BSD_SIZE_T_
+typedef _BSD_SIZE_T_		size_t;
+#define _SIZE_T
+#undef  _BSD_SIZE_T_
+#endif
+
+#endif