Remove useless belt and suspenders include guards in some of our headers.

For these headers:

/usr/include/machine/atomic.h
/usr/include/machine/bus_dma.h
/usr/include/machine/coredump.h
/usr/include/machine/cpufunc.h
/usr/include/machine/db_machdep.h
/usr/include/machine/elf.h
/usr/include/machine/endian.h
/usr/include/machine/frame.h
/usr/include/machine/limits.h
/usr/include/machine/npx.h
/usr/include/machine/profile.h
/usr/include/machine/segments.h
/usr/include/machine/stdarg.h
/usr/include/machine/stdint.h
/usr/include/machine/trap.h
/usr/include/machine/tss.h
/usr/include/machine/ucontext.h
/usr/include/machine/vframe.h
/usr/include/machine/vm86.h

All these headers #define _CPU_... and not _MACHINE_... even though they
are in /usr/include/machine. And the headers themselves have include
guards already. So there's little point in having them around the actual
#include additionally.

diff --git a/include/err.h b/include/err.h
index f7f76eb..976d65c 100644 (file)
--- a/include/err.h
+++ b/include/err.h
@@ -32,7 +32,6 @@
  *
  *     @(#)err.h       8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/include/err.h,v 1.8 1999/08/27 23:44:49 peter Exp $
- * $DragonFly: src/include/err.h,v 1.4 2003/11/14 01:01:43 dillon Exp $
  */
 
 #ifndef _ERR_H_
@@ -46,12 +45,8 @@
  * __va_list from <machine/stdint.h> and use it.
  */
 #include <sys/cdefs.h>
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
-#ifndef _MACHINE_STDARG_H_
 #include <machine/stdarg.h>
-#endif
 
 __BEGIN_DECLS
 void   err (int, const char *, ...) __dead2 __printf0like(2, 3);

diff --git a/include/signal.h b/include/signal.h
index 8724548..51c6c4b 100644 (file)
--- a/include/signal.h
+++ b/include/signal.h
@@ -40,9 +40,7 @@
 
 #include <sys/cdefs.h>
 #include <sys/_posix.h>
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 #include <sys/signal.h>
 #include <sys/time.h>
 

diff --git a/include/stdarg.h b/include/stdarg.h
index f26be77..0db797d 100644 (file)
--- a/include/stdarg.h
+++ b/include/stdarg.h
@@ -22,8 +22,6 @@
  * 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.
- *
- * $DragonFly: src/include/stdarg.h,v 1.4 2006/01/24 21:43:33 joerg Exp $
  */
 
 #ifndef _STDARG_H_
@@ -33,9 +31,7 @@
 #include <sys/cdefs.h>
 #endif
 
-#ifndef _MACHINE_STDARG_H_
 #include <machine/stdarg.h>
-#endif
 
 #ifndef _VA_LIST_DECLARED
 typedef        __va_list       va_list;

diff --git a/include/time.h b/include/time.h
index 6df6671..f0ec9cd 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -36,7 +36,6 @@
  * SUCH DAMAGE.
  *
  *     @(#)time.h      8.3 (Berkeley) 1/21/94
- * $DragonFly: src/include/time.h,v 1.7 2008/06/05 17:53:10 swildner Exp $
  */
 
 #ifndef _TIME_H_
@@ -44,9 +43,7 @@
 
 #include <sys/cdefs.h>
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 #include <machine/uvparam.h>
 #include <sys/_posix.h>
 

diff --git a/include/utime.h b/include/utime.h
index 99c7c27..345737a 100644 (file)
--- a/include/utime.h
+++ b/include/utime.h
@@ -31,15 +31,12 @@
  * SUCH DAMAGE.
  *
  *     @(#)utime.h     8.1 (Berkeley) 6/2/93
- * $DragonFly: src/include/utime.h,v 1.2 2003/11/14 01:01:43 dillon Exp $
  */
 
 #ifndef        _UTIME_H_
 #define        _UTIME_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 #ifndef _TIME_T_DECLARED
 #define        _TIME_T_DECLARED

diff --git a/lib/libstand/stand.h b/lib/libstand/stand.h
index 1b86eea..c0f3ba7 100644 (file)
--- a/lib/libstand/stand.h
+++ b/lib/libstand/stand.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/lib/libstand/stand.h,v 1.18.2.8 2002/06/17 11:22:39 sobomax Exp $
- * $DragonFly: src/lib/libstand/stand.h,v 1.11 2008/09/13 11:38:58 corecode Exp $
  * From        $NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $      
  */
 
@@ -63,9 +62,7 @@
  *     @(#)stand.h     8.1 (Berkeley) 6/11/93
  */
 
-#ifndef _MACHINE_STDARG_H_
 #include <machine/stdarg.h>    /* __va_list */
-#endif
 #include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/stat.h>

diff --git a/sys/cpu/i386/include/lwbuf.h b/sys/cpu/i386/include/lwbuf.h
index 63b75d7..3947498 100644 (file)
--- a/sys/cpu/i386/include/lwbuf.h
+++ b/sys/cpu/i386/include/lwbuf.h
@@ -51,9 +51,7 @@
 #ifndef _VM_VM_PAGE_H_
 #include <vm/vm_page.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 
 #if !defined(_KERNEL) && !defined(_KERNEL_STRUCTURES)
 #error "This file should not be included by userland programs."

diff --git a/sys/cpu/i386/include/signal.h b/sys/cpu/i386/include/signal.h
index 5a91439..2d4a8b7 100644 (file)
--- a/sys/cpu/i386/include/signal.h
+++ b/sys/cpu/i386/include/signal.h
@@ -32,7 +32,6 @@
  *
  *     @(#)signal.h    8.1 (Berkeley) 6/11/93
  * $FreeBSD: src/sys/i386/include/signal.h,v 1.12 1999/11/12 13:52:11 marcel Exp $
- * $DragonFly: src/sys/cpu/i386/include/signal.h,v 1.9 2007/01/13 21:15:55 dillon Exp $
  */
 
 #ifndef _CPU_SIGNAL_H_
@@ -56,9 +55,7 @@ typedef int sig_atomic_t;
 #ifndef _SYS_SIGNAL_H_
 #include <sys/signal.h>
 #endif
-#ifndef _MACHINE_TRAP_H_
 #include <machine/trap.h>      /* codes for SIGILL, SIGFPE */
-#endif
 
 /*
  * Information pushed on stack when a signal is delivered.

diff --git a/sys/cpu/i386/include/types.h b/sys/cpu/i386/include/types.h
index c3c9618..c8aa7f8 100644 (file)
--- a/sys/cpu/i386/include/types.h
+++ b/sys/cpu/i386/include/types.h
@@ -32,15 +32,12 @@
  *
  * @(#)types.h 8.3 (Berkeley) 1/5/94
  * $FreeBSD: src/sys/i386/include/types.h,v 1.19.2.1 2001/03/21 10:50:58 peter Exp $
- * $DragonFly: src/sys/cpu/i386/include/types.h,v 1.11 2006/11/07 06:43:23 dillon Exp $
  */
 
 #ifndef _CPU_TYPES_H_
 #define        _CPU_TYPES_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 typedef        unsigned long   vm_offset_t;    /* address space bounded offset */
 typedef        unsigned long   vm_size_t;      /* address space bounded size */

diff --git a/sys/cpu/i386/include/vframe.h b/sys/cpu/i386/include/vframe.h
index ab16462..13f9023 100644 (file)
--- a/sys/cpu/i386/include/vframe.h
+++ b/sys/cpu/i386/include/vframe.h
@@ -30,19 +30,13 @@
  * 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.
- * 
- * $DragonFly: src/sys/cpu/i386/include/vframe.h,v 1.2 2007/01/09 23:34:01 dillon Exp $
  */
 
 #ifndef _CPU_VFRAME_H_
 #define _CPU_VFRAME_H_
 
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 /*
  * Virtualized external frame.  This is used by the virtual kernel in

diff --git a/sys/cpu/x86_64/include/lwbuf.h b/sys/cpu/x86_64/include/lwbuf.h
index eb6203e..6bfd664 100644 (file)
--- a/sys/cpu/x86_64/include/lwbuf.h
+++ b/sys/cpu/x86_64/include/lwbuf.h
@@ -48,9 +48,7 @@
 #ifndef _VM_VM_PAGE_H_
 #include <vm/vm_page.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 #ifndef _MACHINE_VMPARAM_H_
 #include <machine/vmparam.h>
 #endif

diff --git a/sys/cpu/x86_64/include/types.h b/sys/cpu/x86_64/include/types.h
index 337ff6d..7b4c899 100644 (file)
--- a/sys/cpu/x86_64/include/types.h
+++ b/sys/cpu/x86_64/include/types.h
@@ -38,9 +38,7 @@
 #ifndef _CPU_TYPES_H_
 #define        _CPU_TYPES_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 #if defined(__x86_64__)
 typedef        __int64_t       __segsz_t;      /* segment size */

diff --git a/sys/cpu/x86_64/include/vframe.h b/sys/cpu/x86_64/include/vframe.h
index d84e684..75c491f 100644 (file)
--- a/sys/cpu/x86_64/include/vframe.h
+++ b/sys/cpu/x86_64/include/vframe.h
@@ -35,12 +35,8 @@
 #ifndef _CPU_VFRAME_H_
 #define _CPU_VFRAME_H_
 
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 /*
  * Virtualized external frame.  This is used by the virtual kernel in

diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index d142a57..f13a03f 100644 (file)
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/ddb/ddb.h,v 1.24.2.2 2002/08/30 22:27:49 gibbs Exp $
- * $DragonFly: src/sys/ddb/ddb.h,v 1.12 2007/05/07 05:21:38 dillon Exp $
  */
 
 /*
@@ -42,9 +41,7 @@
 #include <sys/queue.h>
 #endif
 
-#ifndef _MACHINE_DB_MACHDEP_H_
 #include <machine/db_machdep.h>                /* type definitions */
-#endif
 
 #ifndef _MACHINE_GLOBALDATA_H_
 #include <machine/globaldata.h>

diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index e9ded24..4c1564c 100644 (file)
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,5 +1,4 @@
 /*     $FreeBSD: src/sys/netinet/icmp6.h,v 1.2.2.5 2002/06/29 18:31:11 ume Exp $       */
-/*     $DragonFly: src/sys/netinet/icmp6.h,v 1.8 2008/09/04 09:08:22 hasso Exp $       */
 /*     $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $  */
 
 /*
@@ -75,9 +74,7 @@
 #ifndef _NETINET6_IN6_H_
 #include <netinet/in.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 #define ICMPV6_PLD_MAXLEN      1232    /* IPV6_MMTU - sizeof(struct ip6_hdr)
                                           - sizeof(struct icmp6_hdr) */

diff --git a/sys/netinet/ip.h b/sys/netinet/ip.h
index e6d5574..8f364bf 100644 (file)
--- a/sys/netinet/ip.h
+++ b/sys/netinet/ip.h
@@ -32,7 +32,6 @@
  *
  *     @(#)ip.h        8.2 (Berkeley) 6/1/94
  * $FreeBSD: src/sys/netinet/ip.h,v 1.17 1999/12/22 19:13:20 shin Exp $
- * $DragonFly: src/sys/netinet/ip.h,v 1.5 2006/05/20 02:42:12 dillon Exp $
  */
 
 #ifndef _NETINET_IP_H_
@@ -47,9 +46,7 @@
 #ifndef _NETINET_IN_SYSTM_H_
 #include <netinet/in_systm.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 /*
  * Definitions for internet protocol version 4.

diff --git a/sys/netinet/ip6.h b/sys/netinet/ip6.h
index 5945737..d22cd81 100644 (file)
--- a/sys/netinet/ip6.h
+++ b/sys/netinet/ip6.h
@@ -1,5 +1,4 @@
 /*     $FreeBSD: src/sys/netinet/ip6.h,v 1.2.2.2 2001/07/03 11:01:46 ume Exp $ */
-/*     $DragonFly: src/sys/netinet/ip6.h,v 1.8 2008/09/04 09:08:22 hasso Exp $ */
 /*     $KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $    */
 
 /*
@@ -75,9 +74,7 @@
 #ifndef _NETINET_IN_H_
 #include <netinet/in.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 
 /*

diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 6a1640a..b5a0e14 100644 (file)
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -32,7 +32,6 @@
  *
  *     @(#)ip_var.h    8.2 (Berkeley) 1/9/95
  * $FreeBSD: src/sys/netinet/ip_var.h,v 1.50.2.13 2003/08/24 08:24:38 hsu Exp $
- * $DragonFly: src/sys/netinet/ip_var.h,v 1.27 2008/09/13 08:48:42 sephe Exp $
  */
 
 #ifndef _NETINET_IP_VAR_H_
@@ -50,9 +49,7 @@
 
 #ifdef _KERNEL
 
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 #ifndef _MACHINE_PARAM_H_
 #include <machine/param.h>
 #endif

diff --git a/sys/netinet/pim.h b/sys/netinet/pim.h
index c905444..7051d1d 100644 (file)
--- a/sys/netinet/pim.h
+++ b/sys/netinet/pim.h
@@ -28,7 +28,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/netinet/pim.h,v 1.1.2.1 2003/08/24 17:04:44 hsu Exp $
- * $DragonFly: src/sys/netinet/pim.h,v 1.4 2006/05/20 02:42:12 dillon Exp $
  */
 
 #ifndef _NETINET_PIM_H_
@@ -46,9 +45,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 
 /*

diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 067addd..980b863 100644 (file)
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -32,7 +32,6 @@
  *
  *     @(#)tcp.h       8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netinet/tcp.h,v 1.13.2.3 2001/03/01 22:08:42 jlemon Exp $
- * $DragonFly: src/sys/netinet/tcp.h,v 1.7 2006/05/20 02:42:12 dillon Exp $
  */
 
 #ifndef _NETINET_TCP_H_
@@ -41,9 +40,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 typedef        u_int32_t tcp_seq;
 typedef int32_t          tcp_seq_diff_t;

diff --git a/sys/netinet6/pim6.h b/sys/netinet6/pim6.h
index 82ab217..f1b1df3 100644 (file)
--- a/sys/netinet6/pim6.h
+++ b/sys/netinet6/pim6.h
@@ -1,5 +1,4 @@
 /*     $FreeBSD: src/sys/netinet6/pim6.h,v 1.1.2.1 2000/07/15 07:14:36 kris Exp $      */
-/*     $DragonFly: src/sys/netinet6/pim6.h,v 1.4 2006/05/20 02:42:12 dillon Exp $      */
 /*     $KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $  */
 
 /*
@@ -37,9 +36,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 /*
  * Protocol Independent Multicast (PIM) definitions

diff --git a/sys/platform/pc32/include/globaldata.h b/sys/platform/pc32/include/globaldata.h
index b8d2bd7..0d8f354 100644 (file)
--- a/sys/platform/pc32/include/globaldata.h
+++ b/sys/platform/pc32/include/globaldata.h
@@ -28,7 +28,6 @@
  *     should not include this file.
  *
  * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $
- * $DragonFly: src/sys/platform/pc32/include/globaldata.h,v 1.29 2006/10/23 21:50:31 dillon Exp $
  */
 
 #ifndef _MACHINE_GLOBALDATA_H_
@@ -42,15 +41,9 @@
 #ifndef _SYS_THREAD_H_
 #include <sys/thread.h>                /* struct thread */
 #endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>  /* struct segment_descriptor */
-#endif
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>       /* struct i386tss */
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 /*
  * Note on interrupt control.  Pending interrupts not yet dispatched are

diff --git a/sys/platform/pc32/include/pcb_ext.h b/sys/platform/pc32/include/pcb_ext.h
index ad64d4e..ea8a3c2 100644 (file)
--- a/sys/platform/pc32/include/pcb_ext.h
+++ b/sys/platform/pc32/include/pcb_ext.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $
- * $DragonFly: src/sys/platform/pc32/include/pcb_ext.h,v 1.9 2007/01/08 03:33:42 dillon Exp $
  */
 
 #ifndef _MACHINE_PCB_EXT_H_
@@ -37,15 +36,9 @@
 /*
  * Extension to the 386 process control block
  */
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>
-#endif
-#ifndef _MACHINE_VM86_H_
 #include <machine/vm86.h>
-#endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 struct pcb_ext {
        struct  segment_descriptor ext_tssd;    /* tss descriptor */

diff --git a/sys/platform/pc32/include/thread.h b/sys/platform/pc32/include/thread.h
index 3cce5cd..f2b429c 100644 (file)
--- a/sys/platform/pc32/include/thread.h
+++ b/sys/platform/pc32/include/thread.h
@@ -32,16 +32,12 @@
  * SUCH DAMAGE.
  * 
  *     Machine independant code should not directly include this file.
- *
- * $DragonFly: src/sys/platform/pc32/include/thread.h,v 1.17 2007/01/08 03:33:42 dillon Exp $
  */
 
 #ifndef        _MACHINE_THREAD_H_
 #define        _MACHINE_THREAD_H_
 
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 union savefpu;
 

diff --git a/sys/platform/pc32/include/types.h b/sys/platform/pc32/include/types.h
index 469400c..b6f34f5 100644 (file)
--- a/sys/platform/pc32/include/types.h
+++ b/sys/platform/pc32/include/types.h
@@ -32,16 +32,12 @@
  *
  *     @(#)types.h     8.3 (Berkeley) 1/5/94
  * $FreeBSD: src/sys/i386/include/types.h,v 1.19.2.1 2001/03/21 10:50:58 peter Exp $
- * $DragonFly: src/sys/platform/pc32/include/types.h,v 1.1 2006/11/07 06:43:24 dillon Exp $
  */
 
 #ifndef _MACHINE_TYPES_H_
 #define        _MACHINE_TYPES_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
-
 #include <cpu/types.h>
 
 /* Interrupt mask (spl, xxx_imask, etc) */

diff --git a/sys/platform/pc64/include/globaldata.h b/sys/platform/pc64/include/globaldata.h
index 1c982a5..0c40928 100644 (file)
--- a/sys/platform/pc64/include/globaldata.h
+++ b/sys/platform/pc64/include/globaldata.h
@@ -29,7 +29,6 @@
  *     should not include this file.
  *
  * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $
- * $DragonFly: src/sys/platform/pc64/include/globaldata.h,v 1.2 2008/08/29 17:07:17 dillon Exp $
  */
 
 #ifndef _MACHINE_GLOBALDATA_H_
@@ -43,15 +42,9 @@
 #ifndef _SYS_THREAD_H_
 #include <sys/thread.h>                /* struct thread */
 #endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>  /* struct user_segment_descriptor */
-#endif
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>       /* struct x86_64tss */
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 /*
  * Note on interrupt control.  Pending interrupts not yet dispatched are

diff --git a/sys/platform/pc64/include/pcb_ext.h b/sys/platform/pc64/include/pcb_ext.h
index 79467fb..7062118 100644 (file)
--- a/sys/platform/pc64/include/pcb_ext.h
+++ b/sys/platform/pc64/include/pcb_ext.h
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $
- * $DragonFly: src/sys/platform/pc64/include/pcb_ext.h,v 1.3 2008/08/29 17:07:17 dillon Exp $
  */
 
 #ifndef _MACHINE_PCB_EXT_H_
@@ -38,12 +37,8 @@
 /*
  * Extension to the 386 process control block
  */
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>
-#endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 struct pcb_ext {
        struct  user_segment_descriptor ext_tssd;       /* tss descriptor */

diff --git a/sys/platform/pc64/include/thread.h b/sys/platform/pc64/include/thread.h
index cae5971..8968dc4 100644 (file)
--- a/sys/platform/pc64/include/thread.h
+++ b/sys/platform/pc64/include/thread.h
@@ -25,16 +25,12 @@
  * SUCH DAMAGE.
  *
  *     Machine independant code should not directly include this file.
- *
- * $DragonFly: src/sys/platform/pc64/include/thread.h,v 1.3 2008/08/29 17:07:17 dillon Exp $
  */
 
 #ifndef        _MACHINE_THREAD_H_
 #define        _MACHINE_THREAD_H_
 
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 struct md_thread {
     unsigned int       mtd_cpl;

diff --git a/sys/platform/pc64/include/types.h b/sys/platform/pc64/include/types.h
index 20f5d3e..b6f34f5 100644 (file)
--- a/sys/platform/pc64/include/types.h
+++ b/sys/platform/pc64/include/types.h
@@ -32,16 +32,12 @@
  *
  *     @(#)types.h     8.3 (Berkeley) 1/5/94
  * $FreeBSD: src/sys/i386/include/types.h,v 1.19.2.1 2001/03/21 10:50:58 peter Exp $
- * $DragonFly: src/sys/platform/pc64/include/types.h,v 1.2 2007/09/23 04:29:31 yanyh Exp $
  */
 
 #ifndef _MACHINE_TYPES_H_
 #define        _MACHINE_TYPES_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
-
 #include <cpu/types.h>
 
 /* Interrupt mask (spl, xxx_imask, etc) */

diff --git a/sys/platform/vkernel/include/globaldata.h b/sys/platform/vkernel/include/globaldata.h
index 0a0b2a5..9cd8289 100644 (file)
--- a/sys/platform/vkernel/include/globaldata.h
+++ b/sys/platform/vkernel/include/globaldata.h
@@ -28,7 +28,6 @@
  *     should not include this file.
  *
  * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $
- * $DragonFly: src/sys/platform/vkernel/include/globaldata.h,v 1.8 2008/04/28 07:05:07 dillon Exp $
  */
 
 #ifndef _MACHINE_GLOBALDATA_H_
@@ -45,15 +44,9 @@
 #ifndef _SYS_VKERNEL_H_
 #include <sys/vkernel.h>       /* vpte_t */
 #endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>  /* struct segment_descriptor */
-#endif
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>       /* struct i386tss */
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 /*
  * Note on interrupt control.  Pending interrupts not yet dispatched are

diff --git a/sys/platform/vkernel/include/pcb_ext.h b/sys/platform/vkernel/include/pcb_ext.h
index 21cb924..ea8a3c2 100644 (file)
--- a/sys/platform/vkernel/include/pcb_ext.h
+++ b/sys/platform/vkernel/include/pcb_ext.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $
- * $DragonFly: src/sys/platform/vkernel/include/pcb_ext.h,v 1.2 2007/01/08 03:33:43 dillon Exp $
  */
 
 #ifndef _MACHINE_PCB_EXT_H_
@@ -37,15 +36,9 @@
 /*
  * Extension to the 386 process control block
  */
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>
-#endif
-#ifndef _MACHINE_VM86_H_
 #include <machine/vm86.h>
-#endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 struct pcb_ext {
        struct  segment_descriptor ext_tssd;    /* tss descriptor */

diff --git a/sys/platform/vkernel/include/thread.h b/sys/platform/vkernel/include/thread.h
index 58fc114..1c4637b 100644 (file)
--- a/sys/platform/vkernel/include/thread.h
+++ b/sys/platform/vkernel/include/thread.h
@@ -30,19 +30,13 @@
  * 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.
- * 
- * $DragonFly: src/sys/platform/vkernel/include/thread.h,v 1.2 2007/01/08 03:33:43 dillon Exp $
  */
 
 #ifndef        _MACHINE_THREAD_H_
 #define        _MACHINE_THREAD_H_
 
-#ifndef _MACHINE_VFRAME_H_
 #include <machine/vframe.h>
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 struct md_thread {
     unsigned int       mtd_unused;     /* used to be mtd_cpl */

diff --git a/sys/platform/vkernel64/include/globaldata.h b/sys/platform/vkernel64/include/globaldata.h
index a4643d6..ef68050 100644 (file)
--- a/sys/platform/vkernel64/include/globaldata.h
+++ b/sys/platform/vkernel64/include/globaldata.h
@@ -28,7 +28,6 @@
  *     should not include this file.
  *
  * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $
- * $DragonFly: src/sys/platform/vkernel/include/globaldata.h,v 1.8 2008/04/28 07:05:07 dillon Exp $
  */
 
 #ifndef _MACHINE_GLOBALDATA_H_
@@ -45,15 +44,9 @@
 #ifndef _SYS_VKERNEL_H_
 #include <sys/vkernel.h>       /* vpte_t */
 #endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>  /* struct segment_descriptor */
-#endif
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>       /* struct i386tss */
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 /*
  * Note on interrupt control.  Pending interrupts not yet dispatched are

diff --git a/sys/platform/vkernel64/include/pcb_ext.h b/sys/platform/vkernel64/include/pcb_ext.h
index aed3773..7062118 100644 (file)
--- a/sys/platform/vkernel64/include/pcb_ext.h
+++ b/sys/platform/vkernel64/include/pcb_ext.h
@@ -37,12 +37,8 @@
 /*
  * Extension to the 386 process control block
  */
-#ifndef _MACHINE_TSS_H_
 #include <machine/tss.h>
-#endif
-#ifndef _MACHINE_SEGMENTS_H_
 #include <machine/segments.h>
-#endif
 
 struct pcb_ext {
        struct  user_segment_descriptor ext_tssd;       /* tss descriptor */

diff --git a/sys/platform/vkernel64/include/thread.h b/sys/platform/vkernel64/include/thread.h
index 90ed090..8d4ce06 100644 (file)
--- a/sys/platform/vkernel64/include/thread.h
+++ b/sys/platform/vkernel64/include/thread.h
@@ -30,19 +30,13 @@
  * 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.
- *
- * $DragonFly: src/sys/platform/vkernel/include/thread.h,v 1.2 2007/01/08 03:33:43 dillon Exp $
  */
 
 #ifndef        _MACHINE_THREAD_H_
 #define        _MACHINE_THREAD_H_
 
-#ifndef _MACHINE_VFRAME_H_
 #include <machine/vframe.h>
-#endif
-#ifndef _MACHINE_NPX_H_
 #include <machine/npx.h>
-#endif
 
 struct md_thread {
     unsigned int       mtd_unused;     /* used to be mtd_cpl */

diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index 1226a1c..b63dbf0 100644 (file)
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -67,7 +67,6 @@
 /*
  * $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $
  * $FreeBSD: src/sys/i386/include/bus_dma.h,v 1.15.2.2 2002/11/21 23:36:01 sam Exp $
- * $DragonFly: src/sys/sys/bus_dma.h,v 1.1 2006/10/25 20:56:03 dillon Exp $
  */
 
 #ifndef _SYS_BUS_DMA_H_
@@ -76,9 +75,7 @@
 /*
  * Include machine-specific bus stuff
  */
-#ifndef _MACHINE_BUS_DMA_H_
 #include <machine/bus_dma.h>   /* bus_addr_t */
-#endif
 
 /*
  * Flags used in various bus DMA methods.

diff --git a/sys/sys/elf_generic.h b/sys/sys/elf_generic.h
index 63dbcd6..a0ae43e 100644 (file)
--- a/sys/sys/elf_generic.h
+++ b/sys/sys/elf_generic.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/elf_generic.h,v 1.4 1999/08/28 00:51:42 peter Exp $
- * $DragonFly: src/sys/sys/elf_generic.h,v 1.6 2006/10/23 21:50:33 dillon Exp $
  */
 
 #ifndef _SYS_ELF_GENERIC_H_
@@ -33,9 +32,7 @@
 #ifndef _SYS_CDEFS_H_
 #include <sys/cdefs.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 /*
  * Definitions of generic ELF names which relieve applications from

diff --git a/sys/sys/endian.h b/sys/sys/endian.h
index 9d00b74..361bc3f 100644 (file)
--- a/sys/sys/endian.h
+++ b/sys/sys/endian.h
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/endian.h,v 1.2.2.1 2002/09/09 05:45:04 imp Exp $
- * $DragonFly: src/sys/sys/endian.h,v 1.5 2006/05/20 02:42:13 dillon Exp $
  */
 
 #ifndef _SYS_ENDIAN_H_
@@ -35,9 +34,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 /*
  * General byte order swapping functions.

diff --git a/sys/sys/gmon.h b/sys/sys/gmon.h
index 69e7553..f2827f5 100644 (file)
--- a/sys/sys/gmon.h
+++ b/sys/sys/gmon.h
@@ -32,15 +32,12 @@
  *
  *     @(#)gmon.h      8.2 (Berkeley) 1/4/94
  * $FreeBSD: src/sys/sys/gmon.h,v 1.15 1999/08/28 00:51:45 peter Exp $
- * $DragonFly: src/sys/sys/gmon.h,v 1.3 2006/05/21 03:43:47 dillon Exp $
  */
 
 #ifndef _SYS_GMON_H_
 #define _SYS_GMON_H_
 
-#ifndef _MACHINE_PROFILE_H_
 #include <machine/profile.h>
-#endif
 
 /*
  * Structure prepended to gmon.out profiling data file.

diff --git a/sys/sys/ieee754.h b/sys/sys/ieee754.h
index 2443bb8..81c20a9 100644 (file)
--- a/sys/sys/ieee754.h
+++ b/sys/sys/ieee754.h
@@ -1,5 +1,4 @@
 /*     $NetBSD: ieee754.h,v 1.3 2003/10/27 01:11:47 kleink Exp $       */
-/* $DragonFly: src/sys/sys/ieee754.h,v 1.3 2006/05/20 02:42:13 dillon Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,9 +48,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 
 /*

diff --git a/sys/sys/in_cksum.h b/sys/sys/in_cksum.h
index 88c79b1..1248a2f 100644 (file)
--- a/sys/sys/in_cksum.h
+++ b/sys/sys/in_cksum.h
@@ -37,7 +37,6 @@
  *     from:           @(#)in_cksum.c  1.3 (Berkeley) 1/19/91
  *     from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
  * $FreeBSD: src/sys/i386/include/in_cksum.h,v 1.7.2.2 2002/07/02 04:03:04 jdp Exp $
- * $DragonFly: src/sys/sys/in_cksum.h,v 1.4 2006/05/20 02:42:13 dillon Exp $
  */
 
 #ifndef _SYS_IN_CKSUM_H_
@@ -46,9 +45,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 #ifdef _KERNEL
 

diff --git a/sys/sys/linker.h b/sys/sys/linker.h
index 04ff770..3871278 100644 (file)
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/linker.h,v 1.17.2.1 2002/03/11 01:13:53 dd Exp $
- * $DragonFly: src/sys/sys/linker.h,v 1.11 2008/02/06 22:37:46 nth Exp $
  */
 
 #ifndef _SYS_LINKER_H_
@@ -42,9 +41,7 @@
 #ifndef _SYS_QUEUE_H_
 #include <sys/queue.h>
 #endif
-#ifndef _MACHINE_ELF_H_
 #include <machine/elf.h>
-#endif
 
 #include <sys/module.h>
 

diff --git a/sys/sys/mchain.h b/sys/sys/mchain.h
index f880aac..8113e64 100644 (file)
--- a/sys/sys/mchain.h
+++ b/sys/sys/mchain.h
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/mchain.h,v 1.1.2.1 2001/05/18 11:01:23 bp Exp $
- * $DragonFly: src/sys/sys/mchain.h,v 1.4 2006/05/20 02:42:13 dillon Exp $
  */
 #ifndef _SYS_MCHAIN_H_
 #define _SYS_MCHAIN_H_
@@ -38,9 +37,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 /*
  * This macros probably belongs to the endian.h

diff --git a/sys/sys/mplock2.h b/sys/sys/mplock2.h
index f261020..7a1a7ad 100644 (file)
--- a/sys/sys/mplock2.h
+++ b/sys/sys/mplock2.h
@@ -6,9 +6,7 @@
 #ifndef _SYS_MPLOCK2_H_
 #define _SYS_MPLOCK2_H_
 
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 #ifndef _SYS_THREAD_H_
 #include <sys/thread.h>
 #endif

diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 6139993..db8fd45 100644 (file)
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -40,12 +40,8 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
-#ifndef _MACHINE_CPUFUNC_H_
 #include <machine/cpufunc.h>
-#endif
 
 /*
  * The general mutex structure provides recursive shared and exclusive

diff --git a/sys/sys/mutex2.h b/sys/sys/mutex2.h
index 9185d74..c0cbc54 100644 (file)
--- a/sys/sys/mutex2.h
+++ b/sys/sys/mutex2.h
@@ -44,9 +44,7 @@
 #ifndef _SYS_GLOBALDATA_H_
 #include <sys/globaldata.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 
 /*
  * Initialize a new mutex, placing it in an unlocked state with no refs.

diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index b2b4d44..403d017 100644 (file)
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *      $FreeBSD: src/sys/sys/sbuf.h,v 1.7.2.2 2002/03/12 01:00:28 archie Exp $
- *      $DragonFly: src/sys/sys/sbuf.h,v 1.4 2006/05/20 02:42:13 dillon Exp $
  */
 
 #ifndef _SYS_SBUF_H_
@@ -35,12 +34,8 @@
 #ifndef _SYS_CDEFS_H_
 #include <sys/cdefs.h>
 #endif
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
-#ifndef _MACHINE_STDARG_H_
 #include <machine/stdarg.h>
-#endif
 
 /*
  * Structure definition

diff --git a/sys/sys/serialize.h b/sys/sys/serialize.h
index e338310..4b06d7a 100644 (file)
--- a/sys/sys/serialize.h
+++ b/sys/sys/serialize.h
@@ -7,16 +7,12 @@
  * This API is designed to be used whenever low level serialization is
  * required.  Unlike tokens this serialization is not safe from deadlocks
  * nor is it recursive, and care must be taken when using it. 
- *
- * $DragonFly: src/sys/sys/serialize.h,v 1.9 2008/05/14 11:59:24 sephe Exp $
  */
 
 #ifndef _SYS_SERIALIZE_H_
 #define _SYS_SERIALIZE_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 struct thread;
 

diff --git a/sys/sys/signal.h b/sys/sys/signal.h
index 1d07bb0..6073604 100644 (file)
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -37,15 +37,12 @@
  *
  *     @(#)signal.h    8.4 (Berkeley) 5/4/95
  * $FreeBSD: src/sys/sys/signal.h,v 1.23.2.2 2001/04/19 01:38:35 alfred Exp $
- * $DragonFly: src/sys/sys/signal.h,v 1.6 2007/01/14 07:59:08 dillon Exp $
  */
 
 #ifndef        _SYS_SIGNAL_H_
 #define        _SYS_SIGNAL_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>    /* for __ types */
-#endif
 #include <sys/cdefs.h>
 #include <sys/_posix.h>
 

diff --git a/sys/sys/socket.h b/sys/sys/socket.h
index a346a63..65a0745 100644 (file)
--- a/sys/sys/socket.h
+++ b/sys/sys/socket.h
@@ -42,9 +42,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 #define _NO_NAMESPACE_POLLUTION
 #include <machine/param.h>

diff --git a/sys/sys/socketvar2.h b/sys/sys/socketvar2.h
index a944192..0185d53 100644 (file)
--- a/sys/sys/socketvar2.h
+++ b/sys/sys/socketvar2.h
@@ -32,7 +32,6 @@
  *
  * @(#)socketvar.h     8.3 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/socketvar.h,v 1.46.2.10 2003/08/24 08:24:39 hsu Exp $
- * $DragonFly: src/sys/sys/socketvar2.h,v 1.1 2007/11/07 18:24:04 dillon Exp $
  */
 
 #ifndef _SYS_SOCKETVAR2_H_
@@ -47,9 +46,7 @@
 #ifndef _SYS_MALLOC_H_
 #include <sys/malloc.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 
 /*
  * Acquire a lock on a signalsockbuf, sleep if the lock is already held.

diff --git a/sys/sys/spinlock2.h b/sys/sys/spinlock2.h
index 35cecd2..1f1c196 100644 (file)
--- a/sys/sys/spinlock2.h
+++ b/sys/sys/spinlock2.h
@@ -28,8 +28,6 @@
  * 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.
- *
- * $DragonFly: src/sys/sys/spinlock2.h,v 1.12 2008/06/04 04:34:54 nth Exp $
  */
 
 #ifndef _SYS_SPINLOCK2_H_
@@ -50,12 +48,8 @@
 #ifndef _SYS_GLOBALDATA_H_
 #include <sys/globaldata.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
-#ifndef _MACHINE_CPUFUNC_H_
 #include <machine/cpufunc.h>
-#endif
 
 #ifdef SMP
 

diff --git a/sys/sys/syslink_msg.h b/sys/sys/syslink_msg.h
index aff2bfa..1e83631 100644 (file)
--- a/sys/sys/syslink_msg.h
+++ b/sys/sys/syslink_msg.h
@@ -30,8 +30,6 @@
  * 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.
- *
- * $DragonFly: src/sys/sys/syslink_msg.h,v 1.11 2007/08/13 17:47:20 dillon Exp $
  */
 /*
  * The syslink infrastructure implements an optimized RPC mechanism across a 
@@ -48,9 +46,7 @@
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 
 typedef int32_t                sl_auxdata_t;   /* auxillary data element */
 typedef u_int32_t      sl_rlabel_t;    /* reply label routing id */

diff --git a/sys/sys/sysref2.h b/sys/sys/sysref2.h
index 1e765cf..ef9dedc 100644 (file)
--- a/sys/sys/sysref2.h
+++ b/sys/sys/sysref2.h
@@ -30,8 +30,6 @@
  * 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.
- * 
- * $DragonFly: src/sys/sys/sysref2.h,v 1.2 2007/05/06 19:23:33 dillon Exp $
  */
 /*
  * System resource registration, reference counter, and allocation
@@ -50,9 +48,7 @@
 #ifndef _SYS_SYSREF_H_
 #include <sys/sysref.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 
 void _sysref_put(struct sysref *);
 

diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index a2e77a6..fd60dd3 100644 (file)
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -37,7 +37,6 @@
  *
  *     @(#)systm.h     8.7 (Berkeley) 3/29/95
  * $FreeBSD: src/sys/sys/systm.h,v 1.111.2.18 2002/12/17 18:04:02 sam Exp $
- * $DragonFly: src/sys/sys/systm.h,v 1.81 2008/09/11 00:35:49 dillon Exp $
  */
 
 #ifndef _SYS_SYSTM_H_
@@ -50,9 +49,7 @@
 #ifndef _MACHINE_TYPES_H_
 #include <machine/types.h>
 #endif
-#ifndef _MACHINE_STDARG_H_
 #include <machine/stdarg.h>
-#endif
 #include <machine/atomic.h>
 #include <machine/cpufunc.h>
 #include <sys/callout.h>

diff --git a/sys/sys/thread.h b/sys/sys/thread.h
index 7672e63..06138af 100644 (file)
--- a/sys/sys/thread.h
+++ b/sys/sys/thread.h
@@ -6,8 +6,6 @@
  *
  * Types which must already be defined when this header is included by
  * userland:   struct md_thread
- * 
- * $DragonFly: src/sys/sys/thread.h,v 1.97 2008/09/20 04:31:02 sephe Exp $
  */
 
 #ifndef _SYS_THREAD_H_
@@ -37,9 +35,7 @@
 #ifndef _SYS_IOSCHED_H_
 #include <sys/iosched.h>
 #endif
-#ifndef _MACHINE_THREAD_H_
 #include <machine/thread.h>
-#endif
 
 struct globaldata;
 struct lwp;

diff --git a/sys/sys/thread2.h b/sys/sys/thread2.h
index d9f26ba..250c4a5 100644 (file)
--- a/sys/sys/thread2.h
+++ b/sys/sys/thread2.h
@@ -7,8 +7,6 @@
  * with the current cpu.  For example, a higher priority thread pending
  * on a different cpu will not be immediately scheduled by a yield() on
  * this cpu.
- *
- * $DragonFly: src/sys/sys/thread2.h,v 1.28 2006/12/23 00:27:03 swildner Exp $
  */
 
 #ifndef _SYS_THREAD2_H_
@@ -29,9 +27,7 @@
 #ifndef _SYS_GLOBALDATA_H_
 #include <sys/globaldata.h>
 #endif
-#ifndef _MACHINE_CPUFUNC_H_
 #include <machine/cpufunc.h>
-#endif
 
 /*
  * Is a token held by the specified thread?

diff --git a/sys/sys/times.h b/sys/sys/times.h
index 309a736..cc2d56e 100644 (file)
--- a/sys/sys/times.h
+++ b/sys/sys/times.h
@@ -37,15 +37,12 @@
  *
  *     @(#)times.h     8.4 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/sys/times.h,v 1.6 1999/12/29 04:24:48 peter Exp $
- * $DragonFly: src/sys/sys/times.h,v 1.5 2003/11/15 19:28:42 asmodai Exp $
  */
 
 #ifndef        _SYS_TIMES_H_
 #define        _SYS_TIMES_H_
 
-#ifndef _MACHINE_STDINT_H_
 #include <machine/stdint.h>
-#endif
 
 #ifndef _CLOCK_T_DECLARED
 #define _CLOCK_T_DECLARED

diff --git a/sys/sys/types.h b/sys/sys/types.h
index 400d836..1847df6 100644 (file)
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -37,7 +37,6 @@
  *
  *     @(#)types.h     8.6 (Berkeley) 2/19/95
  * $FreeBSD: src/sys/sys/types.h,v 1.40.2.2 2001/04/21 14:53:06 ume Exp $
- * $DragonFly: src/sys/sys/types.h,v 1.24 2008/08/10 22:09:51 dillon Exp $
  */
 
 #ifndef _SYS_TYPES_H_
@@ -49,9 +48,7 @@
 #ifndef _STDINT_H_
 #include <stdint.h>
 #endif
-#ifndef _MACHINE_STDARG_H_
 #include <machine/stdarg.h>
-#endif
 #ifndef _MACHINE_ENDIANT_H_
 #include <machine/endian.h>
 #endif

diff --git a/sys/sys/ucontext.h b/sys/sys/ucontext.h
index 5d03cc2..cf7d160 100644 (file)
--- a/sys/sys/ucontext.h
+++ b/sys/sys/ucontext.h
@@ -26,7 +26,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/sys/ucontext.h,v 1.4 1999/10/11 20:33:17 luoqi Exp $
- * $DragonFly: src/sys/sys/ucontext.h,v 1.5 2007/01/16 09:58:02 swildner Exp $
  */
 
 #ifndef _SYS_UCONTEXT_H_
@@ -35,9 +34,7 @@
 #ifndef _SYS_SIGNAL_H_
 #include <sys/signal.h>
 #endif
-#ifndef _MACHINE_UCONTEXT_H_
 #include <machine/ucontext.h>
-#endif
 
 typedef struct __ucontext {
        /*

diff --git a/sys/sys/user.h b/sys/sys/user.h
index 25af87e..dcbfb01 100644 (file)
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -32,7 +32,6 @@
  *
  *     @(#)user.h      8.2 (Berkeley) 9/23/93
  * $FreeBSD: src/sys/sys/user.h,v 1.24.2.1 2001/10/11 08:20:18 peter Exp $
- * $DragonFly: src/sys/sys/user.h,v 1.18 2007/02/25 23:17:13 corecode Exp $
  */
 
 #ifndef _SYS_USER_H_
@@ -96,9 +95,7 @@
 #ifndef _MACHINE_PCB_H_
 #include <machine/pcb.h>
 #endif
-#ifndef _MACHINE_COREDUMP_H_
 #include <machine/coredump.h>
-#endif
 #include <sys/kinfo.h>
 
 #endif

diff --git a/sys/sys/vkernel.h b/sys/sys/vkernel.h
index e7ea8b8..d723bd8 100644 (file)
--- a/sys/sys/vkernel.h
+++ b/sys/sys/vkernel.h
@@ -30,8 +30,6 @@
  * 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.
- * 
- * $DragonFly: src/sys/sys/vkernel.h,v 1.10 2007/07/01 01:11:37 dillon Exp $
  */
 
 #ifndef _SYS_VKERNEL_H_
@@ -57,15 +55,9 @@
 #ifndef _SYS_THREAD_H_
 #include <sys/thread.h>
 #endif
-#ifndef _MACHINE_FRAME_H_
 #include <machine/frame.h>
-#endif
-#ifndef _MACHINE_VFRAME_H_
 #include <machine/vframe.h>
-#endif
-#ifndef _MACHINE_LIMITS_H_
 #include <machine/limits.h>
-#endif
 
 struct vmspace_rb_tree;
 struct vmspace_entry;

diff --git a/sys/sys/wait.h b/sys/sys/wait.h
index 885e4b8..32873b9 100644 (file)
--- a/sys/sys/wait.h
+++ b/sys/sys/wait.h
@@ -32,7 +32,6 @@
  *
  *     @(#)wait.h      8.2 (Berkeley) 7/10/94
  * $FreeBSD: src/sys/sys/wait.h,v 1.11 1999/12/29 04:24:50 peter Exp $
- * $DragonFly: src/sys/sys/wait.h,v 1.6 2007/08/30 20:41:00 pavalos Exp $
  */
 
 #ifndef _SYS_WAIT_H_
@@ -93,9 +92,7 @@
 #define        WAIT_ANY        (-1)    /* any process */
 #define        WAIT_MYPGRP     0       /* any process in my process group */
 
-#ifndef _MACHINE_ENDIAN_H_
 #include <machine/endian.h>
-#endif
 
 /*
  * Deprecated:

diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 0b20a66..3350479 100644 (file)
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -62,7 +62,6 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_object.h,v 1.63.2.3 2003/05/26 19:17:56 alc Exp $
- * $DragonFly: src/sys/vm/vm_object.h,v 1.14 2007/06/08 02:00:47 dillon Exp $
  */
 
 /*
@@ -87,9 +86,7 @@
 #ifndef _SYS_THREAD_H_
 #include <sys/thread.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 #ifndef _VM_VM_H_
 #include <vm/vm.h>
 #endif

diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index db8e48d..a6f7db1 100644 (file)
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -62,7 +62,6 @@
  * rights to redistribute these changes.
  *
  * $FreeBSD: src/sys/vm/vm_page.h,v 1.75.2.8 2002/03/06 01:07:09 dillon Exp $
- * $DragonFly: src/sys/vm/vm_page.h,v 1.28 2008/05/09 07:24:48 dillon Exp $
  */
 
 /*
@@ -88,9 +87,7 @@
 #ifndef _VM_PMAP_H_
 #include <vm/pmap.h>
 #endif
-#ifndef _MACHINE_ATOMIC_H_
 #include <machine/atomic.h>
-#endif
 
 #ifdef _KERNEL