diff --git a/sys/i386/isa/sound/dev_table.c b/sys/i386/isa/sound/dev_table.c
index dc80a3d13905..bfd8e58e1a74 100644
--- a/sys/i386/isa/sound/dev_table.c
+++ b/sys/i386/isa/sound/dev_table.c
@@ -46,7 +46,7 @@ snd_find_driver (int type)
 				 */
 }
 
-long
+static long
 sndtable_init (long mem_start)
 {
   int             i, n = sizeof (snd_installed_cards) / sizeof (struct card_info);
@@ -155,96 +155,6 @@ sndtable_get_cardcount (void)
   return num_audiodevs + num_mixers + num_synths + num_midis;
 }
 
-#ifdef linux
-void
-sound_setup (char *str, int *ints)
-{
-  int             i, n = sizeof (snd_installed_cards) / sizeof (struct card_info);
-
-  /*
-     * First disable all drivers
-   */
-
-  for (i = 0; i < n; i++)
-    snd_installed_cards[i].enabled = 0;
-
-  if (ints[0] == 0 || ints[1] == 0)
-    return;
-  /*
-     * Then enable them one by time
-   */
-
-  for (i = 1; i <= ints[0]; i++)
-    {
-      int             card_type, ioaddr, irq, dma, ptr, j;
-      unsigned int    val;
-
-      val = (unsigned int) ints[i];
-
-      card_type = (val & 0x0ff00000) >> 20;
-
-      if (card_type > 127)
-	{
-	  /*
-	   * Add any future extensions here
-	   */
-	  return;
-	}
-
-      ioaddr = (val & 0x000fff00) >> 8;
-      irq = (val & 0x000000f0) >> 4;
-      dma = (val & 0x0000000f);
-
-      ptr = -1;
-      for (j = 0; j < n && ptr == -1; j++)
-	if (snd_installed_cards[j].card_type == card_type &&
-	    !snd_installed_cards[j].enabled)	/*
-						 * Not already found
-						 */
-	  ptr = j;
-
-      if (ptr == -1)
-	printk ("Sound: Invalid setup parameter 0x%08x\n", val);
-      else
-	{
-	  snd_installed_cards[ptr].enabled = 1;
-	  snd_installed_cards[ptr].config.io_base = ioaddr;
-	  snd_installed_cards[ptr].config.irq = irq;
-	  snd_installed_cards[ptr].config.dma = dma;
-	}
-    }
-}
-
-#else
-void
-sound_chconf (int card_type, int ioaddr, int irq, int dma)
-{
-  int             i, n = sizeof (snd_installed_cards) / sizeof (struct card_info);
-
-  int             ptr, j;
-
-  ptr = -1;
-  for (j = 0; j < n && ptr == -1; j++)
-    if (snd_installed_cards[j].card_type == card_type &&
-	!snd_installed_cards[j].enabled)	/*
-						 * Not already found
-						 */
-      ptr = j;
-
-  if (ptr != -1)
-    {
-      snd_installed_cards[ptr].enabled = 1;
-      if (ioaddr)
-	snd_installed_cards[ptr].config.io_base = ioaddr;
-      if (irq)
-	snd_installed_cards[ptr].config.irq = irq;
-      if (dma)
-	snd_installed_cards[ptr].config.dma = dma;
-    }
-}
-
-#endif
-
 struct address_info *
 sound_getconf (int card_type)
 {
diff --git a/sys/i386/isa/sound/dev_table.h b/sys/i386/isa/sound/dev_table.h
index e207a1757582..402538c89b5b 100644
--- a/sys/i386/isa/sound/dev_table.h
+++ b/sys/i386/isa/sound/dev_table.h
@@ -412,10 +412,8 @@ struct sound_timer_operations {
 
 int sndtable_probe(int unit, struct address_info *hw_config);
 int sndtable_init_card(int unit, struct address_info *hw_config);
-long sndtable_init(long mem_start);
 int sndtable_get_cardcount (void);
 struct address_info *sound_getconf(int card_type);
-void sound_chconf(int card_type, int ioaddr, int irq, int dma);
 int snd_find_driver(int type);
 
 #endif	/* _DEV_TABLE_H_ */
diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c
index eb7227abb956..fe88539b06e1 100644
--- a/sys/i386/isa/sound/gus_wave.c
+++ b/sys/i386/isa/sound/gus_wave.c
@@ -31,10 +31,10 @@
 #include <machine/ultrasound.h>
 #include "gus_hw.h"
 
-extern unsigned char gus_look8 __P((int reg));
-extern unsigned short gus_read16 __P((int reg));
-extern void gus_write_addr __P((int reg, unsigned long address, int is16bit));
-extern void gus_write16 __P((int reg, unsigned int data));
+static unsigned char gus_look8 __P((int reg));
+static unsigned short gus_read16 __P((int reg));
+static void gus_write_addr __P((int reg, unsigned long address, int is16bit));
+static void gus_write16 __P((int reg, unsigned int data));
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS)
 
@@ -83,17 +83,17 @@ extern int      gus_base;
 extern int      gus_irq, gus_dma;
 static long     gus_mem_size = 0;
 static long     free_mem_ptr = 0;
-       int	gus_busy[MAX_AUDIO_DEV], gus_dspnum=0;
+static int	gus_busy[MAX_AUDIO_DEV], gus_dspnum=0;
 static int	gus_dma_read=0;
 static int      nr_voices = 0;
-       int      gus_devnum = 0;
+static int      gus_devnum = 0;
 static int      volume_base, volume_scale, volume_method;
 static int      gus_recmask = SOUND_MASK_MIC;
 static int      recording_active = 0;
 static int      only_read_access = 0;
 
 int             gus_wave_volume = 60;
-int             gus_pcm_volume = 80;
+static int      gus_pcm_volume = 80;
 int             have_gus_max = 0;
 static int      gus_line_vol = 100, gus_mic_vol = 0;
 static unsigned char mix_image = 0x00;
@@ -135,7 +135,7 @@ static int      pcm_current_intrflag;
 static char    *gus_copy_buf;
 #endif
 
-struct voice_info voices[32];
+static struct voice_info voices[32];
 
 static int      freq_div_table[] =
 {
@@ -262,7 +262,7 @@ gus_write8 (int reg, unsigned int data)
   RESTORE_INTR (flags);
 }
 
-unsigned char
+static unsigned char
 gus_read8 (int reg)
 {				/* Reads from an indirect register (8 bit). Offset 0x80. */
   unsigned long   flags;
@@ -276,7 +276,7 @@ gus_read8 (int reg)
   return val;
 }
 
-unsigned char
+static unsigned char
 gus_look8 (int reg)
 {				/* Reads from an indirect register (8 bit). No additional offset. */
   unsigned long   flags;
@@ -290,7 +290,7 @@ gus_look8 (int reg)
   return val;
 }
 
-void
+static void
 gus_write16 (int reg, unsigned int data)
 {				/* Writes to an indirect register (16 bit) */
   unsigned long   flags;
@@ -305,7 +305,7 @@ gus_write16 (int reg, unsigned int data)
   RESTORE_INTR (flags);
 }
 
-unsigned short
+static unsigned short
 gus_read16 (int reg)
 {				/* Reads from an indirect register (16 bit). Offset 0x80. */
   unsigned long   flags;
@@ -323,7 +323,7 @@ gus_read16 (int reg)
   return ((hi << 8) & 0xff00) | lo;
 }
 
-void
+static void
 gus_write_addr (int reg, unsigned long address, int is16bit)
 {				/* Writes an 24 bit memory address */
   unsigned long   hold_address;
diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c
index f2f2d67a123e..f1a5cf2ae8f2 100644
--- a/sys/i386/isa/sound/midibuf.c
+++ b/sys/i386/isa/sound/midibuf.c
@@ -29,7 +29,7 @@
 
 #include "sound_config.h"
 
-extern void drain_midi_queue __P((int dev));
+static void drain_midi_queue __P((int dev));
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_MIDI)
 
@@ -89,7 +89,7 @@ static volatile int open_devs = 0;
 	  RESTORE_INTR(flags); \
 	}
 
-void
+static void
 drain_midi_queue (int dev)
 {
 
diff --git a/sys/i386/isa/sound/opl3.c b/sys/i386/isa/sound/opl3.c
index 87487b64ec57..4b0771a8a7e2 100644
--- a/sys/i386/isa/sound/opl3.c
+++ b/sys/i386/isa/sound/opl3.c
@@ -373,7 +373,7 @@ opl3_set_instr (int dev, int voice, int instr_no)
  * volume -8 it was implemented as a table because it is only 128 bytes and
  * it saves a lot of log() calculations. (RH)
  */
-char            fm_volume_table[128] =
+static char fm_volume_table[128] =
 {-64, -48, -40, -35, -32, -29, -27, -26,	/*
 						 * 0 -   7
 						 */
diff --git a/sys/i386/isa/sound/pas.h b/sys/i386/isa/sound/pas.h
index 54c6432c97b9..c4af2d499db4 100644
--- a/sys/i386/isa/sound/pas.h
+++ b/sys/i386/isa/sound/pas.h
@@ -138,25 +138,22 @@
 #define PAS_16D		4
 
 #ifdef DEFINE_TRANSLATIONS
-	unsigned char I_C_2_PCM_DMA_translate[] = 		/* R W  PCM		PCM DMA channel value translations		*/
+static	unsigned char I_C_2_PCM_DMA_translate[] = 		/* R W  PCM		PCM DMA channel value translations		*/
 			{ 4, 1, 2, 3, 0, 5, 6, 7 };
-	unsigned char I_C_3_PCM_IRQ_translate[] = 		/* R W	PCM		PCM IRQ level value translation			*/
+static	unsigned char I_C_3_PCM_IRQ_translate[] = 		/* R W	PCM		PCM IRQ level value translation			*/
 		{ 0,  0,  1,  2,  3,  4,  5,  6, 0,  1,  7,  8,  9,  0, 10, 11 };  
-	unsigned char E_C_MPU401_IRQ_translate[] = 		/* R W	MIDI		MPU401 emulation IRQ value translation		*/
+#ifdef unused
+static	unsigned char E_C_MPU401_IRQ_translate[] = 		/* R W	MIDI		MPU401 emulation IRQ value translation		*/
 		{ 0x00, 0x00, 0x01, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x01, 0x05, 0x06, 0x07 };
-	unsigned char E_C_SB_IRQ_translate[] = 			/* R W	PCM		SB emulation IRQ translate			*/
+#endif
+static	unsigned char E_C_SB_IRQ_translate[] = 			/* R W	PCM		SB emulation IRQ translate			*/
 		{ 0x00, 0x00, 0x08, 0x10, 0x00, 0x18, 0x00, 0x20, 0x00, 0x08, 0x28, 0x30, 0x38, 0, 0 };
-	unsigned char E_C_SB_DMA_translate[] = 			/* R W	PCM		SB emulation DMA translate			*/
+static	unsigned char E_C_SB_DMA_translate[] = 			/* R W	PCM		SB emulation DMA translate			*/
 		{ 0x00, 0x40, 0x80, 0xC0, 0, 0, 0, 0 };
-	unsigned char O_M_1_to_card[] = 				/* R W	Control		Translate (OM1 & 0x0f) to card type		*/
+#ifdef unused
+static	unsigned char O_M_1_to_card[] = 				/* R W	Control		Translate (OM1 & 0x0f) to card type		*/
 		{ 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 4, 0, 2, 3 };   
-#else
-	extern unsigned char I_C_2_PCM_DMA_translate[];		/* R W  PCM		PCM DMA channel value translations		*/
-	extern unsigned char I_C_3_PCM_IRQ_translate[];		/* R W	PCM		PCM IRQ level value translation			*/
-	extern unsigned char E_C_MPU401_IRQ_translate[];		/* R W	MIDI		MPU401 emulation IRQ value translation		*/
-	extern unsigned char E_C_SB_IRQ_translate[];		/* R W	PCM		SB emulation IRQ translate			*/
-	extern unsigned char E_C_SB_DMA_translate[];		/* R W	PCM		SB emulation DMA translate			*/
-	extern unsigned char O_M_1_to_card[];			/* R W	Control		Translate (OM1 & 0x0f) to card type		*/
+#endif
 #endif
 
 #define PARALLEL_MIXER			0x078B		/*   W	Mixer		Documented for MVD101 as FM Mono Right decode?? */
diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c
index ef0236b0693a..3f72359e9f1b 100644
--- a/sys/i386/isa/sound/pas2_card.c
+++ b/sys/i386/isa/sound/pas2_card.c
@@ -35,9 +35,9 @@
 #define DEFINE_TRANSLATIONS
 #include "pas.h"
 
-extern int config_pas_hw __P((struct address_info *hw_config));
-extern int detect_pas_hw __P((struct address_info *hw_config));
-extern void pas2_msg __P((char *foo));
+static int config_pas_hw __P((struct address_info *hw_config));
+static int detect_pas_hw __P((struct address_info *hw_config));
+static void pas2_msg __P((char *foo));
 
 /*
  * The Address Translation code is used to convert I/O register addresses to
@@ -75,7 +75,7 @@ pas_write (unsigned char data, int ioaddr)
   OUTB (data, ioaddr ^ translat_code);
 }
 
-void
+static void
 pas2_msg (char *foo)
 {
   printk ("    PAS2: %s.\n", foo);
@@ -151,7 +151,7 @@ pas_remove_intr (int mask)
 
 /******************* Begin of the Initialization Code ******************/
 
-int
+static int
 config_pas_hw (struct address_info *hw_config)
 {
   char            ok = 1;
@@ -312,7 +312,7 @@ config_pas_hw (struct address_info *hw_config)
   return ok;
 }
 
-int
+static int
 detect_pas_hw (struct address_info *hw_config)
 {
   unsigned char   board_id, foo;
diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c
index 7442ae56252f..f6fd0b6fd67c 100644
--- a/sys/i386/isa/sound/pas2_mixer.c
+++ b/sys/i386/isa/sound/pas2_mixer.c
@@ -36,8 +36,8 @@
 #include "pas.h"
 
 extern void mix_write __P((unsigned char data, int ioaddr));
-extern int pas_mixer_ioctl __P((int dev, unsigned int cmd, unsigned int arg));
-extern void set_mode __P((int new_mode));
+static int pas_mixer_ioctl __P((int dev, unsigned int cmd, unsigned int arg));
+static void set_mode __P((int new_mode));
 
 #define TRACE(what)		/* (what) */
 
@@ -126,7 +126,7 @@ mixer_output (int right_vol, int left_vol, int div, int bits,
   return (left_vol | (right_vol << 8));
 }
 
-void
+static void
 set_mode (int new_mode)
 {
   mix_write (P_M_MV508_ADDRESS | P_M_MV508_MODE, PARALLEL_MIXER);
diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c
index 26deb84211a3..67a3199ff425 100644
--- a/sys/i386/isa/sound/pas2_pcm.c
+++ b/sys/i386/isa/sound/pas2_pcm.c
@@ -34,9 +34,9 @@
 
 #include "pas.h"
 
-extern int pcm_set_bits __P((int arg));
-extern int pcm_set_channels __P((int arg));
-extern int pcm_set_speed __P((int arg));
+static int pcm_set_bits __P((int arg));
+static int pcm_set_channels __P((int arg));
+static int pcm_set_speed __P((int arg));
 
 #if !defined(EXCLUDE_PAS) && !defined(EXCLUDE_AUDIO)
 
@@ -61,7 +61,7 @@ static unsigned long pcm_count = 0;
 static unsigned short pcm_bitsok = 8;	/* mask of OK bits */
 static int      my_devnum = 0;
 
-int
+static int
 pcm_set_speed (int arg)
 {
   int             foo, tmp;
@@ -120,7 +120,7 @@ pcm_set_speed (int arg)
   return pcm_speed;
 }
 
-int
+static int
 pcm_set_channels (int arg)
 {
 
@@ -140,7 +140,7 @@ pcm_set_channels (int arg)
   return pcm_channels;
 }
 
-int
+static int
 pcm_set_bits (int arg)
 {
   if ((arg & pcm_bitsok) != arg)
diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index cc303ab16a32..f94f2c4ad35b 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -58,7 +58,7 @@ extern int      sb_dsp_highspeed;
 extern volatile int sb_irq_mode;
 extern int      sb_duplex_midi;
 extern int      sb_intr_active;
-int             input_opened = 0;
+static int      input_opened = 0;
 static int      my_dev;
 
 void            (*midi_input_intr) (int dev, unsigned char data);
diff --git a/sys/i386/isa/sound/sb_mixer.h b/sys/i386/isa/sound/sb_mixer.h
index cd103a7248de..b712eea40277 100644
--- a/sys/i386/isa/sound/sb_mixer.h
+++ b/sys/i386/isa/sound/sb_mixer.h
@@ -117,7 +117,7 @@ typedef struct mixer_def mixer_ent;
 	{{reg_l, bit_l, len_l}, {reg_r, bit_r, len_r}}
 
 #ifdef __SB_MIXER_C__
-mixer_tab sbpro_mix = {
+static mixer_tab sbpro_mix = {
 MIX_ENT(SOUND_MIXER_VOLUME,	0x22, 7, 4, 0x22, 3, 4),
 MIX_ENT(SOUND_MIXER_BASS,	0x00, 0, 0, 0x00, 0, 0),
 MIX_ENT(SOUND_MIXER_TREBLE,	0x00, 0, 0, 0x00, 0, 0),
@@ -133,7 +133,7 @@ MIX_ENT(SOUND_MIXER_RECLEV,	0x00, 0, 0, 0x00, 0, 0)
 };
 
 #ifdef	__SGNXPRO__
-mixer_tab sgnxpro_mix = {
+static mixer_tab sgnxpro_mix = {
 MIX_ENT(SOUND_MIXER_VOLUME,	0x22, 7, 4, 0x22, 3, 4),
 MIX_ENT(SOUND_MIXER_BASS,	0x46, 2, 3, 0x00, 0, 0),
 MIX_ENT(SOUND_MIXER_TREBLE,	0x44, 2, 3, 0x00, 0, 0),
@@ -151,7 +151,7 @@ MIX_ENT(SOUND_MIXER_OGAIN,	0x00, 0, 0, 0x00, 0, 0)
 };
 #endif
 
-mixer_tab sb16_mix = {
+static mixer_tab sb16_mix = {
 MIX_ENT(SOUND_MIXER_VOLUME,	0x30, 7, 5, 0x31, 7, 5),
 MIX_ENT(SOUND_MIXER_BASS,	0x46, 7, 4, 0x47, 7, 4),
 MIX_ENT(SOUND_MIXER_TREBLE,	0x44, 7, 4, 0x45, 7, 4),
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index 785c5b842fc4..f6356f1e67df 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -67,9 +67,9 @@ static int      midi_opened[MAX_MIDI_DEV] =
 static int      midi_written[MAX_MIDI_DEV] =
 {0};
 
-unsigned long   prev_input_time = 0;
-int             prev_event_time;
-unsigned long   seq_time = 0;
+static unsigned long   prev_input_time = 0;
+static int             prev_event_time;
+static unsigned long   seq_time = 0;
 
 #include "tuning.h"
 
diff --git a/sys/i386/isa/sound/sound_calls.h b/sys/i386/isa/sound/sound_calls.h
index 673620444ecd..bfe2f446589c 100644
--- a/sys/i386/isa/sound/sound_calls.h
+++ b/sys/i386/isa/sound/sound_calls.h
@@ -98,7 +98,6 @@ long soundcard_init(long mem_start);
 void tenmicrosec(void);
 void request_sound_timer (int count);
 void sound_stop_timer(void);
-int snd_ioctl_return(int *addr, int value);
 int snd_set_irq_handler (int interrupt_level, INT_HANDLER_PROTO(), char *name);
 void snd_release_irq(int vect);
 void sound_dma_malloc(int dev);
@@ -183,7 +182,6 @@ int probe_gus_db16(struct address_info *hw_config);
 int gus_wave_detect(int baseaddr);
 long gus_wave_init(long mem_start, int irq, int dma, int dma_read);
 void gus_voice_irq(void);
-unsigned char gus_read8 (int reg);
 void gus_write8(int reg, unsigned int data);
 void guswave_dma_irq(void);
 void gus_delay(void);
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 4ab5480e098c..2a8525d286da 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.38 1995/12/08 23:21:13 phk Exp $
+ * $Id: soundcard.c,v 1.39 1995/12/10 02:53:07 bde Exp $
  */
 
 #include "sound_config.h"
@@ -43,17 +43,6 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
-
-u_int	snd1_imask;
-u_int	snd2_imask;
-u_int	snd3_imask;
-u_int	snd4_imask;
-u_int	snd5_imask;
-u_int	snd6_imask;
-u_int	snd7_imask;
-u_int	snd8_imask;
-u_int	snd9_imask;
-
 #define FIX_RETURN(ret) { \
 			  int tmp_ret = (ret); \
 			  if (tmp_ret<0) return -tmp_ret; else return 0; \
@@ -70,8 +59,8 @@ static void * snd_devfs_token[SND_NDEVS];
 static void * sndstat_devfs_token;
 struct selinfo selinfo[SND_NDEVS >> 4];
 
-int             sndprobe (struct isa_device *dev);
-int             sndattach (struct isa_device *dev);
+static int	sndprobe (struct isa_device *dev);
+static int	sndattach (struct isa_device *dev);
 static void	sound_mem_init(void);
 
 static d_open_t		sndopen;
@@ -161,8 +150,6 @@ sndwrite (dev_t dev, struct uio *buf, int ioflag)
 static int
 sndopen (dev_t dev, int flags, int fmt, struct proc *p)
 {
-  int             retval;
-
   dev = minor (dev);
 
   if (!soundcard_configured && dev)
@@ -287,7 +274,7 @@ driver_to_voxunit(struct isa_driver *driver)
     return(0);
 }
 
-int
+static int
 sndprobe (struct isa_device *dev)
 {
   struct address_info hw_config;
@@ -305,13 +292,12 @@ sndprobe (struct isa_device *dev)
     return 0;
 }
 
-int
+static int
 sndattach (struct isa_device *dev)
 {
-  int             i, unit;
+  int             unit;
   static int      midi_initialized = 0;
   static int      seq_initialized = 0;
-  static int 	  generic_midi_initialized = 0; 
   unsigned long	  mem_start = 0xefffffffUL;
   struct address_info hw_config;
   char name[32];
@@ -477,7 +463,7 @@ sound_stop_timer (void)
 static void
 sound_mem_init (void)
 {
-  int             i, dev;
+  int             dev;
   unsigned long   dma_pagesize;
   struct dma_buffparms *dmap;
   static unsigned long dsp_init_mask = 0;
@@ -513,7 +499,7 @@ sound_mem_init (void)
 
 	      if (tmpbuf == NULL)
 		{
-		  printk ("snd: Unable to allocate %d bytes of buffer\n",
+		  printk ("snd: Unable to allocate %ld bytes of buffer\n",
 			  audio_devs[dev]->buffsize);
 		  return;
 		}
@@ -532,15 +518,6 @@ sound_mem_init (void)
 
 #endif
 
-int
-snd_ioctl_return (int *addr, int value)
-{
-  if (value < 0)
-    return value;		/* Error */
-  suword (addr, value);
-  return 0;
-}
-
 int
 snd_set_irq_handler (int interrupt_level, INT_HANDLER_PROTO(), char *name)
 {
diff --git a/sys/i386/isa/sound/tuning.h b/sys/i386/isa/sound/tuning.h
index 858e1fe6c618..98048cc89c92 100644
--- a/sys/i386/isa/sound/tuning.h
+++ b/sys/i386/isa/sound/tuning.h
@@ -1,13 +1,13 @@
 #ifdef SEQUENCER_C
 
-unsigned short semitone_tuning[24] = 
+static unsigned short semitone_tuning[24] = 
 {
 /*   0 */ 10000, 10595, 11225, 11892, 12599, 13348, 14142, 14983, 
 /*   8 */ 15874, 16818, 17818, 18877, 20000, 21189, 22449, 23784, 
 /*  16 */ 25198, 26697, 28284, 29966, 31748, 33636, 35636, 37755
 };
 
-unsigned short cent_tuning[100] =
+static unsigned short cent_tuning[100] =
 {
 /*   0 */ 10000, 10006, 10012, 10017, 10023, 10029, 10035, 10041, 
 /*   8 */ 10046, 10052, 10058, 10064, 10070, 10075, 10081, 10087, 
@@ -23,7 +23,4 @@ unsigned short cent_tuning[100] =
 /*  88 */ 10521, 10528, 10534, 10540, 10546, 10552, 10558, 10564, 
 /*  96 */ 10570, 10576, 10582, 10589
 };
-#else
-extern unsigned short semitone_tuning[24];
-extern unsigned short cent_tuning[100];
 #endif