Index: sys/oss/gstossdmabuffer.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstossdmabuffer.c,v
retrieving revision 1.4
diff -u -p -r1.4 gstossdmabuffer.c
--- sys/oss/gstossdmabuffer.c	21 Nov 2005 16:36:05 -0000	1.4
+++ sys/oss/gstossdmabuffer.c	10 Dec 2005 13:18:34 -0000
@@ -27,7 +27,21 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/mman.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
+
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <pthread.h>
Index: sys/oss/gstosshelper.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstosshelper.c,v
retrieving revision 1.8
diff -u -p -r1.8 gstosshelper.c
--- sys/oss/gstosshelper.c	26 Oct 2005 11:12:34 -0000	1.8
+++ sys/oss/gstosshelper.c	10 Dec 2005 13:18:34 -0000
@@ -33,7 +33,19 @@
 #include <errno.h>
 #include <string.h>
 
-#include <sys/soundcard.h>
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include <gst/interfaces/propertyprobe.h>
 
@@ -43,30 +55,6 @@
 GST_DEBUG_CATEGORY_EXTERN (oss_debug);
 #define GST_CAT_DEFAULT oss_debug
 
-#if 0
-
-#ifdef HAVE_OSS_INCLUDE_IN_SYS
-#include <sys/soundcard.h>
-#else
-
-#ifdef HAVE_OSS_INCLUDE_IN_ROOT
-#include <soundcard.h>
-#else
-
-#include <machine/soundcard.h>
-
-#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-
-#endif /* HAVE_OSS_INCLUDE_IN_SYS */
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/ioctl.h>
-#include <glib.h>
-#endif /* 0 */
-
 typedef struct _GstOssProbe GstOssProbe;
 struct _GstOssProbe
 {
Index: sys/oss/gstossmixer.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstossmixer.c,v
retrieving revision 1.22
diff -u -p -r1.22 gstossmixer.c
--- sys/oss/gstossmixer.c	26 Oct 2005 11:12:34 -0000	1.22
+++ sys/oss/gstossmixer.c	10 Dec 2005 13:18:35 -0000
@@ -30,7 +30,20 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include <gst/gst-i18n-plugin.h>
 
Index: sys/oss/gstossmixertrack.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstossmixertrack.c,v
retrieving revision 1.2
diff -u -p -r1.2 gstossmixertrack.c
--- sys/oss/gstossmixertrack.c	26 Oct 2005 11:12:34 -0000	1.2
+++ sys/oss/gstossmixertrack.c	10 Dec 2005 13:18:35 -0000
@@ -30,7 +30,20 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/ioctl.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include <gst/gst-i18n-plugin.h>
 
Index: sys/oss/gstosssink.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstosssink.c,v
retrieving revision 1.111
diff -u -p -r1.111 gstosssink.c
--- sys/oss/gstosssink.c	6 Dec 2005 19:44:57 -0000	1.111
+++ sys/oss/gstosssink.c	10 Dec 2005 13:18:35 -0000
@@ -28,8 +28,20 @@
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/soundcard.h>
 
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include "gstosssink.h"
 
Index: sys/oss/gstosssrc.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/gstosssrc.c,v
retrieving revision 1.67
diff -u -p -r1.67 gstosssrc.c
--- sys/oss/gstosssrc.c	6 Dec 2005 19:44:57 -0000	1.67
+++ sys/oss/gstosssrc.c	10 Dec 2005 13:18:36 -0000
@@ -23,12 +23,26 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-#include <sys/soundcard.h>
+
+#ifdef HAVE_OSS_INCLUDE_IN_SYS
+# include <sys/soundcard.h>
+#else
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
+#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include "gstosssrc.h"
 
Index: sys/oss/oss_probe.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/sys/oss/oss_probe.c,v
retrieving revision 1.5
diff -u -p -r1.5 oss_probe.c
--- sys/oss/oss_probe.c	8 Jul 2005 11:19:19 -0000	1.5
+++ sys/oss/oss_probe.c	10 Dec 2005 13:18:36 -0000
@@ -3,6 +3,7 @@
 #include "config.h"
 #endif
 
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ -11,17 +12,17 @@
 #include <glib.h>
 
 #ifdef HAVE_OSS_INCLUDE_IN_SYS
-#include <sys/soundcard.h>
-#else
-
-#ifdef HAVE_OSS_INCLUDE_IN_ROOT
-#include <soundcard.h>
+# include <sys/soundcard.h>
 #else
-
-#include <machine/soundcard.h>
-
-#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-
+# ifdef HAVE_OSS_INCLUDE_IN_ROOT
+#  include <soundcard.h>
+# else
+#  ifdef HAVE_OSS_INCLUDE_IN_MACHINE
+#   include <machine/soundcard.h>
+#  else
+#   error "What to include?"
+#  endif /* HAVE_OSS_INCLUDE_IN_MACHINE */
+# endif /* HAVE_OSS_INCLUDE_IN_ROOT */
 #endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 typedef struct _Probe Probe;
