diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 9c4c68626e13..9b0b824c8418 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_xpt.c,v 1.29 1998/12/10 04:05:49 gibbs Exp $
+ *      $Id: cam_xpt.c,v 1.30 1998/12/15 08:13:10 gibbs Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -80,7 +80,7 @@ struct async_node {
 
 SLIST_HEAD(async_list, async_node);
 SLIST_HEAD(periph_list, cam_periph);
-STAILQ_HEAD(highpowerlist, ccb_hdr) highpowerq;
+static STAILQ_HEAD(highpowerlist, ccb_hdr) highpowerq;
 
 /*
  * This is the maximum number of high powered commands (e.g. start unit)
@@ -428,7 +428,7 @@ static cam_isrq_t cam_bioq;
 static cam_isrq_t cam_netq;
 
 /* "Pool" of inactive ccbs managed by xpt_alloc_ccb and xpt_free_ccb */
-SLIST_HEAD(,ccb_hdr) ccb_freeq;
+static SLIST_HEAD(,ccb_hdr) ccb_freeq;
 static u_int xpt_max_ccbs;	/*
 				 * Maximum size of ccb pool.  Modified as
 				 * devices are added/removed or have their
@@ -489,7 +489,7 @@ static struct cdevsw xpt_cdevsw =
 static struct intr_config_hook *xpt_config_hook;
 
 /* Registered busses */
-TAILQ_HEAD(,cam_eb) xpt_busses;
+static TAILQ_HEAD(,cam_eb) xpt_busses;
 static u_int bus_generation;
 
 /* Storage for debugging datastructures */
@@ -5787,13 +5787,13 @@ xptaction(struct cam_sim *sim, union ccb *work_ccb)
  * XXX we should really have a way to dynamically register SWI handlers.
  */
 
-void
+static void
 swi_camnet()
 {
 	camisr(&cam_netq);
 }
 
-void
+static void
 swi_cambio()
 {
 	camisr(&cam_bioq);
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 8f6fb313440f..56f878529273 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_cd.c,v 1.9 1998/11/22 23:44:46 ken Exp $
+ *      $Id: scsi_cd.c,v 1.10 1998/12/04 22:54:43 archie Exp $
  */
 /*
  * Portions of this driver taken from the original FreeBSD cd driver.
@@ -306,7 +306,7 @@ struct cdchanger {
 	STAILQ_HEAD(chdevlist, cd_softc) chluns;
 };
 
-STAILQ_HEAD(changerlist, cdchanger) changerq;
+static STAILQ_HEAD(changerlist, cdchanger) changerq;
 
 void
 cdinit(void)
@@ -1330,7 +1330,7 @@ cdrunccb(union ccb *ccb, int (*error_routine)(union ccb *ccb,
 	return(error);
 }
 
-union ccb *
+static union ccb *
 cdgetccb(struct cam_periph *periph, u_int32_t priority)
 {
 	struct cd_softc *softc;
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 346bdbff6b30..17f6fb965966 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: scsi_ch.c,v 1.7 1998/12/04 22:54:43 archie Exp $
+ *      $Id: scsi_ch.c,v 1.8 1998/12/12 23:52:46 gibbs Exp $
  */
 /*
  * Derived from the NetBSD SCSI changer driver.
@@ -101,13 +101,13 @@
  * ELEMENT STATUS).
  */
 
-const u_int32_t	CH_TIMEOUT_MODE_SENSE                = 6000;
-const u_int32_t	CH_TIMEOUT_MOVE_MEDIUM               = 100000;
-const u_int32_t	CH_TIMEOUT_EXCHANGE_MEDIUM           = 100000;
-const u_int32_t	CH_TIMEOUT_POSITION_TO_ELEMENT       = 100000;
-const u_int32_t	CH_TIMEOUT_READ_ELEMENT_STATUS       = 10000;
-const u_int32_t	CH_TIMEOUT_SEND_VOLTAG		     = 10000;
-const u_int32_t	CH_TIMEOUT_INITIALIZE_ELEMENT_STATUS = 500000;
+static const u_int32_t	CH_TIMEOUT_MODE_SENSE                = 6000;
+static const u_int32_t	CH_TIMEOUT_MOVE_MEDIUM               = 100000;
+static const u_int32_t	CH_TIMEOUT_EXCHANGE_MEDIUM           = 100000;
+static const u_int32_t	CH_TIMEOUT_POSITION_TO_ELEMENT       = 100000;
+static const u_int32_t	CH_TIMEOUT_READ_ELEMENT_STATUS       = 10000;
+static const u_int32_t	CH_TIMEOUT_SEND_VOLTAG		     = 10000;
+static const u_int32_t	CH_TIMEOUT_INITIALIZE_ELEMENT_STATUS = 500000;
 
 typedef enum {
 	CH_FLAG_INVALID		= 0x001,