Updated #includes to 4.4Lite style.

36 files changed, 78 insertions, 78 deletions

diff --git a/sys/i386/isa/sound/ad1848.c b/sys/i386/isa/sound/ad1848.c
index 024b62f..8c385bd 100644
--- a/sys/i386/isa/sound/ad1848.c
+++ b/sys/i386/isa/sound/ad1848.c
@@ -36,11 +36,11 @@
 
 #define DEB(x)
 #define DEB1(x)
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_AD1848)
 
-#include "ad1848_mixer.h"
+#include <i386/isa/sound/ad1848_mixer.h>
 
 #define IMODE_NONE		0
 #define IMODE_OUTPUT		1
@@ -1356,7 +1356,7 @@ mozart_init (int io_base)
 #endif /* MOZART_PORT */
 
 #ifdef OPTI_MAD16_PORT
-#include "mad16.h"
+#include <i386/isa/sound/mad16.h>
 #endif
 
 /*
diff --git a/sys/i386/isa/sound/adlib_card.c b/sys/i386/isa/sound/adlib_card.c
index 6365069..aabd837 100644
--- a/sys/i386/isa/sound/adlib_card.c
+++ b/sys/i386/isa/sound/adlib_card.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_YM3812)
 
diff --git a/sys/i386/isa/sound/aedsp16.c b/sys/i386/isa/sound/aedsp16.c
index b14a246..a292d9e 100644
--- a/sys/i386/isa/sound/aedsp16.c
+++ b/sys/i386/isa/sound/aedsp16.c
@@ -225,7 +225,7 @@
  * Include the main voxware header file. It include all the os/voxware/etc
  * headers needed by this source.
  */
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 /*
  * all but ioport.h :)
  */
diff --git a/sys/i386/isa/sound/audio.c b/sys/i386/isa/sound/audio.c
index 770babc..c6f7972 100644
--- a/sys/i386/isa/sound/audio.c
+++ b/sys/i386/isa/sound/audio.c
@@ -27,13 +27,13 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 #ifndef EXCLUDE_AUDIO
 
-#include "ulaw.h"
-#include "coproc.h"
+#include <i386/isa/sound/ulaw.h>
+#include <i386/isa/sound/coproc.h>
 
 #define ON		1
 #define OFF		0
diff --git a/sys/i386/isa/sound/dev_table.c b/sys/i386/isa/sound/dev_table.c
index bfd8e58..4902324 100644
--- a/sys/i386/isa/sound/dev_table.c
+++ b/sys/i386/isa/sound/dev_table.c
@@ -28,7 +28,7 @@
  */
 
 #define _DEV_TABLE_C_
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index bb64d7d..20095d2 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
diff --git a/sys/i386/isa/sound/gus_card.c b/sys/i386/isa/sound/gus_card.c
index 4a07fd3..0e96df1 100644
--- a/sys/i386/isa/sound/gus_card.c
+++ b/sys/i386/isa/sound/gus_card.c
@@ -27,11 +27,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS)
 
-#include "gus_hw.h"
+#include <i386/isa/sound/gus_hw.h>
 
 int             gus_base, gus_irq, gus_dma;
 extern int      gus_wave_volume;
diff --git a/sys/i386/isa/sound/gus_midi.c b/sys/i386/isa/sound/gus_midi.c
index 66c81df..876c665 100644
--- a/sys/i386/isa/sound/gus_midi.c
+++ b/sys/i386/isa/sound/gus_midi.c
@@ -27,11 +27,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
-#include "gus_hw.h"
+#include <i386/isa/sound/gus_hw.h>
 
 #if !defined(EXCLUDE_GUS) && !defined(EXCLUDE_MIDI)
 
@@ -225,7 +225,7 @@ gus_midi_buffer_status (int dev)
 
 #define MIDI_SYNTH_NAME	"Gravis Ultrasound Midi"
 #define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct midi_operations gus_midi_operations =
 {
diff --git a/sys/i386/isa/sound/gus_vol.c b/sys/i386/isa/sound/gus_vol.c
index 3e58dce..a8f1121 100644
--- a/sys/i386/isa/sound/gus_vol.c
+++ b/sys/i386/isa/sound/gus_vol.c
@@ -3,9 +3,9 @@
  *
  * Greg Lee 1993.
  */
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 #ifndef EXCLUDE_GUS
-#include "gus_linearvol.h"
+#include <i386/isa/sound/gus_linearvol.h>
 
 extern unsigned short gus_adagio_vol (int vel, int mainv, int xpn, int voicev);
 extern unsigned short gus_linear_vol (int vol, int mainvol);
diff --git a/sys/i386/isa/sound/gus_wave.c b/sys/i386/isa/sound/gus_wave.c
index fe88539..e0f946d6 100644
--- a/sys/i386/isa/sound/gus_wave.c
+++ b/sys/i386/isa/sound/gus_wave.c
@@ -27,9 +27,9 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 #include <machine/ultrasound.h>
-#include "gus_hw.h"
+#include <i386/isa/sound/gus_hw.h>
 
 static unsigned char gus_look8 __P((int reg));
 static unsigned short gus_read16 __P((int reg));
diff --git a/sys/i386/isa/sound/ics2101.c b/sys/i386/isa/sound/ics2101.c
index 3a76ea9..cec1e51 100644
--- a/sys/i386/isa/sound/ics2101.c
+++ b/sys/i386/isa/sound/ics2101.c
@@ -27,11 +27,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_GUS)
 
 #include <machine/ultrasound.h>
-#include "gus_hw.h"
+#include <i386/isa/sound/gus_hw.h>
 
 #define MIX_DEVS	(SOUND_MASK_MIC|SOUND_MASK_LINE| \
 			 SOUND_MASK_SYNTH| \
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h
index 4cf2b46..e80b780 100644
--- a/sys/i386/isa/sound/local.h
+++ b/sys/i386/isa/sound/local.h
@@ -57,7 +57,7 @@
 # define GUSMAX_MIXER
 #endif
 
-#include <sb.h>
+#include "sb.h"
 #if NSB == 0 && !defined(EXCLUDE_SB)
 #define EXCLUDE_SB
 #endif
@@ -72,7 +72,7 @@
 #define EXCLUDE_SB16MIDI
 #endif
 
-#include <pas.h>
+#include "pas.h"
 #if NPAS == 0 && !defined(EXCLUDE_PAS)
 #define EXCLUDE_PAS
 #endif
diff --git a/sys/i386/isa/sound/midi_synth.c b/sys/i386/isa/sound/midi_synth.c
index e2a1c2c..fb1fdc4 100644
--- a/sys/i386/isa/sound/midi_synth.c
+++ b/sys/i386/isa/sound/midi_synth.c
@@ -30,7 +30,7 @@
 #define USE_SEQ_MACROS
 #define USE_SIMPLE_MACROS
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_MIDI)
 
@@ -38,7 +38,7 @@
 
 DEFINE_WAIT_QUEUE (sysex_sleeper, sysex_sleep_flag);
 
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static int      midi2synth[MAX_MIDI_DEV];
 static unsigned char prev_out_status[MAX_MIDI_DEV];
diff --git a/sys/i386/isa/sound/midibuf.c b/sys/i386/isa/sound/midibuf.c
index f1a5cf2..c05d440 100644
--- a/sys/i386/isa/sound/midibuf.c
+++ b/sys/i386/isa/sound/midibuf.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 static void drain_midi_queue __P((int dev));
 
diff --git a/sys/i386/isa/sound/mpu401.c b/sys/i386/isa/sound/mpu401.c
index 7b1616d..eaee157 100644
--- a/sys/i386/isa/sound/mpu401.c
+++ b/sys/i386/isa/sound/mpu401.c
@@ -33,12 +33,12 @@
 #define USE_SEQ_MACROS
 #define USE_SIMPLE_MACROS
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
 #if (!defined(EXCLUDE_MPU401) || !defined(EXCLUDE_MPU_EMU)) && !defined(EXCLUDE_MIDI)
-#include "coproc.h"
+#include <i386/isa/sound/coproc.h>
 
 static int      init_sequence[20];	/* NOTE! pos 0 = len, start pos 1. */
 static int      timer_mode = TMR_INTERNAL, timer_caps = TMR_INTERNAL;
@@ -937,7 +937,7 @@ mpu_synth_close (int dev)
 
 #define MIDI_SYNTH_NAME	"MPU-401 UART Midi"
 #define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct synth_operations mpu401_synth_proto =
 {
diff --git a/sys/i386/isa/sound/opl3.c b/sys/i386/isa/sound/opl3.c
index 4b0771a..b3660b7 100644
--- a/sys/i386/isa/sound/opl3.c
+++ b/sys/i386/isa/sound/opl3.c
@@ -34,11 +34,11 @@
  * hooft@chem.ruu.nl
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_YM3812)
 
-#include "opl3.h"
+#include <i386/isa/sound/opl3.h>
 
 #define MAX_VOICE	18
 #define OFFS_4OP	11	/*
diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c
index 3f72359..eeff8ae 100644
--- a/sys/i386/isa/sound/pas2_card.c
+++ b/sys/i386/isa/sound/pas2_card.c
@@ -28,12 +28,12 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
 
 #define DEFINE_TRANSLATIONS
-#include "pas.h"
+#include <i386/isa/sound/pas.h>
 
 static int config_pas_hw __P((struct address_info *hw_config));
 static int detect_pas_hw __P((struct address_info *hw_config));
diff --git a/sys/i386/isa/sound/pas2_midi.c b/sys/i386/isa/sound/pas2_midi.c
index 6db884b..a83158e 100644
--- a/sys/i386/isa/sound/pas2_midi.c
+++ b/sys/i386/isa/sound/pas2_midi.c
@@ -27,11 +27,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
-#include "pas.h"
+#include <i386/isa/sound/pas.h>
 
 #if !defined(EXCLUDE_PAS) && !defined(EXCLUDE_MIDI) && defined(EXCLUDE_PRO_MIDI)
 
@@ -233,7 +233,7 @@ pas_buffer_status (int dev)
 
 #define MIDI_SYNTH_NAME	"Pro Audio Spectrum Midi"
 #define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct midi_operations pas_midi_operations =
 {
diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c
index f6fd0b6..c1ba76b 100644
--- a/sys/i386/isa/sound/pas2_mixer.c
+++ b/sys/i386/isa/sound/pas2_mixer.c
@@ -29,11 +29,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
 
-#include "pas.h"
+#include <i386/isa/sound/pas.h>
 
 extern void mix_write __P((unsigned char data, int ioaddr));
 static int pas_mixer_ioctl __P((int dev, unsigned int cmd, unsigned int arg));
diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c
index 8a9c172..97ae76c 100644
--- a/sys/i386/isa/sound/pas2_pcm.c
+++ b/sys/i386/isa/sound/pas2_pcm.c
@@ -28,11 +28,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
-#include "pas.h"
+#include <i386/isa/sound/pas.h>
 
 static int pcm_set_bits __P((int arg));
 static int pcm_set_channels __P((int arg));
diff --git a/sys/i386/isa/sound/patmgr.c b/sys/i386/isa/sound/patmgr.c
index fc201dd..f013984 100644
--- a/sys/i386/isa/sound/patmgr.c
+++ b/sys/i386/isa/sound/patmgr.c
@@ -28,7 +28,7 @@
  */
 
 #define PATMGR_C
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SEQUENCER)
 
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index d093efb..d5af2c1 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -34,9 +34,9 @@
 /*
  * #define DEB_DMARES
  */
-#include "sound_config.h"
-#include "sb.h"
-#include "sb_mixer.h"
+#include <i386/isa/sound/sound_config.h>
+#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_mixer.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_AUDIO) && !defined(EXCLUDE_SBPRO)
 
diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c
index fd53cbe..4e45e2e 100644
--- a/sys/i386/isa/sound/sb16_midi.c
+++ b/sys/i386/isa/sound/sb16_midi.c
@@ -27,13 +27,13 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
 #if !defined(EXCLUDE_SB) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_MIDI)
 
-#include "sb.h"
+#include <i386/isa/sound/sb.h>
 
 #define	DATAPORT   (sb16midi_base)
 #define	COMDPORT   (sb16midi_base+1)
@@ -176,7 +176,7 @@ sb16midi_buffer_status (int dev)
 
 #define MIDI_SYNTH_NAME	"SoundBlaster 16 Midi"
 #define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct midi_operations sb16midi_operations =
 {
diff --git a/sys/i386/isa/sound/sb_card.c b/sys/i386/isa/sound/sb_card.c
index b8e5af2..37455d1 100644
--- a/sys/i386/isa/sound/sb_card.c
+++ b/sys/i386/isa/sound/sb_card.c
@@ -30,7 +30,7 @@
  *  - Added the Audio Excel DSP 16 initialization routine.
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB)
 
diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c
index f5507e9..560fc79 100644
--- a/sys/i386/isa/sound/sb_dsp.c
+++ b/sys/i386/isa/sound/sb_dsp.c
@@ -33,12 +33,12 @@
  *      Code added for MV ProSonic/Jazz 16 in 16 bit mode
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB)
 
-#include "sb.h"
-#include "sb_mixer.h"
+#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_mixer.h>
 #undef SB_TEST_IRQ
 
 int             sbc_base = 0;
@@ -901,7 +901,7 @@ static int
 initialize_smw (void)
 {
 #ifdef SMW_MIDI0001_INCLUDED
-#include "smw-midi0001.h"
+#include <i386/isa/sound/smw-midi0001.h>
 #else
   unsigned char   smw_ucode[1];
   int             smw_ucodeLen = 0;
diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index f94f2c4..de661ac 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -27,11 +27,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_MIDI)
 
-#include "sb.h"
+#include <i386/isa/sound/sb.h>
 #undef SB_TEST_IRQ
 
 /*
@@ -211,7 +211,7 @@ sb_midi_interrupt (int dummy)
 
 #define MIDI_SYNTH_NAME	"SoundBlaster Midi"
 #define MIDI_SYNTH_CAPS	0
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct midi_operations sb_midi_operations =
 {
diff --git a/sys/i386/isa/sound/sb_mixer.c b/sys/i386/isa/sound/sb_mixer.c
index b96c24c..4fd2db2 100644
--- a/sys/i386/isa/sound/sb_mixer.c
+++ b/sys/i386/isa/sound/sb_mixer.c
@@ -32,13 +32,13 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_SBPRO)
 #define __SB_MIXER_C__
 
-#include "sb.h"
-#include "sb_mixer.h"
+#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_mixer.h>
 #undef SB_TEST_IRQ
 
 extern int      sbc_base;
diff --git a/sys/i386/isa/sound/sequencer.c b/sys/i386/isa/sound/sequencer.c
index f6356f1..b49baed 100644
--- a/sys/i386/isa/sound/sequencer.c
+++ b/sys/i386/isa/sound/sequencer.c
@@ -28,8 +28,8 @@
  */
 
 #define SEQUENCER_C
-#include "sound_config.h"
-#include "midi_ctrl.h"
+#include <i386/isa/sound/sound_config.h>
+#include <i386/isa/sound/midi_ctrl.h>
 
 extern void seq_drain_midi_queues __P((void));
 
@@ -71,7 +71,7 @@ static unsigned long   prev_input_time = 0;
 static int             prev_event_time;
 static unsigned long   seq_time = 0;
 
-#include "tuning.h"
+#include <i386/isa/sound/tuning.h>
 
 #define EV_SZ	8
 #define IEV_SZ	8
diff --git a/sys/i386/isa/sound/sound_config.h b/sys/i386/isa/sound/sound_config.h
index 17810b8..daafcbe 100644
--- a/sys/i386/isa/sound/sound_config.h
+++ b/sys/i386/isa/sound/sound_config.h
@@ -28,9 +28,9 @@
  *
  */
 
-#include "local.h"
-#include "os.h"
-#include "soundvers.h"
+#include <i386/isa/sound/local.h>
+#include <i386/isa/sound/os.h>
+#include <i386/isa/sound/soundvers.h>
 
 #if !defined(PSS_MPU_BASE) && defined(EXCLUDE_SSCAPE) && defined(EXCLUDE_TRIX)
 #define EXCLUDE_MPU_EMU
@@ -334,8 +334,8 @@ struct channel_info {
 #define OPEN_WRITE	2
 #define OPEN_READWRITE	3
 
-#include "sound_calls.h"
-#include "dev_table.h"
+#include <i386/isa/sound/sound_calls.h>
+#include <i386/isa/sound/dev_table.h>
 
 #ifndef DEB
 #define DEB(x)
diff --git a/sys/i386/isa/sound/sound_switch.c b/sys/i386/isa/sound/sound_switch.c
index 2b9233f..21bcd69 100644
--- a/sys/i386/isa/sound/sound_switch.c
+++ b/sys/i386/isa/sound/sound_switch.c
@@ -27,7 +27,7 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
diff --git a/sys/i386/isa/sound/sound_timer.c b/sys/i386/isa/sound/sound_timer.c
index e318779..8e4e002 100644
--- a/sys/i386/isa/sound/sound_timer.c
+++ b/sys/i386/isa/sound/sound_timer.c
@@ -29,7 +29,7 @@
  */
 
 #define SEQUENCER_C
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
diff --git a/sys/i386/isa/sound/soundcard.c b/sys/i386/isa/sound/soundcard.c
index 1747749..c7af8ab 100644
--- a/sys/i386/isa/sound/soundcard.c
+++ b/sys/i386/isa/sound/soundcard.c
@@ -26,16 +26,16 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.c,v 1.41 1996/01/18 20:54:15 ache Exp $
+ * $Id: soundcard.c,v 1.42 1996/03/28 14:31:13 scrappy Exp $
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
-#include "dev_table.h"
+#include <i386/isa/sound/dev_table.h>
 #include <i386/isa/isa_device.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/sound/sscape.c b/sys/i386/isa/sound/sscape.c
index 9204b18..23d39ce 100644
--- a/sys/i386/isa/sound/sscape.c
+++ b/sys/i386/isa/sound/sscape.c
@@ -27,11 +27,11 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SSCAPE)
 
-#include "coproc.h"
+#include <i386/isa/sound/coproc.h>
 
 /*
  *    I/O ports
diff --git a/sys/i386/isa/sound/sys_timer.c b/sys/i386/isa/sound/sys_timer.c
index 6366c22..2c752f7 100644
--- a/sys/i386/isa/sound/sys_timer.c
+++ b/sys/i386/isa/sound/sys_timer.c
@@ -29,7 +29,7 @@
  */
 
 #define SEQUENCER_C
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
diff --git a/sys/i386/isa/sound/trix.c b/sys/i386/isa/sound/trix.c
index 6e3db0f..21ca20a 100644
--- a/sys/i386/isa/sound/trix.c
+++ b/sys/i386/isa/sound/trix.c
@@ -28,12 +28,12 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_TRIX)
 
 #ifdef INCLUDE_TRIX_BOOT
-#include "trix_boot.h"
+#include <i386/isa/sound/trix_boot.h>
 #endif
 
 static int      kilroy_was_here = 0;	/* Don't detect twice */
diff --git a/sys/i386/isa/sound/uart6850.c b/sys/i386/isa/sound/uart6850.c
index ba5aac6..d925727 100644
--- a/sys/i386/isa/sound/uart6850.c
+++ b/sys/i386/isa/sound/uart6850.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "sound_config.h"
+#include <i386/isa/sound/sound_config.h>
 
 #ifdef CONFIGURE_SOUNDCARD
 
@@ -236,7 +236,7 @@ uart6850_buffer_status (int dev)
 
 #define MIDI_SYNTH_NAME	"6850 UART Midi"
 #define MIDI_SYNTH_CAPS	SYNTH_CAP_INPUT
-#include "midi_synth.h"
+#include <i386/isa/sound/midi_synth.h>
 
 static struct midi_operations uart6850_operations =
 {