diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 2a2183288fc342dbce0b9bcc1895ad22eed08a0e..dfd56be842afa59207fee94142d15f92268126e5 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -7,19 +7,17 @@ OBJS    = alldevices.o                                                  \
           avdevice.o                                                    \
 
 # input/output devices
-OBJS-$(CONFIG_ALSA_INDEV)                += alsa-audio-common.o \
-                                            alsa-audio-dec.o
-OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa-audio-common.o \
-                                            alsa-audio-enc.o
+OBJS-$(CONFIG_ALSA_INDEV)                += alsa_dec.o alsa.o
+OBJS-$(CONFIG_ALSA_OUTDEV)               += alsa_enc.o alsa.o
 OBJS-$(CONFIG_BKTR_INDEV)                += bktr.o
 OBJS-$(CONFIG_DV1394_INDEV)              += dv1394.o
 OBJS-$(CONFIG_FBDEV_INDEV)               += fbdev.o
-OBJS-$(CONFIG_JACK_INDEV)                += jack_audio.o timefilter.o
-OBJS-$(CONFIG_OSS_INDEV)                 += oss_audio.o oss_audio_dec.o
-OBJS-$(CONFIG_OSS_OUTDEV)                += oss_audio.o oss_audio_enc.o
+OBJS-$(CONFIG_JACK_INDEV)                += jack.o timefilter.o
+OBJS-$(CONFIG_OSS_INDEV)                 += oss_dec.o oss.o
+OBJS-$(CONFIG_OSS_OUTDEV)                += oss_enc.o oss.o
 OBJS-$(CONFIG_PULSE_INDEV)               += pulse.o
-OBJS-$(CONFIG_SNDIO_INDEV)               += sndio_common.o sndio_dec.o
-OBJS-$(CONFIG_SNDIO_OUTDEV)              += sndio_common.o sndio_enc.o
+OBJS-$(CONFIG_SNDIO_INDEV)               += sndio_dec.o sndio.o
+OBJS-$(CONFIG_SNDIO_OUTDEV)              += sndio_enc.o sndio.o
 OBJS-$(CONFIG_V4L2_INDEV)                += v4l2.o
 OBJS-$(CONFIG_VFWCAP_INDEV)              += vfwcap.o
 OBJS-$(CONFIG_X11GRAB_INDEV)             += x11grab.o
@@ -31,7 +29,7 @@ OBJS-$(CONFIG_LIBDC1394_INDEV)           += libdc1394.o
 
 OBJS-$(HAVE_LIBC_MSVCRT)                 += file_open.o
 
-SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa-audio.h
-SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio_common.h
+SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H)     += alsa.h
+SKIPHEADERS-$(HAVE_SNDIO_H)              += sndio.h
 
 TESTPROGS = timefilter
diff --git a/libavdevice/alsa-audio-common.c b/libavdevice/alsa.c
similarity index 99%
rename from libavdevice/alsa-audio-common.c
rename to libavdevice/alsa.c
index 21f159424167f5928e5476f2d0353504faad4877..6d682676023670e47afa8e4113612cf7a2c469e4 100644
--- a/libavdevice/alsa-audio-common.c
+++ b/libavdevice/alsa.c
@@ -33,7 +33,7 @@
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"
 
-#include "alsa-audio.h"
+#include "alsa.h"
 
 static av_cold snd_pcm_format_t codec_id_to_pcm_format(int codec_id)
 {
diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa.h
similarity index 96%
rename from libavdevice/alsa-audio.h
rename to libavdevice/alsa.h
index 26eaee6acf6e938c1ce91934f67bc34675ce77c1..590b3540534938fbeec538cef468cff7cdb0328c 100644
--- a/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa.h
@@ -27,8 +27,8 @@
  * @author Benoit Fouet ( benoit fouet free fr )
  */
 
-#ifndef AVDEVICE_ALSA_AUDIO_H
-#define AVDEVICE_ALSA_AUDIO_H
+#ifndef AVDEVICE_ALSA_H
+#define AVDEVICE_ALSA_H
 
 #include <alsa/asoundlib.h>
 #include "config.h"
@@ -93,4 +93,4 @@ int ff_alsa_xrun_recover(AVFormatContext *s1, int err);
 
 int ff_alsa_extend_reorder_buf(AlsaData *s, int size);
 
-#endif /* AVDEVICE_ALSA_AUDIO_H */
+#endif /* AVDEVICE_ALSA_H */
diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa_dec.c
similarity index 99%
rename from libavdevice/alsa-audio-dec.c
rename to libavdevice/alsa_dec.c
index a6a814b80fb029551abba3f6339f5ca099e0dbaf..2cc5b7d5746e338024b899c181b925ce70020de7 100644
--- a/libavdevice/alsa-audio-dec.c
+++ b/libavdevice/alsa_dec.c
@@ -53,7 +53,7 @@
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-#include "alsa-audio.h"
+#include "alsa.h"
 
 static av_cold int audio_read_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/alsa-audio-enc.c b/libavdevice/alsa_enc.c
similarity index 99%
rename from libavdevice/alsa-audio-enc.c
rename to libavdevice/alsa_enc.c
index db4f5e426f6992e927bcb7a2997c9cac726839b1..30c1719203cbb0c67cfb2f963be6f06d886c85d9 100644
--- a/libavdevice/alsa-audio-enc.c
+++ b/libavdevice/alsa_enc.c
@@ -43,7 +43,7 @@
 
 #include "libavformat/avformat.h"
 
-#include "alsa-audio.h"
+#include "alsa.h"
 
 static av_cold int audio_write_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/jack_audio.c b/libavdevice/jack.c
similarity index 100%
rename from libavdevice/jack_audio.c
rename to libavdevice/jack.c
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss.c
similarity index 99%
rename from libavdevice/oss_audio.c
rename to libavdevice/oss.c
index 4feb937134f47c4a3c478bb0a0482b624ce4965b..eb8d4544223b43bdc105c1294e4461f26f828c1d 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss.c
@@ -39,7 +39,7 @@
 
 #include "libavformat/avformat.h"
 
-#include "oss_audio.h"
+#include "oss.h"
 
 int ff_oss_audio_open(AVFormatContext *s1, int is_output,
                       const char *audio_device)
diff --git a/libavdevice/oss_audio.h b/libavdevice/oss.h
similarity index 93%
rename from libavdevice/oss_audio.h
rename to libavdevice/oss.h
index 87ac4adfd5222da9532a9fbaa4d0ca79eb11d0d4..0fbe14b3ec1ab21ba6599df0cf895eba7057c8c4 100644
--- a/libavdevice/oss_audio.h
+++ b/libavdevice/oss.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVDEVICE_OSS_AUDIO_H
-#define AVDEVICE_OSS_AUDIO_H
+#ifndef AVDEVICE_OSS_H
+#define AVDEVICE_OSS_H
 
 #include "libavcodec/avcodec.h"
 
@@ -42,4 +42,4 @@ int ff_oss_audio_open(AVFormatContext *s1, int is_output,
 
 int ff_oss_audio_close(OSSAudioData *s);
 
-#endif /* AVDEVICE_OSS_AUDIO_H */
+#endif /* AVDEVICE_OSS_H */
diff --git a/libavdevice/oss_audio_dec.c b/libavdevice/oss_dec.c
similarity index 99%
rename from libavdevice/oss_audio_dec.c
rename to libavdevice/oss_dec.c
index 601d91c31f53b8b4c2c4cc5b0f0fdae8d0c96b77..3f786cc356b6db94055adac56667915a75ec4647 100644
--- a/libavdevice/oss_audio_dec.c
+++ b/libavdevice/oss_dec.c
@@ -42,7 +42,7 @@
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-#include "oss_audio.h"
+#include "oss.h"
 
 static int audio_read_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/oss_audio_enc.c b/libavdevice/oss_enc.c
similarity index 99%
rename from libavdevice/oss_audio_enc.c
rename to libavdevice/oss_enc.c
index 688982a00fd7c38637f20b2c9690156a036487b2..2f075589a976b90b0e0a8facddbfe6c1554209e0 100644
--- a/libavdevice/oss_audio_enc.c
+++ b/libavdevice/oss_enc.c
@@ -38,7 +38,7 @@
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-#include "oss_audio.h"
+#include "oss.h"
 
 static int audio_write_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/sndio_common.c b/libavdevice/sndio.c
similarity index 99%
rename from libavdevice/sndio_common.c
rename to libavdevice/sndio.c
index 1bea6c5be1615f64affe85a8008a493aed6458d5..739551b84128e235a571a601c5f1d82cdda560f3 100644
--- a/libavdevice/sndio_common.c
+++ b/libavdevice/sndio.c
@@ -24,7 +24,7 @@
 
 #include "libavformat/avformat.h"
 
-#include "sndio_common.h"
+#include "libavdevice/sndio.h"
 
 static inline void movecb(void *addr, int delta)
 {
diff --git a/libavdevice/sndio_common.h b/libavdevice/sndio.h
similarity index 92%
rename from libavdevice/sndio_common.h
rename to libavdevice/sndio.h
index 2f70213aed3981608c305dd6ef6dfe0e69c61c5f..cd5c55ecc5462e6552ddf50999e0941eb58d6b6c 100644
--- a/libavdevice/sndio_common.h
+++ b/libavdevice/sndio.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVDEVICE_SNDIO_COMMON_H
-#define AVDEVICE_SNDIO_COMMON_H
+#ifndef AVDEVICE_SNDIO_H
+#define AVDEVICE_SNDIO_H
 
 #include <stdint.h>
 #include <sndio.h>
@@ -45,4 +45,4 @@ typedef struct SndioData {
 int ff_sndio_open(AVFormatContext *s1, int is_output, const char *audio_device);
 int ff_sndio_close(SndioData *s);
 
-#endif /* AVDEVICE_SNDIO_COMMON_H */
+#endif /* AVDEVICE_SNDIO_H */
diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c
index 24c6d1e7da2ae5919cf981c214044cb847f22f30..7ebb8c3ccc19bb5adf367cd58db621e4b701df5e 100644
--- a/libavdevice/sndio_dec.c
+++ b/libavdevice/sndio_dec.c
@@ -29,7 +29,7 @@
 #include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 
-#include "sndio_common.h"
+#include "libavdevice/sndio.h"
 
 static av_cold int audio_read_header(AVFormatContext *s1)
 {
diff --git a/libavdevice/sndio_enc.c b/libavdevice/sndio_enc.c
index 61ac398a847a3a6cc47fcb7334e2c50c76ae9a38..fad361062b76b4f340560e34cfb080880cd15ed6 100644
--- a/libavdevice/sndio_enc.c
+++ b/libavdevice/sndio_enc.c
@@ -26,7 +26,7 @@
 
 #include "libavformat/avformat.h"
 
-#include "sndio_common.h"
+#include "libavdevice/sndio.h"
 
 static av_cold int audio_write_header(AVFormatContext *s1)
 {