git: 2ffd30f7ee15 - main - cam: Remove left-over sys/cdefs.h in sys/cam
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 06 Nov 2023 19:21:47 UTC
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=2ffd30f7ee15c87ee092cbac6a4438bcb3af923c
commit 2ffd30f7ee15c87ee092cbac6a4438bcb3af923c
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2023-11-06 19:20:23 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2023-11-06 19:20:23 +0000
cam: Remove left-over sys/cdefs.h in sys/cam
These weren't removed when $FreeBSD$ was removed. They aren't needed and
now are a style(9) nonconformity.
Sponsored by: Netflix
---
sys/cam/ata/ata_all.c | 1 -
sys/cam/ata/ata_da.c | 1 -
sys/cam/ata/ata_pmp.c | 1 -
sys/cam/cam.c | 1 -
sys/cam/cam.h | 1 -
sys/cam/cam_ccb.h | 1 -
sys/cam/cam_compat.c | 1 -
sys/cam/cam_periph.c | 1 -
sys/cam/cam_queue.c | 1 -
sys/cam/cam_sim.c | 1 -
sys/cam/cam_xpt.c | 1 -
sys/cam/ctl/ctl.c | 1 -
sys/cam/ctl/ctl_backend.c | 1 -
sys/cam/ctl/ctl_backend_block.c | 1 -
sys/cam/ctl/ctl_backend_ramdisk.c | 1 -
sys/cam/ctl/ctl_cmd_table.c | 1 -
sys/cam/ctl/ctl_error.c | 1 -
sys/cam/ctl/ctl_frontend.c | 1 -
sys/cam/ctl/ctl_frontend_cam_sim.c | 1 -
sys/cam/ctl/ctl_frontend_ioctl.c | 1 -
sys/cam/ctl/ctl_frontend_iscsi.c | 1 -
sys/cam/ctl/ctl_ha.c | 1 -
sys/cam/ctl/ctl_tpc.c | 1 -
sys/cam/ctl/ctl_tpc_local.c | 1 -
sys/cam/ctl/ctl_util.c | 1 -
sys/cam/ctl/scsi_ctl.c | 1 -
sys/cam/mmc/mmc_da.c | 1 -
sys/cam/mmc/mmc_sim.c | 1 -
sys/cam/nvme/nvme_all.c | 1 -
sys/cam/nvme/nvme_da.c | 1 -
sys/cam/scsi/scsi_all.c | 1 -
sys/cam/scsi/scsi_all.h | 1 -
sys/cam/scsi/scsi_cd.c | 1 -
sys/cam/scsi/scsi_ch.c | 1 -
sys/cam/scsi/scsi_ch.h | 1 -
sys/cam/scsi/scsi_da.c | 1 -
sys/cam/scsi/scsi_da.h | 1 -
sys/cam/scsi/scsi_enc.c | 1 -
sys/cam/scsi/scsi_enc_safte.c | 1 -
sys/cam/scsi/scsi_enc_ses.c | 1 -
sys/cam/scsi/scsi_pass.c | 1 -
sys/cam/scsi/scsi_pt.c | 1 -
sys/cam/scsi/scsi_sa.c | 1 -
sys/cam/scsi/scsi_sa.h | 1 -
sys/cam/scsi/scsi_sg.c | 1 -
sys/cam/scsi/scsi_targ_bh.c | 1 -
sys/cam/scsi/scsi_target.c | 1 -
sys/cam/scsi/smp_all.c | 1 -
48 files changed, 48 deletions(-)
diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c
index 7cc3d607f01d..aff7cafcdbad 100644
--- a/sys/cam/ata/ata_all.c
+++ b/sys/cam/ata/ata_all.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index d1ef28300666..db2dc3a23b34 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "opt_ada.h"
#include <sys/param.h>
diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c
index d3f5c9cc0fed..51f60645a969 100644
--- a/sys/cam/ata/ata_pmp.c
+++ b/sys/cam/ata/ata_pmp.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/cam/cam.c b/sys/cam/cam.c
index ef2bb4f5840d..09bef8ee3a83 100644
--- a/sys/cam/cam.c
+++ b/sys/cam/cam.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifdef _KERNEL
#include <sys/systm.h>
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 445540d07e3d..692f515aa1aa 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -35,7 +35,6 @@
#include "opt_cam.h"
#endif
-#include <sys/cdefs.h>
#ifndef _KERNEL
#include <stdbool.h>
#endif
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 47fb3d09664d..9d52213e3952 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -32,7 +32,6 @@
#define _CAM_CAM_CCB_H 1
#include <sys/queue.h>
-#include <sys/cdefs.h>
#include <sys/time.h>
#include <sys/limits.h>
#ifndef _KERNEL
diff --git a/sys/cam/cam_compat.c b/sys/cam/cam_compat.c
index d95a11e80c2e..1b53eaa4a2c8 100644
--- a/sys/cam/cam_compat.c
+++ b/sys/cam/cam_compat.c
@@ -29,7 +29,6 @@
*
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index 101abda5db25..165929347a68 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index aa78539acbb6..5f9aa35642de 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index 8fc3d0ee3c1a..2bb60420ad84 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/kernel.h>
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index dc423991fd58..83fef42453fa 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -31,7 +31,6 @@
#include "opt_printf.h"
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/bio.h>
#include <sys/bus.h>
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index a315c5ef7df3..7ad7912ef323 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -44,7 +44,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ctype.h>
diff --git a/sys/cam/ctl/ctl_backend.c b/sys/cam/ctl/ctl_backend.c
index a57c5f127f08..a2249b5d8f44 100644
--- a/sys/cam/ctl/ctl_backend.c
+++ b/sys/cam/ctl/ctl_backend.c
@@ -37,7 +37,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index dd6511295dc4..4b8ea04cca27 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -45,7 +45,6 @@
*
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_backend_ramdisk.c b/sys/cam/ctl/ctl_backend_ramdisk.c
index dced32d8aed1..ecb0caae89b1 100644
--- a/sys/cam/ctl/ctl_backend_ramdisk.c
+++ b/sys/cam/ctl/ctl_backend_ramdisk.c
@@ -42,7 +42,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_cmd_table.c b/sys/cam/ctl/ctl_cmd_table.c
index 353236b1c1b6..8b81ea7e56b3 100644
--- a/sys/cam/ctl/ctl_cmd_table.c
+++ b/sys/cam/ctl/ctl_cmd_table.c
@@ -38,7 +38,6 @@
* Author: Ken Merry <ken@FreeBSD.org>, Kim Le
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c
index 89bf3fab7096..a17095c91ac5 100644
--- a/sys/cam/ctl/ctl_error.c
+++ b/sys/cam/ctl/ctl_error.c
@@ -39,7 +39,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c
index ed5e2b3ac8c9..ac41a882db6b 100644
--- a/sys/cam/ctl/ctl_frontend.c
+++ b/sys/cam/ctl/ctl_frontend.c
@@ -38,7 +38,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_frontend_cam_sim.c b/sys/cam/ctl/ctl_frontend_cam_sim.c
index 5b964c2a4781..544912d602d9 100644
--- a/sys/cam/ctl/ctl_frontend_cam_sim.c
+++ b/sys/cam/ctl/ctl_frontend_cam_sim.c
@@ -38,7 +38,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c
index 428fb9983b9f..7fc8deac82b3 100644
--- a/sys/cam/ctl/ctl_frontend_ioctl.c
+++ b/sys/cam/ctl/ctl_frontend_ioctl.c
@@ -29,7 +29,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 5c7cdaf0770e..019026d78d67 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -32,7 +32,6 @@
* CTL frontend for the iSCSI protocol.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/capsicum.h>
#include <sys/condvar.h>
diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c
index 32c83025bb1b..181f42640cce 100644
--- a/sys/cam/ctl/ctl_ha.c
+++ b/sys/cam/ctl/ctl_ha.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/condvar.h>
#include <sys/conf.h>
diff --git a/sys/cam/ctl/ctl_tpc.c b/sys/cam/ctl/ctl_tpc.c
index 063f674f00ff..824a0debb25e 100644
--- a/sys/cam/ctl/ctl_tpc.c
+++ b/sys/cam/ctl/ctl_tpc.c
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_tpc_local.c b/sys/cam/ctl/ctl_tpc_local.c
index 3d087d9cab4c..5b353046eda7 100644
--- a/sys/cam/ctl/ctl_tpc_local.c
+++ b/sys/cam/ctl/ctl_tpc_local.c
@@ -27,7 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/ctl/ctl_util.c b/sys/cam/ctl/ctl_util.c
index dc7a9177deeb..3b0e40311213 100644
--- a/sys/cam/ctl/ctl_util.c
+++ b/sys/cam/ctl/ctl_util.c
@@ -37,7 +37,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#ifdef _KERNEL
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 590631fc4326..93cb4d71b6a5 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -38,7 +38,6 @@
* Author: Ken Merry <ken@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/systm.h>
diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c
index 0809de6e0764..597ba0efb47e 100644
--- a/sys/cam/mmc/mmc_da.c
+++ b/sys/cam/mmc/mmc_da.c
@@ -32,7 +32,6 @@
* Bernd Walter <tisco@FreeBSD.org>, and other authors.
*/
-#include <sys/cdefs.h>
//#include "opt_sdda.h"
#include <sys/param.h>
diff --git a/sys/cam/mmc/mmc_sim.c b/sys/cam/mmc/mmc_sim.c
index 3033e327d0d5..104916a41782 100644
--- a/sys/cam/mmc/mmc_sim.c
+++ b/sys/cam/mmc/mmc_sim.c
@@ -23,7 +23,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/systm.h>
diff --git a/sys/cam/nvme/nvme_all.c b/sys/cam/nvme/nvme_all.c
index 1a740f71948e..7f0878c0f288 100644
--- a/sys/cam/nvme/nvme_all.c
+++ b/sys/cam/nvme/nvme_all.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c
index e8e75a121679..89984e3aaf36 100644
--- a/sys/cam/nvme/nvme_da.c
+++ b/sys/cam/nvme/nvme_da.c
@@ -28,7 +28,6 @@
* Copyright (c) 2009 Alexander Motin <mav@FreeBSD.org>
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 0e42403d74a6..7cc323595566 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#include <sys/stdint.h>
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 4842732c8169..7456998a4f88 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -22,7 +22,6 @@
#ifndef _SCSI_SCSI_ALL_H
#define _SCSI_SCSI_ALL_H 1
-#include <sys/cdefs.h>
#ifdef _KERNEL
#include <sys/malloc.h>
#include <machine/stdarg.h>
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 9891110e6b3d..b892708ffb99 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -47,7 +47,6 @@
* from: cd.c,v 1.83 1997/05/04 15:24:22 joerg Exp $
*/
-#include <sys/cdefs.h>
#include "opt_cd.h"
#include <sys/param.h>
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 30e4c8e73efd..89a817c1b488 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -65,7 +65,6 @@
* $NetBSD: ch.c,v 1.34 1998/08/31 22:28:06 cgd Exp $
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_ch.h b/sys/cam/scsi/scsi_ch.h
index ad9f01f76585..a8f980166600 100644
--- a/sys/cam/scsi/scsi_ch.h
+++ b/sys/cam/scsi/scsi_ch.h
@@ -64,7 +64,6 @@
#ifndef _SCSI_SCSI_CH_H
#define _SCSI_SCSI_CH_H 1
-#include <sys/cdefs.h>
/*
* SCSI command format
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 7a063fce128b..e795cecb5d11 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/cam/scsi/scsi_da.h b/sys/cam/scsi/scsi_da.h
index ead0b4312f5e..6ce025d15497 100644
--- a/sys/cam/scsi/scsi_da.h
+++ b/sys/cam/scsi/scsi_da.h
@@ -50,7 +50,6 @@
#ifndef _SCSI_SCSI_DA_H
#define _SCSI_SCSI_DA_H 1
-#include <sys/cdefs.h>
struct scsi_rezero_unit
{
diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c
index f93fd6e31861..4415e940cd96 100644
--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/cam/scsi/scsi_enc_safte.c b/sys/cam/scsi/scsi_enc_safte.c
index 3d42c9fae207..78c5324fb6eb 100644
--- a/sys/cam/scsi/scsi_enc_safte.c
+++ b/sys/cam/scsi/scsi_enc_safte.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c
index 767f4f0b7fa6..e122e0d0e0d9 100644
--- a/sys/cam/scsi/scsi_enc_ses.c
+++ b/sys/cam/scsi/scsi_enc_ses.c
@@ -33,7 +33,6 @@
* Structures and routines specific && private to SES only
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/ctype.h>
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index cf27c304d919..5c05ca84bcab 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 18d11eb6e058..57d9df3f9dc1 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 78b22ba7eba1..aa4dc8e84c10 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#ifdef _KERNEL
diff --git a/sys/cam/scsi/scsi_sa.h b/sys/cam/scsi/scsi_sa.h
index ace208fe97a7..3d8edcac7aa7 100644
--- a/sys/cam/scsi/scsi_sa.h
+++ b/sys/cam/scsi/scsi_sa.h
@@ -33,7 +33,6 @@
#ifndef _SCSI_SCSI_SA_H
#define _SCSI_SCSI_SA_H 1
-#include <sys/cdefs.h>
struct scsi_read_block_limits
{
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index b17a156503a2..27a0b298fd31 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -31,7 +31,6 @@
* SG passthrough interface for SCSI.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index 9773c99d04e3..234dd777d88d 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -28,7 +28,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
#include <sys/systm.h>
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 45a5eb8415b9..5fe123427447 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -29,7 +29,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/cam/scsi/smp_all.c b/sys/cam/scsi/smp_all.c
index 7f387af25395..7e06f3297aaf 100644
--- a/sys/cam/scsi/smp_all.c
+++ b/sys/cam/scsi/smp_all.c
@@ -36,7 +36,6 @@
* Serial Management Protocol helper functions.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
#ifdef _KERNEL