diff --git a/ChangeLog b/ChangeLog
index e16bcff0e7..e4f2af1d80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-28  Michael Smith <msmith@songbirdnest.com>
+
+	* gst/playback/test4.c:
+	* gst/playback/test5.c:
+	* gst/playback/test6.c:
+	* gst/tcp/gstmultifdsink.c:
+	  Include stdlib.h and unistd.h only if the appropriate HAVE_*_H macro
+	  is defined.
+
 2008-04-28  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst-libs/gst/audio/gstbaseaudiosink.h:
diff --git a/gst/playback/test4.c b/gst/playback/test4.c
index 62323db177..8e7b335940 100644
--- a/gst/playback/test4.c
+++ b/gst/playback/test4.c
@@ -16,8 +16,12 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>             /* exit() */
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include <gst/gst.h>
 
diff --git a/gst/playback/test5.c b/gst/playback/test5.c
index 96f197ffab..ace1596010 100644
--- a/gst/playback/test5.c
+++ b/gst/playback/test5.c
@@ -16,8 +16,12 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>             /* exit */
+#endif
 #include <gst/gst.h>
 
 static GMainLoop *loop;
diff --git a/gst/playback/test6.c b/gst/playback/test6.c
index 9942d0b3e5..3928dcff31 100644
--- a/gst/playback/test6.c
+++ b/gst/playback/test6.c
@@ -16,8 +16,12 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>             /* exit */
+#endif
 #include <gst/gst.h>
 
 static void
diff --git a/gst/tcp/gstmultifdsink.c b/gst/tcp/gstmultifdsink.c
index 7dd0fe85cf..6b70e6f112 100644
--- a/gst/tcp/gstmultifdsink.c
+++ b/gst/tcp/gstmultifdsink.c
@@ -117,7 +117,11 @@
 #include <gst/gst-i18n-plugin.h>
 
 #include <sys/ioctl.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/socket.h>