From 3b54dace2ded6c7a1e7577ef13014079923e3af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Fri, 24 Nov 2017 13:41:20 +0100
Subject: [PATCH] tests: include config.h and don't include unix headers

In many cases the unistd.h includes weren't actually needed.

Preparation for making tests work on Windows with MSVC.
---
 tests/check/elements/capsfilter.c     | 3 +++
 tests/check/elements/dataurisrc.c     | 5 +++--
 tests/check/elements/fakesink.c       | 5 +++--
 tests/check/elements/fakesrc.c        | 5 +++--
 tests/check/elements/fdsrc.c          | 5 +++++
 tests/check/elements/filesink.c       | 6 +-----
 tests/check/elements/filesrc.c        | 8 +++-----
 tests/check/elements/identity.c       | 3 +++
 tests/check/elements/multiqueue.c     | 7 ++++---
 tests/check/elements/queue.c          | 5 +++--
 tests/check/elements/queue2.c         | 3 +++
 tests/check/elements/selector.c       | 3 +++
 tests/check/elements/tee.c            | 8 +++-----
 tests/check/elements/valve.c          | 3 +++
 tests/check/generic/sinks.c           | 3 +++
 tests/check/generic/states.c          | 2 --
 tests/check/gst/gst.c                 | 3 +++
 tests/check/gst/gstabi.c              | 4 +++-
 tests/check/gst/gstatomicqueue.c      | 3 +++
 tests/check/gst/gstbin.c              | 3 +++
 tests/check/gst/gstbufferlist.c       | 3 +++
 tests/check/gst/gstbufferpool.c       | 3 +++
 tests/check/gst/gstbus.c              | 3 +++
 tests/check/gst/gstcaps.c             | 4 +++-
 tests/check/gst/gstcapsfeatures.c     | 3 +++
 tests/check/gst/gstchildproxy.c       | 3 +++
 tests/check/gst/gstclock.c            | 3 +++
 tests/check/gst/gstcontext.c          | 3 +++
 tests/check/gst/gstcontroller.c       | 2 +-
 tests/check/gst/gstcpp.cc             | 3 +++
 tests/check/gst/gstevent.c            | 4 +++-
 tests/check/gst/gstghostpad.c         | 3 +++
 tests/check/gst/gstindex.c            | 3 +++
 tests/check/gst/gstinfo.c             | 3 +++
 tests/check/gst/gstiterator.c         | 4 +++-
 tests/check/gst/gstmessage.c          | 3 +++
 tests/check/gst/gstminiobject.c       | 3 +++
 tests/check/gst/gstpad.c              | 3 +++
 tests/check/gst/gstparamspecs.c       | 3 +++
 tests/check/gst/gstplugin.c           | 3 ++-
 tests/check/gst/gstpoll.c             | 5 ++++-
 tests/check/gst/gstpreset.c           | 8 ++++++++
 tests/check/gst/gstprintf.c           | 3 +++
 tests/check/gst/gstpromise.c          | 3 +++
 tests/check/gst/gstprotection.c       | 3 +++
 tests/check/gst/gstquery.c            | 5 ++++-
 tests/check/gst/gstsegment.c          | 3 +++
 tests/check/gst/gststream.c           | 4 +++-
 tests/check/gst/gststructure.c        | 4 +++-
 tests/check/gst/gstsystemclock.c      | 3 +++
 tests/check/gst/gsttag.c              | 3 +++
 tests/check/gst/gsttagsetter.c        | 3 +++
 tests/check/gst/gsttask.c             | 3 +++
 tests/check/gst/gsttoc.c              | 3 +++
 tests/check/gst/gsttocsetter.c        | 3 +++
 tests/check/gst/gsttracerrecord.c     | 3 +++
 tests/check/gst/gsturi.c              | 3 +++
 tests/check/gst/gstvalue.c            | 4 +++-
 tests/check/libs/adapter.c            | 3 +++
 tests/check/libs/gstharness.c         | 3 +++
 tests/check/libs/gstnetclientclock.c  | 5 +++--
 tests/check/libs/gstnettimeprovider.c | 5 +++--
 tests/check/libs/gsttestclock.c       | 3 +++
 63 files changed, 191 insertions(+), 43 deletions(-)

diff --git a/tests/check/elements/capsfilter.c b/tests/check/elements/capsfilter.c
index 008fee97e8..b5c0a7bf59 100644
--- a/tests/check/elements/capsfilter.c
+++ b/tests/check/elements/capsfilter.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/dataurisrc.c b/tests/check/elements/dataurisrc.c
index 888c626f74..decbe6175c 100644
--- a/tests/check/elements/dataurisrc.c
+++ b/tests/check/elements/dataurisrc.c
@@ -17,8 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/fakesink.c b/tests/check/elements/fakesink.c
index 0f811b1a19..b8e7321bb3 100644
--- a/tests/check/elements/fakesink.c
+++ b/tests/check/elements/fakesink.c
@@ -21,8 +21,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/base/gstpushsrc.h>
 #include <gst/check/gstcheck.h>
diff --git a/tests/check/elements/fakesrc.c b/tests/check/elements/fakesrc.c
index 55605f7862..8de2c7c96f 100644
--- a/tests/check/elements/fakesrc.c
+++ b/tests/check/elements/fakesrc.c
@@ -19,8 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/fdsrc.c b/tests/check/elements/fdsrc.c
index ffe6194b70..8e1c4217a0 100644
--- a/tests/check/elements/fdsrc.c
+++ b/tests/check/elements/fdsrc.c
@@ -19,8 +19,13 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/tests/check/elements/filesink.c b/tests/check/elements/filesink.c
index cc42c8aab6..430085f800 100644
--- a/tests/check/elements/filesink.c
+++ b/tests/check/elements/filesink.c
@@ -28,10 +28,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>             /* for close() */
-#endif
-
 #include <gst/check/gstcheck.h>
 
 static GstPad *mysrcpad;
@@ -205,7 +201,7 @@ create_temporary_file (void)
     return NULL;
   }
   /* don't want the file, just a filename (hence silly, see above) */
-  close (fd);
+  g_close (fd, NULL);
   g_remove (tmp_fn);
 
   return tmp_fn;
diff --git a/tests/check/elements/filesrc.c b/tests/check/elements/filesrc.c
index d60f18f95e..fd42284049 100644
--- a/tests/check/elements/filesrc.c
+++ b/tests/check/elements/filesrc.c
@@ -17,11 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/identity.c b/tests/check/elements/identity.c
index bf66776233..63f2f0ba43 100644
--- a/tests/check/elements/identity.c
+++ b/tests/check/elements/identity.c
@@ -20,6 +20,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/check/gstharness.h>
diff --git a/tests/check/elements/multiqueue.c b/tests/check/elements/multiqueue.c
index e99f555231..edc5144c91 100644
--- a/tests/check/elements/multiqueue.c
+++ b/tests/check/elements/multiqueue.c
@@ -17,8 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
@@ -1339,7 +1340,7 @@ GST_START_TEST (test_limit_changes)
 
   /* Wait until we are actually blocking... we unfortunately can't
    * know that without sleeping */
-  sleep (1);
+  g_usleep (G_USEC_PER_SEC);
   g_object_set (mq, "max-size-buffers", (guint) 3, NULL);
   g_thread_join (thread);
 
diff --git a/tests/check/elements/queue.c b/tests/check/elements/queue.c
index 8619909787..50f28964b5 100644
--- a/tests/check/elements/queue.c
+++ b/tests/check/elements/queue.c
@@ -19,8 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/queue2.c b/tests/check/elements/queue2.c
index 7a4fc5ca7b..5707d1c097 100644
--- a/tests/check/elements/queue2.c
+++ b/tests/check/elements/queue2.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/selector.c b/tests/check/elements/selector.c
index c7320e63b8..ac4f3ec793 100644
--- a/tests/check/elements/selector.c
+++ b/tests/check/elements/selector.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/tee.c b/tests/check/elements/tee.c
index 80c9e88e42..acee40c701 100644
--- a/tests/check/elements/tee.c
+++ b/tests/check/elements/tee.c
@@ -21,11 +21,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/elements/valve.c b/tests/check/elements/valve.c
index d0314812d0..e6d7f37dd1 100644
--- a/tests/check/elements/valve.c
+++ b/tests/check/elements/valve.c
@@ -21,6 +21,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/check/gstharness.h>
diff --git a/tests/check/generic/sinks.c b/tests/check/generic/sinks.c
index 2d606114c5..0a0e95d79b 100644
--- a/tests/check/generic/sinks.c
+++ b/tests/check/generic/sinks.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/generic/states.c b/tests/check/generic/states.c
index 8085877a62..7f95686a95 100644
--- a/tests/check/generic/states.c
+++ b/tests/check/generic/states.c
@@ -24,8 +24,6 @@
 #  include "config.h"
 #endif
 
-#include <unistd.h>
-
 #include <gst/check/gstcheck.h>
 
 static GList *elements = NULL;
diff --git a/tests/check/gst/gst.c b/tests/check/gst/gst.c
index bbe953d287..fc8276381e 100644
--- a/tests/check/gst/gst.c
+++ b/tests/check/gst/gst.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gstversion.h>
diff --git a/tests/check/gst/gstabi.c b/tests/check/gst/gstabi.c
index 2356cb10ac..72d1f337b0 100644
--- a/tests/check/gst/gstabi.c
+++ b/tests/check/gst/gstabi.c
@@ -19,7 +19,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <gst/check/gstcheck.h>
 
 #ifdef HAVE_CPU_I386
diff --git a/tests/check/gst/gstatomicqueue.c b/tests/check/gst/gstatomicqueue.c
index 4262c41d82..a516421a1f 100644
--- a/tests/check/gst/gstatomicqueue.c
+++ b/tests/check/gst/gstatomicqueue.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gstatomicqueue.h>
diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c
index 9ac461ea52..21e6043afd 100644
--- a/tests/check/gst/gstbin.c
+++ b/tests/check/gst/gstbin.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/base/gstbasesrc.h>
diff --git a/tests/check/gst/gstbufferlist.c b/tests/check/gst/gstbufferlist.c
index a04ebe5ed4..54e7257297 100644
--- a/tests/check/gst/gstbufferlist.c
+++ b/tests/check/gst/gstbufferlist.c
@@ -20,6 +20,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gstbufferlist.h>
diff --git a/tests/check/gst/gstbufferpool.c b/tests/check/gst/gstbufferpool.c
index 8b05324b30..8b9b0b3514 100644
--- a/tests/check/gst/gstbufferpool.c
+++ b/tests/check/gst/gstbufferpool.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstbus.c b/tests/check/gst/gstbus.c
index f0308c6353..f8d6cb0786 100644
--- a/tests/check/gst/gstbus.c
+++ b/tests/check/gst/gstbus.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstcaps.c b/tests/check/gst/gstcaps.c
index 0809d7a7d7..a85a033e44 100644
--- a/tests/check/gst/gstcaps.c
+++ b/tests/check/gst/gstcaps.c
@@ -19,7 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gstcaps.h>
diff --git a/tests/check/gst/gstcapsfeatures.c b/tests/check/gst/gstcapsfeatures.c
index 5f76aa7d25..9af126f8ab 100644
--- a/tests/check/gst/gstcapsfeatures.c
+++ b/tests/check/gst/gstcapsfeatures.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gstcapsfeatures.h>
diff --git a/tests/check/gst/gstchildproxy.c b/tests/check/gst/gstchildproxy.c
index 35c9d3743b..47ce459341 100644
--- a/tests/check/gst/gstchildproxy.c
+++ b/tests/check/gst/gstchildproxy.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstclock.c b/tests/check/gst/gstclock.c
index 3bf1db260b..92446a5ec2 100644
--- a/tests/check/gst/gstclock.c
+++ b/tests/check/gst/gstclock.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstcontext.c b/tests/check/gst/gstcontext.c
index 63d8b79988..88441aed75 100644
--- a/tests/check/gst/gstcontext.c
+++ b/tests/check/gst/gstcontext.c
@@ -20,6 +20,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstcontroller.c b/tests/check/gst/gstcontroller.c
index 092a63de8a..9d81c5d931 100644
--- a/tests/check/gst/gstcontroller.c
+++ b/tests/check/gst/gstcontroller.c
@@ -24,10 +24,10 @@
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
+
 #include <gst/gst.h>
 #include <gst/check/gstcheck.h>
 
-
 /* local test element */
 
 enum
diff --git a/tests/check/gst/gstcpp.cc b/tests/check/gst/gstcpp.cc
index a96667a426..eb58be2e2c 100644
--- a/tests/check/gst/gstcpp.cc
+++ b/tests/check/gst/gstcpp.cc
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/gst.h>
 #include <gst/check/check.h>
diff --git a/tests/check/gst/gstevent.c b/tests/check/gst/gstevent.c
index 5e93b5d72b..d124c91eb8 100644
--- a/tests/check/gst/gstevent.c
+++ b/tests/check/gst/gstevent.c
@@ -18,7 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstghostpad.c b/tests/check/gst/gstghostpad.c
index 6c6f51866c..087d034ae8 100644
--- a/tests/check/gst/gstghostpad.c
+++ b/tests/check/gst/gstghostpad.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/check/gstharness.h>
diff --git a/tests/check/gst/gstindex.c b/tests/check/gst/gstindex.c
index 92b1882965..6b20b7a09b 100644
--- a/tests/check/gst/gstindex.c
+++ b/tests/check/gst/gstindex.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstinfo.c b/tests/check/gst/gstinfo.c
index 763a223b1f..6b4249dd37 100644
--- a/tests/check/gst/gstinfo.c
+++ b/tests/check/gst/gstinfo.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstiterator.c b/tests/check/gst/gstiterator.c
index 663a2d25fe..9e989f8682 100644
--- a/tests/check/gst/gstiterator.c
+++ b/tests/check/gst/gstiterator.c
@@ -18,7 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstmessage.c b/tests/check/gst/gstmessage.c
index 9c8c27ab29..461e28073c 100644
--- a/tests/check/gst/gstmessage.c
+++ b/tests/check/gst/gstmessage.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstminiobject.c b/tests/check/gst/gstminiobject.c
index d29438e127..e2cc14ebb0 100644
--- a/tests/check/gst/gstminiobject.c
+++ b/tests/check/gst/gstminiobject.c
@@ -20,6 +20,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c
index f5317c9d15..b9def0f1f9 100644
--- a/tests/check/gst/gstpad.c
+++ b/tests/check/gst/gstpad.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstparamspecs.c b/tests/check/gst/gstparamspecs.c
index ad2e99b43b..696c62b582 100644
--- a/tests/check/gst/gstparamspecs.c
+++ b/tests/check/gst/gstparamspecs.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gst.h>
diff --git a/tests/check/gst/gstplugin.c b/tests/check/gst/gstplugin.c
index cb4f17d0a8..4550bca97c 100644
--- a/tests/check/gst/gstplugin.c
+++ b/tests/check/gst/gstplugin.c
@@ -20,8 +20,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstpoll.c b/tests/check/gst/gstpoll.c
index 2fd756ba73..78e73ef3df 100644
--- a/tests/check/gst/gstpoll.c
+++ b/tests/check/gst/gstpoll.c
@@ -19,14 +19,17 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#include <unistd.h>
 #include <gst/check/gstcheck.h>
 
 #ifdef G_OS_WIN32
 #include <winsock2.h>
 #include <fcntl.h>
 #else
+#include <unistd.h>
 #include <sys/socket.h>
 #endif
 
diff --git a/tests/check/gst/gstpreset.c b/tests/check/gst/gstpreset.c
index 82fca39870..dfa0c4e1a7 100644
--- a/tests/check/gst/gstpreset.c
+++ b/tests/check/gst/gstpreset.c
@@ -28,7 +28,9 @@
 #include <glib/gstdio.h>
 #include <gst/check/gstcheck.h>
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 static GType gst_preset_test_get_type (void);
 
@@ -284,7 +286,13 @@ gst_preset_suite (void)
   /* check if we can create presets */
   gst_dir = g_build_filename (g_get_user_data_dir (),
       "gstreamer-" GST_API_VERSION, NULL);
+
+#ifdef G_OS_WIN32
+  can_write = FALSE;            /* FIXME: test properly using win32 API */
+#else
   can_write = (g_access (gst_dir, R_OK | W_OK | X_OK) == 0);
+#endif
+
   g_free (gst_dir);
 
   suite_add_tcase (s, tc);
diff --git a/tests/check/gst/gstprintf.c b/tests/check/gst/gstprintf.c
index 7fca6490cc..3e01df0d05 100644
--- a/tests/check/gst/gstprintf.c
+++ b/tests/check/gst/gstprintf.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstpromise.c b/tests/check/gst/gstpromise.c
index af06f24ef7..76533990a2 100644
--- a/tests/check/gst/gstpromise.c
+++ b/tests/check/gst/gstpromise.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstprotection.c b/tests/check/gst/gstprotection.c
index b5dae25afb..1669c81c3b 100644
--- a/tests/check/gst/gstprotection.c
+++ b/tests/check/gst/gstprotection.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gstprotection.h>
diff --git a/tests/check/gst/gstquery.c b/tests/check/gst/gstquery.c
index efd9898bec..547c622fd5 100644
--- a/tests/check/gst/gstquery.c
+++ b/tests/check/gst/gstquery.c
@@ -15,9 +15,12 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
+
 GST_START_TEST (create_queries)
 {
   GstQuery *query;
diff --git a/tests/check/gst/gstsegment.c b/tests/check/gst/gstsegment.c
index d451e3d7a7..bba31ce902 100644
--- a/tests/check/gst/gstsegment.c
+++ b/tests/check/gst/gstsegment.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gststream.c b/tests/check/gst/gststream.c
index aa09b2b7d2..4ff15d0255 100644
--- a/tests/check/gst/gststream.c
+++ b/tests/check/gst/gststream.c
@@ -18,7 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/gst.h>
 #include <gst/check/gstcheck.h>
diff --git a/tests/check/gst/gststructure.c b/tests/check/gst/gststructure.c
index 7d3f2b4f0f..cce6665c9a 100644
--- a/tests/check/gst/gststructure.c
+++ b/tests/check/gst/gststructure.c
@@ -18,7 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/gststructure.h>
 #include <gst/check/gstcheck.h>
diff --git a/tests/check/gst/gstsystemclock.c b/tests/check/gst/gstsystemclock.c
index b68d629c88..a37bb15b27 100644
--- a/tests/check/gst/gstsystemclock.c
+++ b/tests/check/gst/gstsystemclock.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gsttag.c b/tests/check/gst/gsttag.c
index 7a5e5cabf1..d330cb349c 100644
--- a/tests/check/gst/gsttag.c
+++ b/tests/check/gst/gsttag.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gsttagsetter.c b/tests/check/gst/gsttagsetter.c
index 11c16b8df0..10f68fed27 100644
--- a/tests/check/gst/gsttagsetter.c
+++ b/tests/check/gst/gsttagsetter.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gst.h>
diff --git a/tests/check/gst/gsttask.c b/tests/check/gst/gsttask.c
index db795584fe..e18a5081f9 100644
--- a/tests/check/gst/gsttask.c
+++ b/tests/check/gst/gsttask.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gsttoc.c b/tests/check/gst/gsttoc.c
index fc5d07b6b3..4abe3ad15d 100644
--- a/tests/check/gst/gsttoc.c
+++ b/tests/check/gst/gsttoc.c
@@ -28,6 +28,9 @@
  *   -chapter2    |
  *                -subchapter1
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gsttocsetter.c b/tests/check/gst/gsttocsetter.c
index 047c1e9866..f15e198626 100644
--- a/tests/check/gst/gsttocsetter.c
+++ b/tests/check/gst/gsttocsetter.c
@@ -16,6 +16,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gst.h>
diff --git a/tests/check/gst/gsttracerrecord.c b/tests/check/gst/gsttracerrecord.c
index 712d6f7e55..6dd629a00b 100644
--- a/tests/check/gst/gsttracerrecord.c
+++ b/tests/check/gst/gsttracerrecord.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/gsttracerrecord.h>
diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c
index cd23be40bd..3f753f6ec3 100644
--- a/tests/check/gst/gsturi.c
+++ b/tests/check/gst/gsturi.c
@@ -17,6 +17,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/gst/gstvalue.c b/tests/check/gst/gstvalue.c
index 483438311f..35bd23ca9c 100644
--- a/tests/check/gst/gstvalue.c
+++ b/tests/check/gst/gstvalue.c
@@ -19,7 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <gst/check/gstcheck.h>
diff --git a/tests/check/libs/adapter.c b/tests/check/libs/adapter.c
index 9bae8e9754..cedb966c82 100644
--- a/tests/check/libs/adapter.c
+++ b/tests/check/libs/adapter.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 
diff --git a/tests/check/libs/gstharness.c b/tests/check/libs/gstharness.c
index 7cd003a1ce..9edbaee7a8 100644
--- a/tests/check/libs/gstharness.c
+++ b/tests/check/libs/gstharness.c
@@ -18,6 +18,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/check/gstharness.h>
diff --git a/tests/check/libs/gstnetclientclock.c b/tests/check/libs/gstnetclientclock.c
index 1434dcb798..06ce006282 100644
--- a/tests/check/libs/gstnetclientclock.c
+++ b/tests/check/libs/gstnetclientclock.c
@@ -18,12 +18,13 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/net/gstnet.h>
 
-#include <unistd.h>
-
 GST_START_TEST (test_instantiation)
 {
   GstClock *client, *local;
diff --git a/tests/check/libs/gstnettimeprovider.c b/tests/check/libs/gstnettimeprovider.c
index 3ba2bdec83..ac5e94d00d 100644
--- a/tests/check/libs/gstnettimeprovider.c
+++ b/tests/check/libs/gstnettimeprovider.c
@@ -18,12 +18,13 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/net/gstnet.h>
 
-#include <unistd.h>
-
 GST_START_TEST (test_refcounts)
 {
   GstNetTimeProvider *ntp;
diff --git a/tests/check/libs/gsttestclock.c b/tests/check/libs/gsttestclock.c
index 7af1168c1f..e3b86fd477 100644
--- a/tests/check/libs/gsttestclock.c
+++ b/tests/check/libs/gsttestclock.c
@@ -19,6 +19,9 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <gst/check/gstcheck.h>
 #include <gst/check/gsttestclock.h>