7 files changed, 14 insertions, 22 deletions
diff --git a/src/audio_out/audio_alsa05_out.c b/src/audio_out/audio_alsa05_out.c
index 14f1a2259..338a22a73 100644
--- a/src/audio_out/audio_alsa05_out.c
+++ b/src/audio_out/audio_alsa05_out.c
@@ -24,7 +24,7 @@
  * for the SPDIF A52 sync part
  * (c) 2000 Andy Lo A Foe <andy@alsaplayer.org>
  *
- * $Id: audio_alsa05_out.c,v 1.10 2001/09/06 15:40:47 joachim_koenig Exp $
+ * $Id: audio_alsa05_out.c,v 1.11 2001/11/17 14:26:37 f1rmb Exp $
  */
 
 /* required for swab() */
@@ -44,11 +44,10 @@
 #include <sys/asoundlib.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
 #include "audio_out.h"
 #include "metronom.h"
 #include "resample.h"
-#include "utils.h"
+#include "xineutils.h"
 
 #define AO_ALSA_IFACE_VERSION   2
 
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 18a7488ec..419957690 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.35 2001/11/14 22:04:38 siggi Exp $
+ * $Id: audio_alsa_out.c,v 1.36 2001/11/17 14:26:37 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -61,9 +61,8 @@
 
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "audio_out.h"
-#include "utils.h"
 
 #ifndef AFMT_S16_NE
 # if defined(sparc) || defined(__sparc__) || defined(PPC)
diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c
index bcd9a4e21..682c4a6ce 100644
--- a/src/audio_out/audio_arts_out.c
+++ b/src/audio_out/audio_arts_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_arts_out.c,v 1.6 2001/10/12 19:25:11 miguelfreitas Exp $
+ * $Id: audio_arts_out.c,v 1.7 2001/11/17 14:26:37 f1rmb Exp $
  */
 
 /* required for swab() */
@@ -38,9 +38,8 @@
 #include <artsc.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "audio_out.h"
-#include "utils.h"
 
 #define AO_OUT_ARTS_IFACE_VERSION 2
 
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 9a3a77a10..8a20bdad8 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_esd_out.c,v 1.12 2001/10/14 17:16:11 guenter Exp $
+ * $Id: audio_esd_out.c,v 1.13 2001/11/17 14:26:37 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -35,10 +35,9 @@
 #include <inttypes.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "audio_out.h"
 #include "metronom.h"
-#include "utils.h"
 
 #define AO_OUT_ESD_IFACE_VERSION 2
 
diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
index 063b917fa..56e857283 100644
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_irixal_out.c,v 1.2 2001/09/14 20:44:01 jcdutton Exp $
+ * $Id: audio_irixal_out.c,v 1.3 2001/11/17 14:26:37 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -52,9 +52,8 @@
 
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "audio_out.h"
-#include "utils.h"
 
 //#ifndef AFMT_S16_NE
 //# if defined(sparc) || defined(__sparc__) || defined(PPC)
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index b1598005d..388adc9f5 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_oss_out.c,v 1.48 2001/11/04 22:49:38 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.49 2001/11/17 14:26:37 f1rmb Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -60,9 +60,8 @@
 #include <inttypes.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "audio_out.h"
-#include "utils.h"
 
 #include <sys/time.h>
 
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index e8b68ee00..e765e956b 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_sun_out.c,v 1.13 2001/10/06 13:49:49 jkeil Exp $
+ * $Id: audio_sun_out.c,v 1.14 2001/11/17 14:26:37 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -39,10 +39,8 @@
 #endif
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "audio_out.h"
-#include "utils.h"
-
 
 #ifndef	AUDIO_CHANNELS_MONO
 #define	AUDIO_CHANNELS_MONO	1