diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 8e0b104ac4..4314d3a8ff 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -87,6 +87,7 @@ libgstvaapi_source_priv_h =			\
 	gstvaapiutils_tsb.h			\
 	gstvaapivideobuffer_priv.h		\
 	gstvaapiworkarounds.h			\
+	sysdeps.h				\
 	$(libgst_vaapi_ffmpeg_source_priv_h)	\
 	$(NULL)
 
diff --git a/gst-libs/gst/vaapi/gstvaapicodec_objects.c b/gst-libs/gst/vaapi/gstvaapicodec_objects.c
index 9a244bc9ea..7b5958d86b 100644
--- a/gst-libs/gst/vaapi/gstvaapicodec_objects.c
+++ b/gst-libs/gst/vaapi/gstvaapicodec_objects.c
@@ -20,7 +20,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/vaapi/gstvaapicontext.h>
 #include "gstvaapicodec_objects.h"
diff --git a/gst-libs/gst/vaapi/gstvaapicontext.c b/gst-libs/gst/vaapi/gstvaapicontext.c
index af57feb9a5..9b1bf1ad39 100644
--- a/gst-libs/gst/vaapi/gstvaapicontext.c
+++ b/gst-libs/gst/vaapi/gstvaapicontext.c
@@ -25,7 +25,7 @@
  * @short_description: VA context abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <assert.h>
 #include "gstvaapicompat.h"
 #include "gstvaapicontext.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder.c b/gst-libs/gst/vaapi/gstvaapidecoder.c
index 2f54e7a43d..a83004e16c 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder.c
@@ -25,7 +25,7 @@
  * @short_description: VA decoder abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapicompat.h"
 #include "gstvaapidecoder.h"
 #include "gstvaapidecoder_priv.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
index 21425ac884..f6439c0085 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
@@ -25,7 +25,7 @@
  * @short_description: FFmpeg-based decoder
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #ifdef HAVE_LIBAVCODEC_AVCODEC_H
 # include <libavcodec/avcodec.h>
 #endif
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index 247488dfc9..96398849c8 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -24,7 +24,7 @@
  * @short_description: H.264 decoder
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/base/gstadapter.h>
 #include <gst/codecparsers/gsth264parser.h>
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
index e888426264..12c2690b4f 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
@@ -24,7 +24,7 @@
  * @short_description: MPEG-2 decoder
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/base/gstbitreader.h>
 #include <gst/codecparsers/gstmpegvideoparser.h>
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
index 24a675712c..5ef2d22d4a 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
@@ -24,7 +24,7 @@
  * @short_description: MPEG-4 decoder, include h263/divx/xvid support
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/base/gstbitreader.h>
 #include <gst/codecparsers/gstmpeg4parser.h>
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_objects.c b/gst-libs/gst/vaapi/gstvaapidecoder_objects.c
index aa1d7481fa..968f86bf29 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_objects.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_objects.c
@@ -20,7 +20,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/vaapi/gstvaapicontext.h>
 #include "gstvaapidecoder_objects.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c b/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
index b305b28b8d..d7d68121c2 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
@@ -24,7 +24,7 @@
  * @short_description: VC-1 decoder
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/codecparsers/gstvc1parser.h>
 #include "gstvaapidecoder_vc1.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay.c b/gst-libs/gst/vaapi/gstvaapidisplay.c
index e975c638d6..097713c7d0 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay.c
@@ -25,7 +25,7 @@
  * @short_description: VA display abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include "gstvaapiutils.h"
 #include "gstvaapidisplay.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_glx.c b/gst-libs/gst/vaapi/gstvaapidisplay_glx.c
index 29950e8858..ccf126afa8 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_glx.c
@@ -25,7 +25,7 @@
  * @short_description: VA/GLX display abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapicompat.h"
 #include "gstvaapiutils.h"
 #include "gstvaapiutils_glx.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
index f4bd52c6e5..0f5f7ba6b3 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_x11.c
@@ -25,7 +25,7 @@
  * @short_description: VA/X11 display abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include "gstvaapiutils.h"
 #include "gstvaapidisplay_priv.h"
diff --git a/gst-libs/gst/vaapi/gstvaapidisplaycache.c b/gst-libs/gst/vaapi/gstvaapidisplaycache.c
index a6bb39d08e..54f349cc50 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplaycache.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplaycache.c
@@ -19,7 +19,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <glib.h>
 #include <string.h>
 #include "gstvaapidisplaycache.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiimage.c b/gst-libs/gst/vaapi/gstvaapiimage.c
index 9cd2639989..200da86f37 100644
--- a/gst-libs/gst/vaapi/gstvaapiimage.c
+++ b/gst-libs/gst/vaapi/gstvaapiimage.c
@@ -25,7 +25,7 @@
  * @short_description: VA image abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include "gstvaapicompat.h"
 #include "gstvaapiutils.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiimageformat.c b/gst-libs/gst/vaapi/gstvaapiimageformat.c
index a910b03c58..dd031577a9 100644
--- a/gst-libs/gst/vaapi/gstvaapiimageformat.c
+++ b/gst-libs/gst/vaapi/gstvaapiimageformat.c
@@ -25,7 +25,7 @@
  * @short_description: VA image format abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <gst/video/video.h>
 #include "gstvaapicompat.h"
 #include "gstvaapiimageformat.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiimagepool.c b/gst-libs/gst/vaapi/gstvaapiimagepool.c
index 3332931d91..159cb308ea 100644
--- a/gst-libs/gst/vaapi/gstvaapiimagepool.c
+++ b/gst-libs/gst/vaapi/gstvaapiimagepool.c
@@ -24,7 +24,7 @@
  * @short_description: VA image pool
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapiimagepool.h"
 
 #define DEBUG 1
diff --git a/gst-libs/gst/vaapi/gstvaapiobject.c b/gst-libs/gst/vaapi/gstvaapiobject.c
index f2106eb3d7..52529c0f77 100644
--- a/gst-libs/gst/vaapi/gstvaapiobject.c
+++ b/gst-libs/gst/vaapi/gstvaapiobject.c
@@ -24,7 +24,7 @@
  * @short_description: Base VA object
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapiobject.h"
 #include "gstvaapi_priv.h"
 #include "gstvaapiparamspecs.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiparamspecs.c b/gst-libs/gst/vaapi/gstvaapiparamspecs.c
index cac4027d43..8905af4d21 100644
--- a/gst-libs/gst/vaapi/gstvaapiparamspecs.c
+++ b/gst-libs/gst/vaapi/gstvaapiparamspecs.c
@@ -24,7 +24,7 @@
  * @short_description: GParamSpecs for some of our types
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapiparamspecs.h"
 #include "gstvaapivalue.h"
 
diff --git a/gst-libs/gst/vaapi/gstvaapiprofile.c b/gst-libs/gst/vaapi/gstvaapiprofile.c
index e3cddd33c6..54b7abac84 100644
--- a/gst-libs/gst/vaapi/gstvaapiprofile.c
+++ b/gst-libs/gst/vaapi/gstvaapiprofile.c
@@ -24,7 +24,7 @@
  * @short_description: VA profile abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <gst/gstbuffer.h>
 #include "gstvaapicompat.h"
diff --git a/gst-libs/gst/vaapi/gstvaapisubpicture.c b/gst-libs/gst/vaapi/gstvaapisubpicture.c
index 000ab27bde..11a94f101d 100644
--- a/gst-libs/gst/vaapi/gstvaapisubpicture.c
+++ b/gst-libs/gst/vaapi/gstvaapisubpicture.c
@@ -25,7 +25,7 @@
  * @short_description: VA subpicture abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include "gstvaapicompat.h"
 #include "gstvaapiutils.h"
diff --git a/gst-libs/gst/vaapi/gstvaapisurface.c b/gst-libs/gst/vaapi/gstvaapisurface.c
index e0b614ea09..65c4b28eed 100644
--- a/gst-libs/gst/vaapi/gstvaapisurface.c
+++ b/gst-libs/gst/vaapi/gstvaapisurface.c
@@ -25,7 +25,7 @@
  * @short_description: VA surface abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapicompat.h"
 #include "gstvaapiutils.h"
 #include "gstvaapisurface.h"
diff --git a/gst-libs/gst/vaapi/gstvaapisurfacepool.c b/gst-libs/gst/vaapi/gstvaapisurfacepool.c
index 8fe9d5d9da..b3e95380ae 100644
--- a/gst-libs/gst/vaapi/gstvaapisurfacepool.c
+++ b/gst-libs/gst/vaapi/gstvaapisurfacepool.c
@@ -24,7 +24,7 @@
  * @short_description: VA surface pool
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapisurfacepool.h"
 
 #define DEBUG 1
diff --git a/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c b/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
index 747d00f284..404583c34a 100644
--- a/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
+++ b/gst-libs/gst/vaapi/gstvaapisurfaceproxy.c
@@ -25,7 +25,7 @@
  * @short_description: VA surface proxy
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapisurfaceproxy.h"
 #include "gstvaapiobject_priv.h"
 
diff --git a/gst-libs/gst/vaapi/gstvaapitexture.c b/gst-libs/gst/vaapi/gstvaapitexture.c
index 0b7092943b..97025f2601 100644
--- a/gst-libs/gst/vaapi/gstvaapitexture.c
+++ b/gst-libs/gst/vaapi/gstvaapitexture.c
@@ -24,7 +24,7 @@
  * @short_description: VA/GLX texture abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapitexture.h"
 #include "gstvaapicompat.h"
 #include "gstvaapiutils.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiutils.c b/gst-libs/gst/vaapi/gstvaapiutils.c
index 2b8f17bd25..8d5aeccfef 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils.c
@@ -20,7 +20,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapicompat.h"
 #include "gstvaapiutils.h"
 #include "gstvaapisurface.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_glx.c b/gst-libs/gst/vaapi/gstvaapiutils_glx.c
index 527c07cb2d..bf7c3580d0 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_glx.c
@@ -21,7 +21,7 @@
  */
 
 #define _GNU_SOURCE 1 /* RTLD_DEFAULT */
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <math.h>
 #include <dlfcn.h>
diff --git a/gst-libs/gst/vaapi/gstvaapiutils_x11.c b/gst-libs/gst/vaapi/gstvaapiutils_x11.c
index 76dd78813a..abc58b8e73 100644
--- a/gst-libs/gst/vaapi/gstvaapiutils_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapiutils_x11.c
@@ -20,7 +20,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <glib.h>
 #include <X11/Xutil.h>
 #include "gstvaapiutils_x11.h"
diff --git a/gst-libs/gst/vaapi/gstvaapivalue.c b/gst-libs/gst/vaapi/gstvaapivalue.c
index 1b3da64d84..112d1b4abd 100644
--- a/gst-libs/gst/vaapi/gstvaapivalue.c
+++ b/gst-libs/gst/vaapi/gstvaapivalue.c
@@ -24,7 +24,7 @@
  * @short_description: GValue implementations specific to VA-API
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <gobject/gvaluecollector.h>
 #include "gstvaapivalue.h"
 
diff --git a/gst-libs/gst/vaapi/gstvaapivideobuffer.c b/gst-libs/gst/vaapi/gstvaapivideobuffer.c
index 3b6c98db6b..a225981adb 100644
--- a/gst-libs/gst/vaapi/gstvaapivideobuffer.c
+++ b/gst-libs/gst/vaapi/gstvaapivideobuffer.c
@@ -25,7 +25,7 @@
  * @short_description: VA video buffer for GStreamer
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapivideobuffer.h"
 #include "gstvaapivideobuffer_priv.h"
 #include "gstvaapiimagepool.h"
diff --git a/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.c b/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.c
index e71da181a7..da49a0d81c 100644
--- a/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapivideobuffer_glx.c
@@ -26,7 +26,7 @@
  * @short_description: VA video buffer for GStreamer with GLX support
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapivideobuffer_glx.h"
 #include "gstvaapivideobuffer_priv.h"
 #include "gstvaapivideoconverter_glx.h"
diff --git a/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.c b/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.c
index fdeb817e8f..a9ba30d7f2 100644
--- a/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapivideoconverter_glx.c
@@ -21,7 +21,7 @@
  *  Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include "gstvaapivideoconverter_glx.h"
 #include "gstvaapivideobuffer.h"
diff --git a/gst-libs/gst/vaapi/gstvaapivideopool.c b/gst-libs/gst/vaapi/gstvaapivideopool.c
index ec70be992a..e10648354f 100644
--- a/gst-libs/gst/vaapi/gstvaapivideopool.c
+++ b/gst-libs/gst/vaapi/gstvaapivideopool.c
@@ -24,7 +24,7 @@
  * @short_description: Video object pool abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapivideopool.h"
 
 #define DEBUG 1
diff --git a/gst-libs/gst/vaapi/gstvaapivideosink.c b/gst-libs/gst/vaapi/gstvaapivideosink.c
index 8f511d4ee1..cde38dd81a 100644
--- a/gst-libs/gst/vaapi/gstvaapivideosink.c
+++ b/gst-libs/gst/vaapi/gstvaapivideosink.c
@@ -24,7 +24,7 @@
  * @short_description: An interface for implementing VA-API sink elements
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapivideosink.h"
 
 static void
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow.c b/gst-libs/gst/vaapi/gstvaapiwindow.c
index 749b88d307..56ef8ed08c 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow.c
@@ -25,7 +25,7 @@
  * @short_description: VA window abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapiwindow.h"
 #include "gstvaapi_priv.h"
 
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_glx.c b/gst-libs/gst/vaapi/gstvaapiwindow_glx.c
index 447318ed10..45c040d700 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_glx.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_glx.c
@@ -24,7 +24,7 @@
  * @short_description: VA/GLX window abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include "gstvaapiwindow_glx.h"
 #include "gstvaapidisplay_x11.h"
 #include "gstvaapidisplay_x11_priv.h"
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
index d1f7d5ac09..51de0615bc 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_x11.c
@@ -24,7 +24,7 @@
  * @short_description: VA/X11 window abstraction
  */
 
-#include "config.h"
+#include "sysdeps.h"
 #include <string.h>
 #include <X11/Xatom.h>
 #include "gstvaapicompat.h"
diff --git a/gst-libs/gst/vaapi/sysdeps.h b/gst-libs/gst/vaapi/sysdeps.h
new file mode 100644
index 0000000000..b4a8878d16
--- /dev/null
+++ b/gst-libs/gst/vaapi/sysdeps.h
@@ -0,0 +1,29 @@
+/*
+ *  sysdeps.h - System-dependent definitions
+ *
+ *  Copyright (C) 2012 Intel Corporation
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public License
+ *  as published by the Free Software Foundation; either version 2.1
+ *  of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA
+ */
+
+#ifndef SYSDEPS_H
+#define SYSDEPS_H
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#endif /* SYSDEPS_H */