diff --git a/sys/dev/sound/isa/ad1816.c b/sys/dev/sound/isa/ad1816.c
index b2841b20fc5e..be84f433583c 100644
--- a/sys/dev/sound/isa/ad1816.c
+++ b/sys/dev/sound/isa/ad1816.c
@@ -28,11 +28,11 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 #if NPCM > 0 && NPNP > 0
 
-#include <dev/pcm/isa/ad1816.h>
+#include <dev/sound/isa/ad1816.h>
 
 struct ad1816_info;
 
diff --git a/sys/dev/sound/isa/es1888.c b/sys/dev/sound/isa/es1888.c
index 75df6b4f87ec..d19deea63931 100644
--- a/sys/dev/sound/isa/es1888.c
+++ b/sys/dev/sound/isa/es1888.c
@@ -26,8 +26,8 @@
  *	$FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
-#include <dev/pcm/isa/sb.h>
+#include <dev/sound/pcm/sound.h>
+#include <dev/sound/isa/sb.h>
 
 #if NPCM > 0
 
diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index 1c1cd30675d5..c1e98dd326e7 100644
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -28,12 +28,12 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 #if NPCM > 0
 
 /* board-specific include files */
-#include <dev/pcm/isa/mss.h>
+#include <dev/sound/isa/mss.h>
 
 struct mss_info;
 
diff --git a/sys/dev/sound/isa/sb.c b/sys/dev/sound/isa/sb.c
index ed1eefee3312..8c41bacedf6e 100644
--- a/sys/dev/sound/isa/sb.c
+++ b/sys/dev/sound/isa/sb.c
@@ -31,11 +31,11 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 #if NPCM > 0
 
 #define __SB_MIXER_C__	/* XXX warning... */
-#include  <dev/pcm/isa/sb.h>
+#include  <dev/sound/isa/sb.h>
 
 /* channel interface */
 static void *sbchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir);
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index ed1eefee3312..8c41bacedf6e 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -31,11 +31,11 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 #if NPCM > 0
 
 #define __SB_MIXER_C__	/* XXX warning... */
-#include  <dev/pcm/isa/sb.h>
+#include  <dev/sound/isa/sb.h>
 
 /* channel interface */
 static void *sbchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir);
diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index ed1eefee3312..8c41bacedf6e 100644
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -31,11 +31,11 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 #if NPCM > 0
 
 #define __SB_MIXER_C__	/* XXX warning... */
-#include  <dev/pcm/isa/sb.h>
+#include  <dev/sound/isa/sb.h>
 
 /* channel interface */
 static void *sbchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir);
diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c
index 941bdc59d3e8..cbbe18f71514 100644
--- a/sys/dev/sound/pci/aureal.c
+++ b/sys/dev/sound/pci/aureal.c
@@ -29,9 +29,9 @@
 #include "pci.h"
 #include "pcm.h"
 
-#include <dev/pcm/sound.h>
-#include <dev/pcm/ac97.h>
-#include <dev/pcm/pci/aureal.h>
+#include <dev/sound/pcm/sound.h>
+#include <dev/sound/pcm/ac97.h>
+#include <dev/sound/pci/aureal.h>
 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 2ef00e9fefc6..8f1496066006 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -53,9 +53,9 @@
 #include "pci.h"
 #include "pcm.h"
 
-#include <dev/pcm/sound.h>
-#include <dev/pcm/ac97.h>
-#include <dev/pcm/pci/es137x.h>
+#include <dev/sound/pcm/sound.h>
+#include <dev/sound/pcm/ac97.h>
+#include <dev/sound/pci/es137x.h>
 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 795f4d42c543..c3e6b413d630 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -29,9 +29,9 @@
 #include "pci.h"
 #include "pcm.h"
 
-#include <dev/pcm/sound.h>
-#include <dev/pcm/ac97.h>
-#include <dev/pcm/pci/t4dwave.h>
+#include <dev/sound/pcm/sound.h>
+#include <dev/sound/pcm/ac97.h>
+#include <dev/sound/pci/t4dwave.h>
 
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
index 18c38e7d885b..dfb1e1ca73c8 100644
--- a/sys/dev/sound/pcm/ac97.c
+++ b/sys/dev/sound/pcm/ac97.c
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
-#include <dev/pcm/ac97.h>
+#include <dev/sound/pcm/sound.h>
+#include <dev/sound/pcm/ac97.h>
 
 #define AC97_MUTE	0x8000
 
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 38e1796bee97..3cdc3e9e5efd 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -27,7 +27,7 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 #define MIN_CHUNK_SIZE 		256	/* for uiomove etc. */
 #define	DMA_ALIGN_THRESHOLD	4
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 7347e3c321ee..3990866648f3 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -30,7 +30,7 @@
 #include <sys/queue.h>
 #include <sys/kernel.h>
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 static int getchns(snddev_info *d, int chan, pcm_channel **rdch, pcm_channel **wrch);
 
diff --git a/sys/dev/sound/pcm/fake.c b/sys/dev/sound/pcm/fake.c
index b04eea7ce04a..68ef6d3f7609 100644
--- a/sys/dev/sound/pcm/fake.c
+++ b/sys/dev/sound/pcm/fake.c
@@ -28,7 +28,7 @@
 
 #include "pcm.h"
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 /* channel interface */
 static void *fkchan_init(void *devinfo, snd_dbuf *b, pcm_channel *c, int dir);
diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c
index 055dc98d65df..a545c1fe91f7 100644
--- a/sys/dev/sound/pcm/feeder.c
+++ b/sys/dev/sound/pcm/feeder.c
@@ -26,7 +26,7 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 static int chn_addfeeder(pcm_channel *c, pcm_feeder *f);
 static int chn_removefeeder(pcm_channel *c);
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 9f9e8d3310cb..2a00a12f54a8 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -26,7 +26,7 @@
  * $FreeBSD$
  */
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 
 static u_int16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = {
 	[SOUND_MIXER_VOLUME]	= 75,
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 4a39eec18716..4d8b64e9bc09 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -29,7 +29,7 @@
 
 #include "opt_devfs.h"
 
-#include <dev/pcm/sound.h>
+#include <dev/sound/pcm/sound.h>
 #ifdef DEVFS
 #include <sys/devfsext.h>
 #endif /* DEVFS */
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 6ef6c726671b..40a5c139b41f 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -89,10 +89,10 @@ struct isa_device { int dummy; };
 
 #endif	/* _OS_H_ */
 
-#include <dev/pcm/datatypes.h>
-#include <dev/pcm/channel.h>
-#include <dev/pcm/mixer.h>
-#include <dev/pcm/dsp.h>
+#include <dev/sound/pcm/datatypes.h>
+#include <dev/sound/pcm/channel.h>
+#include <dev/sound/pcm/mixer.h>
+#include <dev/sound/pcm/dsp.h>
 
 #define	MAGIC(unit) (0xa4d10de0 + unit)