Back out the previous change to the queue(3) interface.

It was not discussed and should probably not happen.

Requested by:		msmith and others

46 files changed, 131 insertions, 131 deletions

diff --git a/sys/dev/advansys/advlib.h b/sys/dev/advansys/advlib.h
index a8cd946..ba9703d 100644
--- a/sys/dev/advansys/advlib.h
+++ b/sys/dev/advansys/advlib.h
@@ -93,7 +93,7 @@ struct adv_ccb_info {
 	adv_ccb_state	state;
 	bus_dmamap_t	dmamap;
 	union ccb*	ccb;
-	SLIST_ENTRY(struct adv_ccb_info) links;
+	SLIST_ENTRY(adv_ccb_info) links;
 };
 
 #define ccb_cinfo_ptr spriv_ptr0
@@ -497,9 +497,9 @@ struct adv_softc {
 	bus_space_tag_t		 tag;
 	bus_space_handle_t	 bsh;
 	struct cam_sim		*sim;
-	LIST_HEAD(, struct ccb_hdr)	 pending_ccbs;
+	LIST_HEAD(, ccb_hdr)	 pending_ccbs;
 	struct adv_ccb_info	*ccb_infos;
-	SLIST_HEAD(, struct adv_ccb_info) free_ccb_infos;
+	SLIST_HEAD(, adv_ccb_info) free_ccb_infos;
 	bus_dma_tag_t		 parent_dmat;
 	bus_dma_tag_t		 buffer_dmat;
 	bus_dma_tag_t		 sense_dmat;
diff --git a/sys/dev/advansys/adwlib.h b/sys/dev/advansys/adwlib.h
index 7973dca..c470c10 100644
--- a/sys/dev/advansys/adwlib.h
+++ b/sys/dev/advansys/adwlib.h
@@ -324,7 +324,7 @@ struct sg_map_node {
 	bus_dmamap_t		 sg_dmamap;
 	bus_addr_t		 sg_physaddr;
 	struct adw_sg_block*	 sg_vaddr;
-	SLIST_ENTRY(struct sg_map_node) links;
+	SLIST_ENTRY(sg_map_node) links;
 };
 
 typedef enum {
@@ -425,7 +425,7 @@ struct acb {
 	struct		adw_sg_block* sg_blocks;
 	bus_addr_t	sg_busaddr;
 	struct		scsi_sense_data sense_data;
-	SLIST_ENTRY(struct acb) links;
+	SLIST_ENTRY(acb) links;
 };
 
 /*
@@ -612,15 +612,15 @@ struct adw_softc
 	struct adw_carrier	 *free_carriers;
 	struct adw_carrier	 *commandq;
 	struct adw_carrier	 *responseq;
-	LIST_HEAD(, struct ccb_hdr)	  pending_ccbs;
-	SLIST_HEAD(, struct acb)	  free_acb_list;
+	LIST_HEAD(, ccb_hdr)	  pending_ccbs;
+	SLIST_HEAD(, acb)	  free_acb_list;
 	bus_dma_tag_t		  parent_dmat;
 	bus_dma_tag_t		  carrier_dmat;	/* dmat for our acb carriers*/
 	bus_dmamap_t		  carrier_dmamap;
 	bus_dma_tag_t		  acb_dmat;	/* dmat for our ccb array */
 	bus_dmamap_t		  acb_dmamap;
 	bus_dma_tag_t		  sg_dmat;	/* dmat for our sg maps */
-	SLIST_HEAD(, struct sg_map_node) sg_maps;
+	SLIST_HEAD(, sg_map_node) sg_maps;
 	bus_addr_t		  acb_busbase;
 	bus_addr_t		  carrier_busbase;
 	adw_chip		  chip;
diff --git a/sys/dev/aha/ahareg.h b/sys/dev/aha/ahareg.h
index f634a85..339eace 100644
--- a/sys/dev/aha/ahareg.h
+++ b/sys/dev/aha/ahareg.h
@@ -319,7 +319,7 @@ typedef enum {
 
 struct aha_ccb {
 	struct	aha_hccb	 hccb;		/* hccb assumed to be at 0 */
-	SLIST_ENTRY(struct aha_ccb)	 links;
+	SLIST_ENTRY(aha_ccb)	 links;
 	u_int32_t		 flags;
 	union ccb		*ccb;
 	bus_dmamap_t		 dmamap;
@@ -331,7 +331,7 @@ struct sg_map_node {
 	bus_dmamap_t		 sg_dmamap;
 	bus_addr_t		 sg_physaddr;
 	aha_sg_t*		 sg_vaddr;
-	SLIST_ENTRY(struct sg_map_node) links;
+	SLIST_ENTRY(sg_map_node) links;
 };
 	
 struct aha_softc {
@@ -344,8 +344,8 @@ struct aha_softc {
 	aha_mbox_out_t		*last_outbox;
 	aha_mbox_in_t		*last_inbox;
 	struct	aha_ccb		*aha_ccb_array;
-	SLIST_HEAD(, struct aha_ccb)	 free_aha_ccbs;
-	LIST_HEAD(, struct ccb_hdr)	 pending_ccbs;
+	SLIST_HEAD(,aha_ccb)	 free_aha_ccbs;
+	LIST_HEAD(,ccb_hdr)	 pending_ccbs;
 	u_int			 active_ccbs;
 	u_int32_t		 aha_ccb_physbase;
 	aha_ccb_opcode_t	 ccb_sg_opcode;
@@ -367,7 +367,7 @@ struct aha_softc {
 	bus_dma_tag_t		 ccb_dmat;	/* dmat for our ccb array */
 	bus_dmamap_t		 ccb_dmamap;
 	bus_dma_tag_t		 sg_dmat;	/* dmat for our sg maps */
-	SLIST_HEAD(, struct sg_map_node) sg_maps;
+	SLIST_HEAD(, sg_map_node) sg_maps;
 	bus_addr_t		 mailbox_physbase;
 	u_int			 num_ccbs;	/* Number of CCBs malloc'd */
 	u_int			 max_ccbs;	/* Maximum allocatable CCBs */
diff --git a/sys/dev/ahb/ahbreg.h b/sys/dev/ahb/ahbreg.h
index 1312748..c72f068 100644
--- a/sys/dev/ahb/ahbreg.h
+++ b/sys/dev/ahb/ahbreg.h
@@ -251,7 +251,7 @@ struct ecb {
 	struct ecb_status	 status;
 	struct scsi_sense_data	 sense;	
 	ahb_sg_t		 sg_list[AHB_NSEG];
-	SLIST_ENTRY(struct ecb)	 links;
+	SLIST_ENTRY(ecb)	 links;
 	ecb_state		 state;
 	union ccb		*ccb;
 	bus_dmamap_t		 dmamap;
@@ -262,8 +262,8 @@ struct ahb_softc {
 	bus_space_handle_t	 bsh;
 	struct	cam_sim		*sim;
 	struct	cam_path	*path;
-	SLIST_HEAD(, struct ecb)	 free_ecbs;
-	LIST_HEAD(, struct ccb_hdr)	 pending_ccbs;
+	SLIST_HEAD(,ecb)	 free_ecbs;
+	LIST_HEAD(,ccb_hdr)	 pending_ccbs;
 	struct ecb		*ecb_array;
 	u_int32_t		 ecb_physbase;
 	bus_dma_tag_t		 buffer_dmat;	/* dmat for buffer I/O */
diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h
index ce43a6b..5d789b4 100644
--- a/sys/dev/aic/aicvar.h
+++ b/sys/dev/aic/aicvar.h
@@ -76,7 +76,7 @@ struct aic_softc {
 
 	struct cam_sim		*sim;
 	struct cam_path		*path;
-	TAILQ_HEAD(, struct ccb_hdr)	pending_ccbs, nexus_ccbs;
+	TAILQ_HEAD(,ccb_hdr)	pending_ccbs, nexus_ccbs;
 	struct aic_scb		*nexus;
 
 	u_int32_t		flags;
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index 5aed8ce..534f2e4 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -250,7 +250,7 @@ struct hardware_scb {
 
 struct scb {
 	struct	hardware_scb	*hscb;
-	SLIST_ENTRY(struct scb)	 links;	 /* for chaining */
+	SLIST_ENTRY(scb)	 links;	 /* for chaining */
 	union ccb		*ccb;	 /* the ccb for this cmd */
 	scb_flag		 flags;
 	bus_dmamap_t		 dmamap;
@@ -432,13 +432,13 @@ struct sg_map_node {
 	bus_dmamap_t		 sg_dmamap;
 	bus_addr_t		 sg_physaddr;
 	struct ahc_dma_seg*	 sg_vaddr;
-	SLIST_ENTRY(struct sg_map_node) links;
+	SLIST_ENTRY(sg_map_node) links;
 };
 	
 struct scb_data {
 	struct	hardware_scb	*hscbs;	    /* Array of hardware SCBs */
 	struct	scb *scbarray;		    /* Array of kernel SCBs */
-	SLIST_HEAD(, struct scb) free_scbs;	/*
+	SLIST_HEAD(, scb) free_scbs;	/*
 					 * Pool of SCBs ready to be assigned
 					 * commands to execute.
 					 */
@@ -454,7 +454,7 @@ struct scb_data {
 	bus_dmamap_t	 sense_dmamap;
 	bus_addr_t	 sense_busaddr;
 	bus_dma_tag_t	 sg_dmat;	/* dmat for our sg segments */
-	SLIST_HEAD(, struct sg_map_node) sg_maps;
+	SLIST_HEAD(, sg_map_node) sg_maps;
 	u_int8_t	numscbs;
 	u_int8_t	maxhscbs;	/* Number of SCBs on the card */
 	u_int8_t	init_level;	/*
@@ -472,7 +472,7 @@ struct ahc_softc {
 	/*
 	 * CCBs that have been send to the controller
 	 */
-	LIST_HEAD(, struct ccb_hdr)	 pending_ccbs;
+	LIST_HEAD(, ccb_hdr)	 pending_ccbs;
 
 	/*
 	 * Target mode related state kept on a per enabled lun basis.
diff --git a/sys/dev/aic7xxx/aicasm.c b/sys/dev/aic7xxx/aicasm.c
index a7f9c85..9af5c83 100644
--- a/sys/dev/aic7xxx/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm.c
@@ -42,14 +42,14 @@
 #include "sequencer.h"
 
 typedef struct patch {
-	STAILQ_ENTRY(struct patch) links;
+	STAILQ_ENTRY(patch) links;
 	int		patch_func;
 	u_int		begin;
 	u_int		skip_instr;
 	u_int		skip_patch;
 } patch_t;
 
-STAILQ_HEAD(patch_list, struct patch) patches;
+STAILQ_HEAD(patch_list, patch) patches;
 
 static void usage(void);
 static void back_patch(void);
@@ -70,7 +70,7 @@ FILE *regfile;
 char *listfilename;
 FILE *listfile;
 
-static STAILQ_HEAD(, struct instruction) seq_program;
+static STAILQ_HEAD(,instruction) seq_program;
 struct scope_list scope_stack;
 symlist_t patch_functions;
 
diff --git a/sys/dev/aic7xxx/aicasm.h b/sys/dev/aic7xxx/aicasm.h
index 2f729b3..7e6b468 100644
--- a/sys/dev/aic7xxx/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm.h
@@ -41,7 +41,7 @@
 typedef struct path_entry {
 	char	*directory;
 	int	quoted_includes_only;
-	SLIST_ENTRY(struct path_entry) links;
+	SLIST_ENTRY(path_entry) links;
 } *path_entry_t;
 
 typedef enum {  
@@ -50,7 +50,7 @@ typedef enum {
 	SOURCE_FILE
 } include_type;
 
-SLIST_HEAD(path_list, struct path_entry);
+SLIST_HEAD(path_list, path_entry);
 
 extern struct path_list search_path;
 extern struct scope_list scope_stack;
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.c b/sys/dev/aic7xxx/aicasm/aicasm.c
index a7f9c85..9af5c83 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.c
+++ b/sys/dev/aic7xxx/aicasm/aicasm.c
@@ -42,14 +42,14 @@
 #include "sequencer.h"
 
 typedef struct patch {
-	STAILQ_ENTRY(struct patch) links;
+	STAILQ_ENTRY(patch) links;
 	int		patch_func;
 	u_int		begin;
 	u_int		skip_instr;
 	u_int		skip_patch;
 } patch_t;
 
-STAILQ_HEAD(patch_list, struct patch) patches;
+STAILQ_HEAD(patch_list, patch) patches;
 
 static void usage(void);
 static void back_patch(void);
@@ -70,7 +70,7 @@ FILE *regfile;
 char *listfilename;
 FILE *listfile;
 
-static STAILQ_HEAD(, struct instruction) seq_program;
+static STAILQ_HEAD(,instruction) seq_program;
 struct scope_list scope_stack;
 symlist_t patch_functions;
 
diff --git a/sys/dev/aic7xxx/aicasm/aicasm.h b/sys/dev/aic7xxx/aicasm/aicasm.h
index 2f729b3..7e6b468 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm.h
@@ -41,7 +41,7 @@
 typedef struct path_entry {
 	char	*directory;
 	int	quoted_includes_only;
-	SLIST_ENTRY(struct path_entry) links;
+	SLIST_ENTRY(path_entry) links;
 } *path_entry_t;
 
 typedef enum {  
@@ -50,7 +50,7 @@ typedef enum {
 	SOURCE_FILE
 } include_type;
 
-SLIST_HEAD(path_list, struct path_entry);
+SLIST_HEAD(path_list, path_entry);
 
 extern struct path_list search_path;
 extern struct scope_list scope_stack;
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_scan.l b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
index 51a13f2..28689cb 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm/aicasm_scan.l
@@ -200,10 +200,10 @@ typedef struct include {
         YY_BUFFER_STATE  buffer;
         int              lineno;
         char            *filename;
-	SLIST_ENTRY(struct include) links;
+	SLIST_ENTRY(include) links;
 }include_t;
 
-SLIST_HEAD(, struct include) include_stack;
+SLIST_HEAD(, include) include_stack;
 
 void
 include_file(file_name, type)
diff --git a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
index d86b4f0..79809db 100644
--- a/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm/aicasm_symbol.h
@@ -58,7 +58,7 @@ struct reg_info {
 	int	 typecheck_masks;
 };
 
-typedef SLIST_HEAD(symlist, struct symbol_node) symlist_t;
+typedef SLIST_HEAD(symlist, symbol_node) symlist_t;
 
 struct mask_info {
 	symlist_t symrefs;
@@ -106,7 +106,7 @@ typedef struct symbol_ref {
 } symbol_ref_t;
 
 typedef struct symbol_node {
-	SLIST_ENTRY(struct symbol_node) links;
+	SLIST_ENTRY(symbol_node) links;
 	symbol_t *symbol;
 }symbol_node_t;
 
@@ -123,9 +123,9 @@ typedef struct patch_info {
 } patch_info_t;
 
 typedef struct scope {
-	SLIST_ENTRY(struct scope) scope_stack_links;
-	TAILQ_ENTRY(struct scope) scope_links;
-	TAILQ_HEAD(, struct scope) inner_scope;
+	SLIST_ENTRY(scope) scope_stack_links;
+	TAILQ_ENTRY(scope) scope_links;
+	TAILQ_HEAD(, scope) inner_scope;
 	scope_type type;
 	int inner_scope_patches;
 	int begin_addr;
@@ -134,8 +134,8 @@ typedef struct scope {
 	int func_num;
 } scope_t;
 
-SLIST_HEAD(scope_list, struct scope);
-TAILQ_HEAD(scope_tailq, struct scope);
+SLIST_HEAD(scope_list, scope);
+TAILQ_HEAD(scope_tailq, scope);
 
 void	symbol_delete __P((symbol_t *symbol));
 
diff --git a/sys/dev/aic7xxx/aicasm_scan.l b/sys/dev/aic7xxx/aicasm_scan.l
index 51a13f2..28689cb 100644
--- a/sys/dev/aic7xxx/aicasm_scan.l
+++ b/sys/dev/aic7xxx/aicasm_scan.l
@@ -200,10 +200,10 @@ typedef struct include {
         YY_BUFFER_STATE  buffer;
         int              lineno;
         char            *filename;
-	SLIST_ENTRY(struct include) links;
+	SLIST_ENTRY(include) links;
 }include_t;
 
-SLIST_HEAD(, struct include) include_stack;
+SLIST_HEAD(, include) include_stack;
 
 void
 include_file(file_name, type)
diff --git a/sys/dev/aic7xxx/aicasm_symbol.h b/sys/dev/aic7xxx/aicasm_symbol.h
index d86b4f0..79809db 100644
--- a/sys/dev/aic7xxx/aicasm_symbol.h
+++ b/sys/dev/aic7xxx/aicasm_symbol.h
@@ -58,7 +58,7 @@ struct reg_info {
 	int	 typecheck_masks;
 };
 
-typedef SLIST_HEAD(symlist, struct symbol_node) symlist_t;
+typedef SLIST_HEAD(symlist, symbol_node) symlist_t;
 
 struct mask_info {
 	symlist_t symrefs;
@@ -106,7 +106,7 @@ typedef struct symbol_ref {
 } symbol_ref_t;
 
 typedef struct symbol_node {
-	SLIST_ENTRY(struct symbol_node) links;
+	SLIST_ENTRY(symbol_node) links;
 	symbol_t *symbol;
 }symbol_node_t;
 
@@ -123,9 +123,9 @@ typedef struct patch_info {
 } patch_info_t;
 
 typedef struct scope {
-	SLIST_ENTRY(struct scope) scope_stack_links;
-	TAILQ_ENTRY(struct scope) scope_links;
-	TAILQ_HEAD(, struct scope) inner_scope;
+	SLIST_ENTRY(scope) scope_stack_links;
+	TAILQ_ENTRY(scope) scope_links;
+	TAILQ_HEAD(, scope) inner_scope;
 	scope_type type;
 	int inner_scope_patches;
 	int begin_addr;
@@ -134,8 +134,8 @@ typedef struct scope {
 	int func_num;
 } scope_t;
 
-SLIST_HEAD(scope_list, struct scope);
-TAILQ_HEAD(scope_tailq, struct scope);
+SLIST_HEAD(scope_list, scope);
+TAILQ_HEAD(scope_tailq, scope);
 
 void	symbol_delete __P((symbol_t *symbol));
 
diff --git a/sys/dev/aic7xxx/sequencer.h b/sys/dev/aic7xxx/sequencer.h
index a84951c..4f05491 100644
--- a/sys/dev/aic7xxx/sequencer.h
+++ b/sys/dev/aic7xxx/sequencer.h
@@ -69,7 +69,7 @@ struct instruction {
 	union	ins_formats format;
 	u_int	srcline;
 	struct symbol *patch_label;
-	STAILQ_ENTRY(struct instruction) links;
+	STAILQ_ENTRY(instruction) links;
 };
 
 #define	AIC_OP_OR	0x0
diff --git a/sys/dev/amd/amd.h b/sys/dev/amd/amd.h
index e36956e..85f4f80 100644
--- a/sys/dev/amd/amd.h
+++ b/sys/dev/amd/amd.h
@@ -154,7 +154,7 @@ typedef struct _EEprom {
  * SCSI Request Block
  */
 struct amd_srb {
-	TAILQ_ENTRY(struct amd_srb) links;
+	TAILQ_ENTRY(amd_srb) links;
 	u_int8_t	 CmdBlock[12];
 	union		 ccb *pccb;
 	bus_dmamap_t	 dmamap;
@@ -187,7 +187,7 @@ struct amd_srb {
 	u_int8_t	 ScsiCmdLen;
 };
 
-TAILQ_HEAD(srb_queue, struct amd_srb);
+TAILQ_HEAD(srb_queue, amd_srb);
 
 /*
  * Per-adapter, software configuration.
diff --git a/sys/dev/amr/amrvar.h b/sys/dev/amr/amrvar.h
index 6a136be..5edfb1f 100644
--- a/sys/dev/amr/amrvar.h
+++ b/sys/dev/amr/amrvar.h
@@ -69,7 +69,7 @@ struct amr_logdrive
  */
 struct amr_command
 {
-    TAILQ_ENTRY(struct amr_command)	ac_link;
+    TAILQ_ENTRY(amr_command)	ac_link;
 
     struct amr_softc		*ac_sc;
     u_int8_t			ac_slot;
@@ -140,9 +140,9 @@ struct amr_softc
     int				amr_waitbufs;
     struct amr_command		*amr_busycmd[AMR_MAXCMD];
     int				amr_busycmdcount;
-    TAILQ_HEAD(, struct amr_command)	amr_work;
+    TAILQ_HEAD(,amr_command)	amr_work;
     int				amr_workcount;
-    TAILQ_HEAD(, struct amr_command)	amr_freecmds;
+    TAILQ_HEAD(,amr_command)	amr_freecmds;
 
     int				amr_locks;		/* reentrancy avoidance */
 
diff --git a/sys/dev/ata/ata-all.h b/sys/dev/ata/ata-all.h
index 3947060..14a3d97 100644
--- a/sys/dev/ata/ata-all.h
+++ b/sys/dev/ata/ata-all.h
@@ -304,8 +304,8 @@ struct ata_softc {
 #define		ATA_ACTIVE_ATAPI	0x6
 #define		ATA_REINITING		0x7
 
-    TAILQ_HEAD(, struct ad_request)	ata_queue;	/* head of ATA queue */
-    TAILQ_HEAD(, struct atapi_request) atapi_queue;	/* head of ATAPI queue */
+    TAILQ_HEAD(, ad_request)	ata_queue;	/* head of ATA queue */
+    TAILQ_HEAD(, atapi_request) atapi_queue;	/* head of ATAPI queue */
     void			*running;	/* currently running request */
 };
 
diff --git a/sys/dev/ata/ata-disk.h b/sys/dev/ata/ata-disk.h
index b7c870a..4a184d9 100644
--- a/sys/dev/ata/ata-disk.h
+++ b/sys/dev/ata/ata-disk.h
@@ -67,7 +67,7 @@ struct ad_request {
     int8_t			*data;		/* pointer to data buf */
     struct bio			*bp;		/* associated bio ptr */
     u_int8_t			tag;		/* tag ID of this request */
-    TAILQ_ENTRY(struct ad_request)	chain;	/* list management */
+    TAILQ_ENTRY(ad_request)	chain;		/* list management */
 };
 
 void ad_attach(struct ata_softc *, int32_t);
diff --git a/sys/dev/ata/atapi-all.h b/sys/dev/ata/atapi-all.h
index 35512ca..6223f5d 100644
--- a/sys/dev/ata/atapi-all.h
+++ b/sys/dev/ata/atapi-all.h
@@ -174,7 +174,7 @@ struct atapi_request {
     int8_t			*data;		/* pointer to data buf */
     atapi_callback_t		*callback;	/* ptr to callback func */
     void 			*driver;	/* driver specific */
-    TAILQ_ENTRY(struct atapi_request)	chain;	/* list management */
+    TAILQ_ENTRY(atapi_request)	chain;		/* list management */
 };
 
 void atapi_attach(struct ata_softc *, int32_t);
diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h
index bc2da4c..e3c85cc 100644
--- a/sys/dev/awi/awivar.h
+++ b/sys/dev/awi/awivar.h
@@ -61,7 +61,7 @@ enum awi_status {
 
 struct awi_bss 
 {
-	TAILQ_ENTRY(struct awi_bss)	list;
+	TAILQ_ENTRY(awi_bss)	list;
 	u_int8_t	esrc[ETHER_ADDR_LEN];
 	u_int8_t	chanset;	/* channel set to use */
 	u_int8_t	pattern;	/* hop pattern to use */
@@ -116,7 +116,7 @@ struct awi_softc
 
 	int			sc_mgt_timer;
 
-	TAILQ_HEAD(, struct awi_bss)	sc_scan;
+	TAILQ_HEAD(, awi_bss)	sc_scan;
 	u_int8_t		sc_scan_cur;
 	u_int8_t		sc_scan_min;
 	u_int8_t		sc_scan_max;
diff --git a/sys/dev/buslogic/btreg.h b/sys/dev/buslogic/btreg.h
index 617340c..f6a1851 100644
--- a/sys/dev/buslogic/btreg.h
+++ b/sys/dev/buslogic/btreg.h
@@ -580,7 +580,7 @@ typedef enum {
 
 struct bt_ccb {
 	struct	bt_hccb		 hccb;
-	SLIST_ENTRY(struct bt_ccb)	 links;
+	SLIST_ENTRY(bt_ccb)	 links;
 	u_int32_t		 flags;
 	union ccb		*ccb;
 	bus_dmamap_t		 dmamap;
@@ -592,7 +592,7 @@ struct sg_map_node {
 	bus_dmamap_t		 sg_dmamap;
 	bus_addr_t		 sg_physaddr;
 	bt_sg_t*		 sg_vaddr;
-	SLIST_ENTRY(struct sg_map_node) links;
+	SLIST_ENTRY(sg_map_node) links;
 };
 	
 struct bt_softc {
@@ -610,8 +610,8 @@ struct bt_softc {
 	bt_mbox_out_t		*last_outbox;
 	bt_mbox_in_t		*last_inbox;
 	struct	bt_ccb		*bt_ccb_array;
-	SLIST_HEAD(, struct bt_ccb)	 free_bt_ccbs;
-	LIST_HEAD(, struct ccb_hdr)	 pending_ccbs;
+	SLIST_HEAD(,bt_ccb)	 free_bt_ccbs;
+	LIST_HEAD(,ccb_hdr)	 pending_ccbs;
 	u_int			 active_ccbs;
 	u_int32_t		 bt_ccb_physbase;
 	bt_mbox_in_t		*in_boxes;
@@ -633,7 +633,7 @@ struct bt_softc {
 	bus_dma_tag_t		 sg_dmat;	/* dmat for our sg segments */
 	bus_dma_tag_t		 sense_dmat;	/* dmat for our sense buffers */
 	bus_dmamap_t		 sense_dmamap;
-	SLIST_HEAD(, struct sg_map_node) sg_maps;
+	SLIST_HEAD(, sg_map_node) sg_maps;
 	bus_addr_t		 mailbox_physbase;
 	u_int			 num_ccbs;	/* Number of CCBs malloc'd */
 	u_int			 max_ccbs;	/* Maximum allocatable CCBs */
diff --git a/sys/dev/dpt/dpt.h b/sys/dev/dpt/dpt.h
index 777e775..6d6230e 100644
--- a/sys/dev/dpt/dpt.h
+++ b/sys/dev/dpt/dpt.h
@@ -894,7 +894,7 @@ typedef struct dpt_ccb {
 	u_int32_t	 transaction_id;
 	u_int32_t	 result;
 	caddr_t		 data;
-	SLIST_ENTRY(struct dpt_ccb) links;
+	SLIST_ENTRY(dpt_ccb) links;
 
 #ifdef DPT_MEASURE_PERFORMANCE
 	u_int32_t	 submitted_time;
@@ -1016,7 +1016,7 @@ struct sg_map_node {
 	bus_dmamap_t		 sg_dmamap;
 	bus_addr_t		 sg_physaddr;
 	dpt_sg_t*		 sg_vaddr;
-	SLIST_ENTRY(struct sg_map_node) links;
+	SLIST_ENTRY(sg_map_node) links;
 };
 
 /* Main state machine and interface structure */
@@ -1039,14 +1039,14 @@ typedef struct dpt_softc {
 	int	  pending_ccbs;
 	int	  completed_ccbs;
 
-	SLIST_HEAD(, struct dpt_ccb)	 free_dccb_list;
-	LIST_HEAD(, struct ccb_hdr)     pending_ccb_list;
+	SLIST_HEAD(, dpt_ccb)	 free_dccb_list;
+	LIST_HEAD(, ccb_hdr)     pending_ccb_list;
 
 	bus_dma_tag_t		  parent_dmat;
 	bus_dma_tag_t		  dccb_dmat;	/* dmat for our ccb array */
 	bus_dmamap_t		  dccb_dmamap;
 	bus_dma_tag_t		  sg_dmat;	/* dmat for our sg maps */
-	SLIST_HEAD(, struct sg_map_node) sg_maps;
+	SLIST_HEAD(, sg_map_node) sg_maps;
 
 	struct cam_sim		  *sims[MAX_CHANNELS];
 	struct cam_path		  *paths[MAX_CHANNELS];
@@ -1069,7 +1069,7 @@ typedef struct dpt_softc {
 	u_int8_t  irq;
 	u_int8_t  dma_channel;
 
-	TAILQ_ENTRY(struct dpt_softc) links;
+	TAILQ_ENTRY(dpt_softc) links;
 	int	  unit;
 	int	  init_level;
 
@@ -1266,7 +1266,7 @@ dpt_time_delta(struct timeval start,
 	     (end.tv_usec - start.tv_usec) );
 }
 
-extern TAILQ_HEAD(dpt_softc_list, struct dpt_softc) dpt_softcs;
+extern TAILQ_HEAD(dpt_softc_list, dpt_softc) dpt_softcs;
 
 extern int		dpt_controllers_present;
 
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index d37f00e..1e9dcda 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -53,19 +53,19 @@ typedef struct resvaddr {
         u_long	size;				/* size of reserved area */
 	int	flags;
 	struct resource *res;			/* resource manager handle */
-	LIST_ENTRY(struct resvaddr) links;	/* List links */
+	LIST_ENTRY(resvaddr) links;		/* List links */
 } resvaddr_t;
 
-LIST_HEAD(resvlist, struct resvaddr);
+LIST_HEAD(resvlist, resvaddr);
 
 struct irq_node {
 	int	irq_no;
 	int	irq_trigger;
 	void	*idesc;
-	TAILQ_ENTRY(struct irq_node) links;
+	TAILQ_ENTRY(irq_node) links;
 };
 
-TAILQ_HEAD(irqlist, struct irq_node);
+TAILQ_HEAD(irqlist, irq_node);
 
 struct eisa_ioconf {
 	int		slot;
diff --git a/sys/dev/ida/idavar.h b/sys/dev/ida/idavar.h
index 223ac6c..0e3db00 100644
--- a/sys/dev/ida/idavar.h
+++ b/sys/dev/ida/idavar.h
@@ -98,8 +98,8 @@ struct ida_qcb {
 	qcb_state	state;
 	short		flags;
 	union {
-		STAILQ_ENTRY(struct ida_qcb) stqe;
-		SLIST_ENTRY(struct ida_qcb) sle;
+		STAILQ_ENTRY(ida_qcb) stqe;
+		SLIST_ENTRY(ida_qcb) sle;
 	} link;
 	bus_dmamap_t	dmamap;
 	bus_addr_t	hwqcb_busaddr;
@@ -152,8 +152,8 @@ struct ida_softc {
 
 	struct		ida_hardware_qcb *hwqcbs;	/* HW QCB array */
 	struct		ida_qcb *qcbs;			/* kernel QCB array */
-	SLIST_HEAD(, struct ida_qcb)	free_qcbs;	
-	STAILQ_HEAD(, struct ida_qcb) 	qcb_queue;
+	SLIST_HEAD(, ida_qcb)	free_qcbs;	
+	STAILQ_HEAD(, ida_qcb) 	qcb_queue;
 	struct		bio_queue_head bio_queue;
 
 	struct		ida_access cmd;
diff --git a/sys/dev/kbd/kbd.c b/sys/dev/kbd/kbd.c
index a215dd1..ba436be 100644
--- a/sys/dev/kbd/kbd.c
+++ b/sys/dev/kbd/kbd.c
@@ -52,7 +52,7 @@ typedef struct genkbd_softc {
 	struct selinfo	gkb_rsel;
 } genkbd_softc_t;
 
-static	SLIST_HEAD(, struct keyboard_driver) keyboard_drivers =
+static	SLIST_HEAD(, keyboard_driver) keyboard_drivers =
  	SLIST_HEAD_INITIALIZER(keyboard_drivers);
 
 /* local arrays */
@@ -164,7 +164,7 @@ kbd_add_driver(keyboard_driver_t *driver)
 int
 kbd_delete_driver(keyboard_driver_t *driver)
 {
-	SLIST_REMOVE(&keyboard_drivers, driver, struct keyboard_driver, link);
+	SLIST_REMOVE(&keyboard_drivers, driver, keyboard_driver, link);
 	SLIST_NEXT(driver, link) = NULL;
 	return 0;
 }
diff --git a/sys/dev/kbd/kbdreg.h b/sys/dev/kbd/kbdreg.h
index 1a71527..54b2d6d 100644
--- a/sys/dev/kbd/kbdreg.h
+++ b/sys/dev/kbd/kbdreg.h
@@ -157,7 +157,7 @@ typedef struct keyboard_switch {
 
 /* keyboard driver */
 typedef struct keyboard_driver {
-    SLIST_ENTRY(struct keyboard_driver) link;
+    SLIST_ENTRY(keyboard_driver) link;
     char		*name;
     keyboard_switch_t	*kbdsw;
     int			(*configure)(int); /* backdoor for the console driver */
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index cd47d2d..4a68b9c 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -74,7 +74,7 @@ struct mii_data {
 	 * PHYs is required so they can all be notified when a media
 	 * request is made.
 	 */
-	LIST_HEAD(mii_listhead, struct mii_softc) mii_phys;
+	LIST_HEAD(mii_listhead, mii_softc) mii_phys;
 	int mii_instance;
 
 	/*
@@ -113,7 +113,7 @@ typedef	int (*mii_downcall_t) __P((struct mii_softc *, struct mii_data *, int));
 struct mii_softc {
 	device_t mii_dev;		/* generic device glue */
 	
-	LIST_ENTRY(struct mii_softc) mii_list;	/* entry on parent's PHY list */
+	LIST_ENTRY(mii_softc) mii_list;	/* entry on parent's PHY list */
 
 	int mii_phy;			/* our MII address */
 	int mii_inst;			/* instance for ifmedia */
diff --git a/sys/dev/mlx/mlxvar.h b/sys/dev/mlx/mlxvar.h
index 58223cb..edb1a85 100644
--- a/sys/dev/mlx/mlxvar.h
+++ b/sys/dev/mlx/mlxvar.h
@@ -77,7 +77,7 @@ struct mlx_sysdrive
  */
 struct mlx_command 
 {
-    TAILQ_ENTRY(struct mlx_command)	mc_link;	/* list linkage */
+    TAILQ_ENTRY(mlx_command)	mc_link;	/* list linkage */
 
     struct mlx_softc		*mc_sc;		/* controller that owns us */
     u_int8_t			mc_slot;	/* command slot we occupy */
@@ -128,8 +128,8 @@ struct mlx_softc
 #define MLX_FEAT_PAUSEWORKS	(1<<0)	/* channel pause works as expected */
 
     /* controller queues and arrays */
-    TAILQ_HEAD(, struct mlx_command)	mlx_freecmds;	/* command structures available for reuse */
-    TAILQ_HEAD(, struct mlx_command)	mlx_work;	/* active commands */
+    TAILQ_HEAD(, mlx_command)	mlx_freecmds;		/* command structures available for reuse */
+    TAILQ_HEAD(, mlx_command)	mlx_work;		/* active commands */
     struct mlx_command	*mlx_busycmd[MLX_NSLOTS];	/* busy commands */
     int			mlx_busycmds;			/* count of busy commands */
     struct mlx_sysdrive	mlx_sysdrive[MLX_MAXDRIVES];	/* system drives */
diff --git a/sys/dev/pccard/pccardvar.h b/sys/dev/pccard/pccardvar.h
index 58398c4..19e9434 100644
--- a/sys/dev/pccard/pccardvar.h
+++ b/sys/dev/pccard/pccardvar.h
@@ -103,7 +103,7 @@ struct pccard_config_entry {
 		u_long	hostaddr;
 	} memspace[2];		/* XXX this could be as high as 8 */
 	int		maxtwins;
-	STAILQ_ENTRY(struct pccard_config_entry) cfe_list;
+	STAILQ_ENTRY(pccard_config_entry) cfe_list;
 };
 
 struct pccard_function {
@@ -115,8 +115,8 @@ struct pccard_function {
 	u_long		ccr_mask;
 	struct resource *ccr_res;
 	int		ccr_rid;
-	STAILQ_HEAD(, struct pccard_config_entry) cfe_head;
-	STAILQ_ENTRY(struct pccard_function) pf_list;
+	STAILQ_HEAD(, pccard_config_entry) cfe_head;
+	STAILQ_ENTRY(pccard_function) pf_list;
 	/* run-time state */
 	struct pccard_softc *sc;
 	struct pccard_config_entry *cfe;
@@ -154,7 +154,7 @@ struct pccard_card {
 #define	PCCARD_PRODUCT_INVALID		-1
 	u_int16_t	error;
 #define	PCCARD_CIS_INVALID		{ NULL, NULL, NULL, NULL }
-	STAILQ_HEAD(, struct pccard_function) pf_head;
+	STAILQ_HEAD(, pccard_function) pf_head;
 };
 
 #define	PCCARD_MEM_ATTR		1
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 081cd54..aa58b8a 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -87,13 +87,13 @@ struct pci_quirk pci_quirks[] = {
 #define PCI_MAPPORT	0x04	/* port map */
 
 struct pci_devinfo {
-    	STAILQ_ENTRY(struct pci_devinfo) pci_links;
+    	STAILQ_ENTRY(pci_devinfo) pci_links;
 	struct resource_list resources;
 	pcicfgregs		cfg;
 	struct pci_conf		conf;
 };
 
-static STAILQ_HEAD(devlist, struct pci_devinfo) pci_devq;
+static STAILQ_HEAD(devlist, pci_devinfo) pci_devq;
 u_int32_t pci_numdevs = 0;
 static u_int32_t pci_generation = 0;
 
@@ -400,7 +400,7 @@ pci_freecfg(struct pci_devinfo *dinfo)
 	if (dinfo->cfg.map != NULL)
 		free(dinfo->cfg.map, M_DEVBUF);
 	/* XXX this hasn't been tested */
-	STAILQ_REMOVE(devlist_head, dinfo, struct pci_devinfo, pci_links);
+	STAILQ_REMOVE(devlist_head, dinfo, pci_devinfo, pci_links);
 	free(dinfo, M_DEVBUF);
 
 	/* increment the generation count */
diff --git a/sys/dev/pcic/i82365var.h b/sys/dev/pcic/i82365var.h
index 55eaa07..5a0c723 100644
--- a/sys/dev/pcic/i82365var.h
+++ b/sys/dev/pcic/i82365var.h
@@ -37,7 +37,7 @@
 struct proc;
 
 struct pcic_event {
-	STAILQ_ENTRY(struct pcic_event) pe_q;
+	STAILQ_ENTRY(pcic_event) pe_q;
 	int pe_type;
 };
 
@@ -65,7 +65,7 @@ struct pcic_handle {
 
 	int shutdown;
 	struct proc *event_thread;
-	STAILQ_HEAD(, struct pcic_event) events;
+	STAILQ_HEAD(, pcic_event) events;
 };
 
 #define	PCIC_FLAG_SOCKETP	0x0001
diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h
index 2a5afc0..af17c1c 100644
--- a/sys/dev/sk/if_skreg.h
+++ b/sys/dev/sk/if_skreg.h
@@ -1129,7 +1129,7 @@ struct sk_jslot {
 
 struct sk_jpool_entry {
 	int                             slot;
-	SLIST_ENTRY(struct sk_jpool_entry)	jpool_entries;
+	SLIST_ENTRY(sk_jpool_entry)	jpool_entries;
 };
 
 struct sk_chain {
@@ -1209,8 +1209,8 @@ struct sk_if_softc {
 	struct sk_softc		*sk_softc;	/* parent controller */
 	int			sk_tx_bmu;	/* TX BMU register */
 	int			sk_if_flags;
-	SLIST_HEAD(__sk_jfreehead, struct sk_jpool_entry) sk_jfree_listhead;
-	SLIST_HEAD(__sk_jinusehead, struct sk_jpool_entry) sk_jinuse_listhead;
+	SLIST_HEAD(__sk_jfreehead, sk_jpool_entry)	sk_jfree_listhead;
+	SLIST_HEAD(__sk_jinusehead, sk_jpool_entry)	sk_jinuse_listhead;
 };
 
 #define SK_MAXUNIT	256
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index dd6ed9b..e8dcc6e 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -44,7 +44,7 @@
 #undef EMUDEBUG
 
 struct emu_memblk {
-	SLIST_ENTRY(struct emu_memblk) link;
+	SLIST_ENTRY(emu_memblk) link;
 	void *buf;
 	u_int32_t pte_start, pte_size;
 };
@@ -53,7 +53,7 @@ struct emu_mem {
 	u_int8_t bmap[MAXPAGES / 8];
 	u_int32_t *ptb_pages;
 	void *silent_page;
-       	SLIST_HEAD(, struct emu_memblk) blocks;
+       	SLIST_HEAD(, emu_memblk) blocks;
 };
 
 struct emu_voice {
diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c
index 472eb19..c0f6f1c 100644
--- a/sys/dev/streams/streams.c
+++ b/sys/dev/streams/streams.c
@@ -71,10 +71,10 @@ struct svr4_sockcache_entry {
 	struct sockaddr_un sock;/* Pathname for the socket		*/
 	dev_t dev;		/* Device where the socket lives on	*/
 	ino_t ino;		/* Inode where the socket lives on	*/
-	TAILQ_ENTRY(struct svr4_sockcache_entry) entries;
+	TAILQ_ENTRY(svr4_sockcache_entry) entries;
 };
 
-TAILQ_HEAD(svr4_sockcache_head, struct svr4_sockcache_entry) svr4_head;
+TAILQ_HEAD(svr4_sockcache_head, svr4_sockcache_entry) svr4_head;
 
 /* Initialization flag (set/queried by svr4_mod LKM) */
 int svr4_str_initialized = 0;
diff --git a/sys/dev/syscons/scterm.c b/sys/dev/syscons/scterm.c
index f174d10..99fad98 100644
--- a/sys/dev/syscons/scterm.c
+++ b/sys/dev/syscons/scterm.c
@@ -64,7 +64,7 @@ sc_clear_screen(scr_stat *scp)
 
 /* terminal emulator manager routines */
 
-static LIST_HEAD(, struct sc_term_sw) sc_term_list = 
+static LIST_HEAD(, sc_term_sw) sc_term_list = 
 	LIST_HEAD_INITIALIZER(sc_term_list);
 
 int
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 8eda6e6..8af13a0 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -768,7 +768,7 @@ sc_vid_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p)
     return ENOIOCTL;
 }
 
-static LIST_HEAD(, struct sc_renderer) sc_rndr_list = 
+static LIST_HEAD(, sc_renderer) sc_rndr_list = 
 	LIST_HEAD_INITIALIZER(sc_rndr_list);
 
 int
diff --git a/sys/dev/syscons/syscons.h b/sys/dev/syscons/syscons.h
index 4b98404..0c1d8e4 100644
--- a/sys/dev/syscons/syscons.h
+++ b/sys/dev/syscons/syscons.h
@@ -325,7 +325,7 @@ typedef void	sc_term_notify_t(scr_stat *scp, int event);
 typedef int	sc_term_input_t(scr_stat *scp, int c, struct tty *tp);
 
 typedef struct sc_term_sw {
-	LIST_ENTRY(struct sc_term_sw)	link;
+	LIST_ENTRY(sc_term_sw)	link;
 	char 			*te_name;	/* name of the emulator */
 	char 			*te_desc;	/* description */
 	char 			*te_renderer;	/* matching renderer */
@@ -395,7 +395,7 @@ typedef struct sc_renderer {
 	char			*name;
 	int			mode;
 	sc_rndr_sw_t		*rndrsw;
-	LIST_ENTRY(struct sc_renderer)	link;
+	LIST_ENTRY(sc_renderer)	link;
 } sc_renderer_t;
 
 extern struct linker_set scrndr_set;
diff --git a/sys/dev/ti/if_tireg.h b/sys/dev/ti/if_tireg.h
index fd6cb00..5210ffa 100644
--- a/sys/dev/ti/if_tireg.h
+++ b/sys/dev/ti/if_tireg.h
@@ -1103,12 +1103,12 @@ struct ti_type {
 
 struct ti_mc_entry {
 	struct ether_addr		mc_addr;
-	SLIST_ENTRY(struct ti_mc_entry)	mc_entries;
+	SLIST_ENTRY(ti_mc_entry)	mc_entries;
 };
 
 struct ti_jpool_entry {
 	int                             slot;
-	SLIST_ENTRY(struct ti_jpool_entry)	jpool_entries;
+	SLIST_ENTRY(ti_jpool_entry)	jpool_entries;
 };
 
 struct ti_softc {
@@ -1135,9 +1135,9 @@ struct ti_softc {
 	u_int16_t		ti_std;		/* current std ring head */
 	u_int16_t		ti_mini;	/* current mini ring head */
 	u_int16_t		ti_jumbo;	/* current jumo ring head */
-	SLIST_HEAD(__ti_mchead, struct ti_mc_entry)	ti_mc_listhead;
-	SLIST_HEAD(__ti_jfreehead, struct ti_jpool_entry) ti_jfree_listhead;
-	SLIST_HEAD(__ti_jinusehead, struct ti_jpool_entry) ti_jinuse_listhead;
+	SLIST_HEAD(__ti_mchead, ti_mc_entry)	ti_mc_listhead;
+	SLIST_HEAD(__ti_jfreehead, ti_jpool_entry)	ti_jfree_listhead;
+	SLIST_HEAD(__ti_jinusehead, ti_jpool_entry)	ti_jinuse_listhead;
 	u_int32_t		ti_stat_ticks;
 	u_int32_t		ti_rx_coal_ticks;
 	u_int32_t		ti_tx_coal_ticks;
diff --git a/sys/dev/usb/ohcivar.h b/sys/dev/usb/ohcivar.h
index 11c3394..8d37778 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/dev/usb/ohcivar.h
@@ -51,7 +51,7 @@ typedef struct ohci_soft_td {
 	struct ohci_soft_td *nexttd; /* mirrors nexttd in TD */
 	struct ohci_soft_td *dnext; /* next in done list */
 	ohci_physaddr_t physaddr;
-	LIST_ENTRY(struct ohci_soft_td) hnext;
+	LIST_ENTRY(ohci_soft_td) hnext;
 	usbd_xfer_handle xfer;
 	u_int16_t len;
 	u_int16_t flags;
@@ -97,7 +97,7 @@ typedef struct ohci_softc {
 	ohci_soft_ed_t *sc_ctrl_head;
 	ohci_soft_ed_t *sc_bulk_head;
 
-	LIST_HEAD(, struct ohci_soft_td) sc_hash_tds[OHCI_HASH_SIZE];
+	LIST_HEAD(, ohci_soft_td) sc_hash_tds[OHCI_HASH_SIZE];
 
 	int sc_noport;
 	u_int8_t sc_addr;		/* device address */
@@ -107,7 +107,7 @@ typedef struct ohci_softc {
 	ohci_soft_td_t *sc_freetds;
 	ohci_soft_itd_t *sc_freeitds;
 
-	SIMPLEQ_HEAD(, struct usbd_xfer) sc_free_xfers; /* free xfers */
+	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 
 	usbd_xfer_handle sc_intrxfer;
 
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 62fdb9f..f266570 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -147,7 +147,7 @@ struct uhci_pipe {
  * The uhci_intr_info free list can be global since they contain
  * no dma specific data.  The other free lists do.
  */
-LIST_HEAD(, struct uhci_intr_info) uhci_ii_free;
+LIST_HEAD(, uhci_intr_info) uhci_ii_free;
 
 Static void		uhci_busreset __P((uhci_softc_t *));
 Static usbd_status	uhci_run __P((uhci_softc_t *, int run));
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index bea26bc..303a429 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -73,7 +73,7 @@ typedef struct uhci_intr_info {
 	usbd_xfer_handle xfer;
 	uhci_soft_td_t *stdstart;
 	uhci_soft_td_t *stdend;
-	LIST_ENTRY(struct uhci_intr_info) list;
+	LIST_ENTRY(uhci_intr_info) list;
 #if defined(__FreeBSD__)
 	struct callout_handle timeout_handle;
 #endif /* defined(__FreeBSD__) */
@@ -149,7 +149,7 @@ typedef struct uhci_softc {
 	uhci_soft_td_t *sc_freetds;	/* TD free list */
 	uhci_soft_qh_t *sc_freeqhs;	/* QH free list */
 
-	SIMPLEQ_HEAD(, struct usbd_xfer) sc_free_xfers; /* free xfers */
+	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
 
 	u_int8_t sc_addr;		/* device address */
 	u_int8_t sc_conf;		/* device configuration */
@@ -157,7 +157,7 @@ typedef struct uhci_softc {
 	char sc_isreset;
 	char sc_suspend;
 
-	LIST_HEAD(, struct uhci_intr_info) sc_intrhead;
+	LIST_HEAD(, uhci_intr_info) sc_intrhead;
 
 	/* Info for the root hub interrupt channel. */
 	int sc_ival;			/* time between root hug intrs */
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 43c2351..b623cf2 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -156,9 +156,9 @@ Static void	usb_event_thread __P((void *));
 #define USB_MAX_EVENTS 50
 struct usb_event_q {
 	struct usb_event ue;
-	SIMPLEQ_ENTRY(struct usb_event_q) next;
+	SIMPLEQ_ENTRY(usb_event_q) next;
 };
-Static SIMPLEQ_HEAD(, struct usb_event_q) usb_events =
+Static SIMPLEQ_HEAD(, usb_event_q) usb_events =
 	SIMPLEQ_HEAD_INITIALIZER(usb_events);
 Static int usb_nevents = 0;
 Static struct selinfo usb_selevent;
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 37c65ba..f74e9c4 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -48,7 +48,7 @@ typedef struct usb_dma_block {
         size_t size;
         size_t align;
 	int fullblock;
-	LIST_ENTRY(struct usb_dma_block) next;
+	LIST_ENTRY(usb_dma_block) next;
 } usb_dma_block_t;
 
 #define DMAADDR(dma, offset) ((dma)->block->segs[0].ds_addr + (dma)->offs + (offset))
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index ca1fae6..9d8ca8a 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -146,7 +146,7 @@ struct usbd_interface {
 	int			altindex;
 	struct usbd_endpoint   *endpoints;
 	void		       *priv;
-	LIST_HEAD(, struct usbd_pipe)	pipes;
+	LIST_HEAD(, usbd_pipe)	pipes;
 };
 
 struct usbd_pipe {
@@ -155,8 +155,8 @@ struct usbd_pipe {
 	struct usbd_endpoint   *endpoint;
 	int			refcnt;
 	char			running;
-	SIMPLEQ_HEAD(, struct usbd_xfer) queue;
-	LIST_ENTRY(struct usbd_pipe)	next;
+	SIMPLEQ_HEAD(, usbd_xfer) queue;
+	LIST_ENTRY(usbd_pipe)	next;
 
 	usbd_xfer_handle	intrxfer; /* used for repeating requests */
 	char			repeat;
@@ -194,7 +194,7 @@ struct usbd_xfer {
 #define URQ_AUTO_DMABUF	0x10
 #define URQ_DEV_DMABUF	0x20
 
-	SIMPLEQ_ENTRY(struct usbd_xfer) next;
+	SIMPLEQ_ENTRY(usbd_xfer) next;
 
 	void		       *hcpriv; /* private use by the HC driver */
 	int			hcprivint;
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c
index 95b4e46..29f4e7a 100644
--- a/sys/dev/vn/vn.c
+++ b/sys/dev/vn/vn.c
@@ -137,10 +137,10 @@ struct vn_softc {
 	struct ucred	*sc_cred;	/* credentials 			*/
 	int		 sc_maxactive;	/* max # of active requests 	*/
 	u_long		 sc_options;	/* options 			*/
-	SLIST_ENTRY(struct vn_softc) sc_list;
+	SLIST_ENTRY(vn_softc) sc_list;
 };
 
-static SLIST_HEAD(, struct vn_softc) vn_list;
+static SLIST_HEAD(, vn_softc) vn_list;
 
 /* sc_flags */
 #define VNF_INITED	0x01