79 files changed, 718 insertions, 615 deletions
diff --git a/ChangeLog b/ChangeLog
index 76407bc7b..5caf8ab5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+  * build system improvements: replacement functions, better work with headers
+
 xine-lib (1-rc6)
   * Moved win32 frontend into separate module.
   * Fixed Xv initialization to enable multiple instances of the Xv plugin
diff --git a/Makefile.am b/Makefile.am
index 41f93d870..952d76284 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = 1.3
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc m4 intl po misc include src win32
+SUBDIRS = doc m4 intl po misc include lib src win32
 
 DEBFILES = debian/README.Debian debian/changelog debian/control \
 	debian/copyright debian/rules debian/compat \
diff --git a/configure.ac b/configure.ac
index 739d49b04..5e90d0fc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ dnl
 
 AC_INIT
 AC_CONFIG_SRCDIR([src/xine-engine/xine.c])
+AC_CONFIG_LIBOBJ_DIR([lib])
 
 dnl
 dnl Require autoconf version 2.53
@@ -164,7 +165,8 @@ AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_CHECK_SIZEOF(long)
 dnl AC_CHECK_TYPES([ptrdiff_t])
-AC_CHECK_GENERATE_INTTYPES([include])
+dnl For systems without inttypes.h would be needed extend generated replacement.
+dnl AC_CHECK_GENERATE_INTTYPES([lib])
 AC_CHECK_TYPE(ssize_t, :, AC_DEFINE(ssize_t, __int64, [define ssize_t to __int64 if it's missing in default includes]))
 
 
@@ -209,8 +211,7 @@ case "$host" in
       THREAD_LIBS='$(top_builddir)/win32/contrib/pthreads/libpthread.la'
       THREAD_CFLAGS_CONFIG=" "
       THREAD_LIBS_CONFIG=" "
-      WIN32_CPPFLAGS='-I$(top_srcdir)/win32/include -I$(top_srcdir)/win32/contrib/dirent -I$(top_srcdir)/win32/contrib/timer'
-      CFLAGS="-DHAVE_NANOSLEEP $CFLAGS"
+      WIN32_CPPFLAGS='-I$(top_srcdir)/win32/include -I$(top_srcdir)/win32/contrib/dirent'
       LIBS="-lwinmm -lwsock32 $LIBS"
       GOOM_LIBS="-liberty"
 
@@ -1380,10 +1381,15 @@ dnl ---------------------------------------------
 dnl Some extra checks.
 dnl ---------------------------------------------
 
+AC_SYS_LARGEFILE
 AC_CHECK_LIB(posix4, sched_get_priority_min)
-AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep strsep strpbrk basename hstrerror lstat memset setenv])
+AC_CHECK_FUNCS([vsscanf sigaction sigset getpwuid_r nanosleep lstat memset])
 AC_FUNC_FSEEKO
-AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h sys/times.h sys/ioctl.h)
+AC_DEFINE(_GNU_SOURCE)
+AC_CHECK_HEADERS(byteswap.h malloc.h execinfo.h ucontext.h sys/mman.h sys/mixer.h libgen.h netdb.h sys/times.h sys/ioctl.h)
+AC_REPLACE_FUNCS(basename gettimeofday hstrerror setenv strndup strpbrk strsep strtok_r)
+AH_BOTTOM([/* include internal system specific header */
+#include "os_internal.h"])
 
 
 dnl ---------------------------------------------
@@ -1931,7 +1937,7 @@ dnl ---------------------------------------------
 dnl some include paths ( !!! DO NOT REMOVE !!! )
 dnl ---------------------------------------------
 
-INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_CPPFLAGS) $(THREAD_INCLUDES) $(ZLIB_INCLUDES)'
+INCLUDES='-I$(top_srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir)/src -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-engine -I$(top_srcdir)/src/xine-utils $(INTLDIR) -I$(top_builddir)/src/input -I$(top_srcdir)/src/input $(WIN32_CPPFLAGS) $(THREAD_INCLUDES) $(ZLIB_INCLUDES) -I$(top_srcdir)/lib'
 AC_SUBST(INCLUDES)
 
 
@@ -2009,6 +2015,7 @@ doc/faq/Makefile
 include/Makefile
 include/xine.h
 intl/Makefile
+lib/Makefile
 m4/Makefile
 misc/Makefile
 misc/SlackBuild
diff --git a/include/xine.h.in b/include/xine.h.in
index 0ef399e7f..5ca1966fd 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2004 the xine project
  *
  * This file is part of xine, a free video player.
  *
@@ -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: xine.h.in,v 1.128 2004/09/06 18:34:38 valtri Exp $
+ * $Id: xine.h.in,v 1.129 2004/09/20 19:30:03 valtri Exp $
  *
  * public xine-lib (libxine) interface and documentation
  *
@@ -48,15 +48,21 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
-#include <inttypes.h>
 #include <sys/time.h>
 #include <time.h>
 
 #ifdef WIN32
-#  include <windows.h>
-#  include <windowsx.h>
+#include <windows.h>
+#include <windowsx.h>
 #endif
 
+#ifdef XINE_COMPILE
+#include <inttypes.h>
+#else
+#include <xine/os_types.h>
+#endif
+
+
 /* This enables some experimental features. These are not part of the
  * official libxine API, so use them only, if you absolutely need them.
  * Although we make efforts to keep even this part of the API as stable
@@ -71,7 +77,6 @@ extern "C" {
  */
 /* #define XINE_DISABLE_DEPRECATED_FEATURES */
 
-
 /*********************************************************************
  * xine opaque data types                                            *
  *********************************************************************/
diff --git a/intl/Makefile.in b/intl/Makefile.in
index d30450629..3dfec5dff 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -103,7 +103,7 @@ LTV_AGE=0
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@
 	mv t-$@ $@
 
-INCLUDES = -I.. -I. -I$(top_srcdir)/intl
+INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 all: all-@USE_INCLUDED_LIBINTL@
 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
diff --git a/lib/.cvsignore b/lib/.cvsignore
new file mode 100644
index 000000000..7d926a554
--- /dev/null
+++ b/lib/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.libs
+.deps
+*.lo
+*.la
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 000000000..473333be1
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,10 @@
+include $(top_srcdir)/misc/Makefile.common
+
+noinst_LTLIBRARIES = libxineposix.la
+
+noinst_HEADERS = os_internal.h
+
+include_HEADERS = os_types.h
+
+libxineposix_la_SOURCES = 
+libxineposix_la_LIBADD = @LTLIBOBJS@
diff --git a/lib/Makefile.common b/lib/Makefile.common
new file mode 100644
index 000000000..c9dd5aab6
--- /dev/null
+++ b/lib/Makefile.common
@@ -0,0 +1,4 @@
+LIBXINEPOSIX=$(top_builddir)/lib/libxineposix.la
+
+$(LIBXINEPOSIX):
+	$(MAKE) -C $(top_builddir)/lib libxineposix.la
diff --git a/lib/basename.c b/lib/basename.c
new file mode 100644
index 000000000..06f859483
--- /dev/null
+++ b/lib/basename.c
@@ -0,0 +1,35 @@
+/*
+ * get base name
+ *
+ * (adopted from sh-utils)
+ */
+
+#include "config.h"
+
+#define FILESYSTEM_PREFIX_LEN(filename) 0
+#define ISSLASH(C) ((C) == '/')
+
+char *_xine_private_basename(char *name) {
+  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
+  char const *p;
+
+  for (p = base; *p; p++) {
+    if (ISSLASH (*p)) {
+      /* Treat multiple adjacent slashes like a single slash.  */
+      do p++;
+      while (ISSLASH (*p));
+
+      /* If the file name ends in slash, use the trailing slash as
+         the basename if no non-slashes have been found.  */
+      if (! *p) {
+        if (ISSLASH (*base)) base = p - 1;
+        break;
+      }
+
+      /* *P is a non-slash preceded by a slash.  */
+      base = p;
+    }
+  }
+
+  return (char *)base;
+}
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
new file mode 100644
index 000000000..fb31f12ef
--- /dev/null
+++ b/lib/gettimeofday.c
@@ -0,0 +1,20 @@
+/* replacement function of gettimeofday */
+
+#include "config.h"
+
+#include <sys/timeb.h>
+#ifdef WIN32
+#include <winsock.h>
+#else
+#include <sys/time.h>
+#endif
+
+int _xine_private_gettimeofday(struct timeval *tv) {
+  struct timeb tp;
+
+  ftime(&tp);
+  tv->tv_sec = tp.time;
+  tv->tv_usec = tp.millitm * 1000;
+
+  return 0;
+}
diff --git a/lib/hstrerror.c b/lib/hstrerror.c
new file mode 100644
index 000000000..87f7f6411
--- /dev/null
+++ b/lib/hstrerror.c
@@ -0,0 +1,24 @@
+#include "config.h"
+
+#ifdef WIN32
+#include <winsock.h>
+#else
+#include <netdb.h>
+#endif
+#include <errno.h>
+
+#include "xineintl.h"
+
+/**
+ * get error descriptions in DNS lookups
+ */
+const char *_xine_private_hstrerror(int err) {
+  switch (err) {
+    case 0: return _("No error");
+    case HOST_NOT_FOUND: return _("Unknown host");
+    case NO_DATA: return _("No address associated with name");
+    case NO_RECOVERY: return _("Unknown server error");
+    case TRY_AGAIN: return _("Host name lookup failure");
+    default: return _("Unknown error");
+  }
+}
diff --git a/lib/os_internal.h b/lib/os_internal.h
new file mode 100644
index 000000000..77aa7b4d0
--- /dev/null
+++ b/lib/os_internal.h
@@ -0,0 +1,68 @@
+#include <stddef.h>
+#include "os_types.h"
+
+/* replacement of strndup */
+#ifndef HAVE_STRNDUP
+#define strndup(S, N) _xine_private_strndup((S), (N))
+char *_xine_private_strndup(const char *s, size_t n);
+#endif
+
+/* replacement of basename */
+#ifndef HAVE_BASENAME
+#define basename(PATH) _xine_private_basename((PATH))
+char *_xine_private_basename(char *path);
+#endif
+
+/* replacement of hstrerror */
+#ifndef HAVE_HSTRERROR
+#define hstrerror(ERR) _xine_private_hstrerror((ERR))
+const char *_xine_private_hstrerror(int err);
+#endif
+
+/* replacement of setenv */
+#ifndef HAVE_SETENV
+#define setenv(NAME, VALUE, OVERWRITE) _xine_private_setenv((NAME), (VALUE))
+int _xine_private_setenv(const char *name, const char *value);
+#endif
+
+/* replacement of strtok_r */
+#ifndef HAVE_STRTOK_R
+#define strtok_r(S, DELIM, PTRPTR) _xine_private_strtok_r((S), (DELIM), (PTRPTR))
+char *_xine_private_strtok_r(char *s, const char *delim, char **ptrptr);
+#endif
+
+/* replacement of gettimeofday */
+#ifndef HAVE_GETTIMEOFDAY
+#  ifdef WIN32
+#    include <winsock.h>
+#  else
+#    include <sys/time.h>
+#  endif
+#  define gettimeofday(TV, TZ) _xine_private_gettimeofday((TV))
+int _xine_private_gettimeofday(struct timeval *tv);
+#endif
+
+/* replacement of strpbrk */
+#ifndef HAVE_STRPBRK
+#define strpbrk(S, ACCEPT) _xine_private_strpbrk((S), (ACCEPT))
+char *_xine_private_strpbrk(const char *s, const char *accept);
+#endif
+
+/* replacement of strsep */
+#ifndef HAVE_STRSEP
+#define strsep(STRINGP, DELIM) _xine_private_strsep((STRINGP), (DELIM))
+char *_xine_private_strsep(char **stringp, const char *delim);
+#endif
+
+/* replacing lstat by stat */
+#ifndef HAVE_LSTAT
+#  define lstat(FILENAME, BUF) stat((FILENAME), (BUF))
+#endif
+
+/* macross needed for MSVC */
+#ifdef _MSC_VER
+#  define snprintf _snprintf
+#  define vsnprintf _vsnprintf
+#  define strcasecmp _stricmp
+#  define strncasecmp _strnicmp
+#endif
diff --git a/lib/os_types.h b/lib/os_types.h
new file mode 100644
index 000000000..0a49a743d
--- /dev/null
+++ b/lib/os_types.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2004 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ *
+ * $Id:
+ *
+ * Platform dependent types needed by public xine.h.
+ *
+ * Heavily based on os_types.h from OggVorbis (BSD License),
+ * not tested on all platforms with xine.
+ */
+
+#ifndef XINE_OS_TYPES_H
+#define XINE_OS_TYPES_H
+
+#if defined(_WIN32) && !defined(__GNUC__)
+
+   /* MSVC/Borland */
+   typedef __int8 int8_t;
+   typedef unsigned __int8 uint8_t;
+   typedef __int16 int16_t;
+   typedef unsigned __int16 uint16_t;
+   typedef __int32 int32_t;
+   typedef unsigned __int32 uint32_t;
+   typedef __int64 int64_t;
+   typedef unsigned __int64 uint64_t;
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt8 int8_t;
+   typedef UInt8 uint8_t;
+   typedef SInt16 int16_t;
+   typedef UInt16 uint16_t;
+   typedef SInt32 int32_t;
+   typedef UInt32 uint32_t;
+   typedef SInt64 int64_t;
+   typedef UInt64 uint64_t;
+
+#elif defined(__MACOSX__) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef u_int8_t uint8_t;
+   typedef u_int16_t uint16_t;
+   typedef u_int32_t uint32_t;
+   typedef u_int64_t uint64_t;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef signed char int8_t;
+   typedef unsigned char uint8_t;
+   typedef short int16_t;
+   typedef unsigned short uint16_t;
+   typedef int int32_t;
+   typedef unsigned int uint32_t;
+   typedef long long int64_t;
+   typedef unsigned long long int64_t;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef signed char int8_t;
+   typedef unsigned char uint8_t;
+   typedef short int16_t;
+   typedef unsigned short uint16_t;
+   typedef int int32_t;
+   typedef unsigned int uint32_t;
+   typedef long long int64_t;
+   typedef unsigned long long uint64_t;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef signed char int8_t;
+   typedef unsigned char uint8_t;
+   typedef short int16_t;
+   typedef unsigned short int16_t;
+   typedef int int32_t;
+   typedef unsigned uint32_t;
+   typedef long int64_t;
+   typedef unsigned long int64_t;
+
+#else
+
+  /* 
+   * CygWin: _WIN32 & __GNUC__
+   * BeOS:   __BEOS__
+   * Linux and others
+   */
+#  include <inttypes.h>
+
+#endif
+
+#endif  /* XINE_OS_TYPES_H */
diff --git a/lib/setenv.c b/lib/setenv.c
new file mode 100644
index 000000000..8087bd661
--- /dev/null
+++ b/lib/setenv.c
@@ -0,0 +1,21 @@
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <malloc.h>
+#include <stdio.h>
+
+/* This function will leak a small amount of memory */
+int _xine_private_setenv(const char *name, const char *val) {
+  int len;
+  char *env;
+
+  len = strlen(name) + strlen(val) + 2;
+  env = malloc(len);
+  if (env != NULL) {
+    snprintf(env, len, "%s=%s", name, val);
+    putenv(env);
+    return 0;
+  } else return -1;
+}
+
diff --git a/lib/strndup.c b/lib/strndup.c
new file mode 100644
index 000000000..f2caa70f2
--- /dev/null
+++ b/lib/strndup.c
@@ -0,0 +1,13 @@
+#include "config.h"
+
+#include <malloc.h>
+#include <string.h>
+
+char *_xine_private_strndup(const char *s, size_t n) {
+  char *ret;
+  
+  ret = malloc (n + 1);
+  strncpy(ret, s, n);
+  ret[n] = '\0';
+  return ret;
+}
diff --git a/lib/strpbrk.c b/lib/strpbrk.c
new file mode 100644
index 000000000..557c1a57b
--- /dev/null
+++ b/lib/strpbrk.c
@@ -0,0 +1,15 @@
+#include <stddef.h>
+
+/* Shamefully copied from glibc 2.2.3 */
+char *_xine_private_strpbrk(const char *s, const char *accept) {
+
+  while(*s != '\0') {
+    const char *a = accept;
+    while(*a != '\0')
+      if(*a++ == *s)
+        return(char *) s;
+    ++s;
+  }
+
+  return NULL;
+}
diff --git a/lib/strsep.c b/lib/strsep.c
new file mode 100644
index 000000000..101f9600d
--- /dev/null
+++ b/lib/strsep.c
@@ -0,0 +1,36 @@
+#include "config.h"
+#include <string.h>
+
+char *_xine_private_strsep(char **stringp, const char *delim) {
+  char *begin, *end;
+
+  begin = *stringp;
+  if(begin == NULL)
+    return NULL;
+
+  if(delim[0] == '\0' || delim[1] == '\0') {
+    char ch = delim[0];
+
+    if(ch == '\0')
+      end = NULL;
+    else {
+      if(*begin == ch)
+        end = begin;
+      else if(*begin == '\0')
+        end = NULL;
+      else
+        end = strchr(begin + 1, ch);
+    }
+  }
+  else
+    end = strpbrk(begin, delim);
+
+  if(end) {
+    *end++ = '\0';
+    *stringp = end;
+  }
+  else
+    *stringp = NULL;
+
+  return begin;
+}
diff --git a/lib/strtok_r.c b/lib/strtok_r.c
new file mode 100644
index 000000000..733290422
--- /dev/null
+++ b/lib/strtok_r.c
@@ -0,0 +1,43 @@
+/*
+ * written for xine project, 2004
+ *
+ * public domain replacement function for strtok_r()
+ *
+ */
+
+#include "config.h"
+
+#include <stddef.h>
+#include <string.h>
+
+char *_xine_private_strtok_r(char *s, const char *delim, char **ptrptr) {
+  char *next;
+  size_t toklen, cutlen;
+
+  /* first or next call */
+  if (s) *ptrptr = s;
+  else s = *ptrptr;
+
+  /* end of searching */
+  if (!s || s == '\0') return NULL;
+
+  /* cut the initial garbage */
+  cutlen = strspn(s, delim);
+  s = s + cutlen;
+
+  /* pointer before next token */
+  if ((toklen = strcspn(s, delim)) == 0) {
+    *ptrptr = NULL;
+    return NULL;
+  }
+  next = s + toklen;
+
+  /* cut current token */
+  *next = '\0';
+
+  /* prepare next call */
+  *ptrptr = next + 1;
+
+  /* return the token */
+  return s;
+}
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 3ebf7781f..d1f7057df 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -23,7 +23,7 @@
  * For more information on the FLAC file format, visit:
  *   http://flac.sourceforge.net/
  *
- * $Id: demux_flac.c,v 1.5 2004/07/09 13:16:59 f1rmb Exp $
+ * $Id: demux_flac.c,v 1.6 2004/09/20 19:30:04 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -142,7 +142,7 @@ static int open_flac_file(demux_flac_t *flac) {
       flac->channels = ((flac->sample_rate >> 9) & 0x07) + 1;
       flac->bits_per_sample = ((flac->sample_rate >> 4) & 0x1F) + 1;
       flac->sample_rate >>= 12;
-      flac->total_samples = BE_64(&streaminfo[10]) & 0x0FFFFFFFFFLL;  /* 36 bits */
+      flac->total_samples = BE_64(&streaminfo[10]) & UINT64_C(0x0FFFFFFFFF);  /* 36 bits */
       lprintf ("%d Hz, %d bits, %d channels, %lld total samples\n", 
         flac->sample_rate, flac->bits_per_sample, 
         flac->channels, flac->total_samples);
diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index f58b6c8f4..f962766e4 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -19,20 +19,18 @@
  *
  * URL helper functions
  *
- * $Id: http_helper.c,v 1.2 2004/03/03 20:09:12 mroi Exp $ 
+ * $Id: http_helper.c,v 1.3 2004/09/20 19:30:04 valtri Exp $ 
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+
 #include "xine_internal.h"
 #include "http_helper.h"
 
-static char *_strndup(const char *s, size_t n) {
-  char *ret;
-  
-  ret = malloc (n + 1);
-  strncpy(ret, s, n);
-  ret[n] = '\0';
-  return ret;
-}
-
 int _x_parse_url (char *url, char **proto, char** host, int *port,
                          char **user, char **password, char **uri) {
   char   *start      = NULL;
@@ -64,7 +62,7 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
   if (!start || (start == url))
     goto error;
   
-  *proto = _strndup(url, start - url);
+  *proto = strndup(url, start - url);
 
   /* user:password */
   start += 3;
@@ -77,12 +75,12 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
   if (at) {
     authcolon = strchr(start, ':');
     if(authcolon && authcolon < at) {
-      *user = _strndup(start, authcolon - start);
-      *password = _strndup(authcolon + 1, at - authcolon - 1);
+      *user = strndup(start, authcolon - start);
+      *password = strndup(authcolon + 1, at - authcolon - 1);
       if ((authcolon == start) || (at == (authcolon + 1))) goto error;
     } else {
       /* no password */
-      *user = _strndup(start, at - start);
+      *user = strndup(start, at - start);
       if (at == start) goto error;
     }
     start = at + 1;
@@ -96,18 +94,18 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
     portcolon = strchr(start, ':');
     if (slash) {
       if (portcolon && portcolon < slash) {
-        *host = _strndup(start, portcolon - start);
+        *host = strndup(start, portcolon - start);
         if (portcolon == start) goto error;
         *port = strtol(portcolon + 1, &strtol_err, 10);
         if ((strtol_err != slash) || (strtol_err == portcolon + 1))
           goto error;
       } else {
-        *host = _strndup(start, slash - start);
+        *host = strndup(start, slash - start);
         if (slash == start) goto error;
       }
     } else {
       if (portcolon) {
-        *host = _strndup(start, portcolon - start);
+        *host = strndup(start, portcolon - start);
         if (portcolon < end) {
           *port = strtol(portcolon + 1, &strtol_err, 10);
           if (*strtol_err != '\0') goto error;
@@ -126,7 +124,7 @@ int _x_parse_url (char *url, char **proto, char** host, int *port,
     hostendbracket = strchr(start, ']');
     if (hostendbracket != NULL) {
       if (hostendbracket == start + 1) goto error;
-      *host = _strndup(start + 1, hostendbracket - start - 1);
+      *host = strndup(start + 1, hostendbracket - start - 1);
 
       if (hostendbracket < end) {
         /* Might have a trailing port */
diff --git a/src/input/input_http.c b/src/input/input_http.c
index da78175c0..303ef4510 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
  *
  * input plugin for http network streams
  *
- * $Id: input_http.c,v 1.97 2004/09/18 20:50:09 zonque Exp $
+ * $Id: input_http.c,v 1.98 2004/09/20 19:30:04 valtri Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -172,7 +172,7 @@ static int _x_use_proxy(http_input_class_t *this, const char *host) {
   if ((info = gethostbyname(host)) == NULL) {
     xine_log(this->xine, XINE_LOG_MSG, 
         _("input_http: gethostbyname(%s) failed: %s\n"), host,
-        xine_hstrerror(h_errno));
+        hstrerror(h_errno));
     return 1;
   }
   if (!info->h_name) return 1;
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index dcc797fde..b1d42bd82 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#define _GNU_SOURCE
-
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am
index f48c7a3f9..07b29091f 100644
--- a/src/input/libdvdnav/Makefile.am
+++ b/src/input/libdvdnav/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE
+AM_CPPFLAGS = -D_LARGEFILE64_SOURCE -DDVDNAV_COMPILE -DHAVE_DLFCN_H
 
 noinst_LTLIBRARIES = libdvdnav.la
 
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 185143604..964d97f76 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -1,7 +1,7 @@
 /*
- * Copyright (C) 2001, 2002, 2003 Billy Biggs <vektor@dumbterm.net>,
- *                                H�kan Hjort <d95hjort@dtek.chalmers.se>,
- *                                Bj�rn Englund <d4bjorn@dtek.chalmers.se>
+ * Copyright (C) 2001-2004 Billy Biggs <vektor@dumbterm.net>,
+ *                         H�kan Hjort <d95hjort@dtek.chalmers.se>,
+ *                         Bj�rn Englund <d4bjorn@dtek.chalmers.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 #ifdef WIN32
 /* replacement gettimeofday implementation */
 #include <sys/timeb.h>
-static inline int gettimeofday( struct timeval *tv, void *tz )
+static inline int _private_gettimeofday( struct timeval *tv, void *tz )
 {
   struct timeb t;
   ftime( &t );
@@ -44,6 +44,7 @@ static inline int gettimeofday( struct timeval *tv, void *tz )
   tv->tv_usec = t.millitm * 1000;
   return 0;
 }
+#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
 #include <io.h> /* read() */
 #define lseek64 _lseeki64
 #endif
diff --git a/src/input/libdvdnav/dvdnav_internal.h b/src/input/libdvdnav/dvdnav_internal.h
index 29733ed54..35d9f3470 100644
--- a/src/input/libdvdnav/dvdnav_internal.h
+++ b/src/input/libdvdnav/dvdnav_internal.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2001 Rich Wareham <richwareham@users.sourceforge.net>
+ * Copyright (C) 2001-2004 Rich Wareham <richwareham@users.sourceforge.net>
  * 
  * This file is part of libdvdnav, a DVD navigation library.
  * 
@@ -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: dvdnav_internal.h,v 1.14 2004/03/16 11:43:38 mroi Exp $
+ * $Id: dvdnav_internal.h,v 1.15 2004/09/20 19:30:04 valtri Exp $
  *
  */
 
@@ -47,7 +47,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
 
 /* replacement gettimeofday implementation */
 #include <sys/timeb.h>
-static inline int gettimeofday( struct timeval *tv, void *tz )
+static inline int _private_gettimeofday( struct timeval *tv, void *tz )
 {
   struct timeb t;
   ftime( &t );
@@ -55,6 +55,7 @@ static inline int gettimeofday( struct timeval *tv, void *tz )
   tv->tv_usec = t.millitm * 1000;
   return 0;
 }
+#define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
 #include <io.h> /* read() */
 #define lseek64 _lseeki64
 
diff --git a/src/input/vcd/libcdio/Makefile.am b/src/input/vcd/libcdio/Makefile.am
index 799d4585f..134397e30 100644
--- a/src/input/vcd/libcdio/Makefile.am
+++ b/src/input/vcd/libcdio/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = cdio MSWindows image
 
-INCLUDES = $(LIBCDIO_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 libcdio_SRCS = \
 	image/bincue.c \
diff --git a/src/input/vcd/libvcd/Makefile.am b/src/input/vcd/libvcd/Makefile.am
index edd3d0e28..01b100aa4 100644
--- a/src/input/vcd/libvcd/Makefile.am
+++ b/src/input/vcd/libvcd/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = libvcd
 
-INCLUDES = $(LIBCDIO_CFLAGS)
+INCLUDES = $(LIBCDIO_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/lib
 
 libvcd_SRCS = \
 	vcd.c \
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 76317fd10..61f4163c4 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -1,4 +1,5 @@
 include $(top_srcdir)/misc/Makefile.common
+include $(top_srcdir)/lib/Makefile.common
 
 AM_CFLAGS = $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)
 
@@ -9,7 +10,6 @@ XINEUTILS_LIB  = $(top_builddir)/src/xine-utils/libxineutils.la
 INTERNAL_ZLIB_LIB = $(top_builddir)/win32/contrib/zlib/libzlib.la
 DIRENT_LIB = $(top_builddir)/win32/contrib/libdirent.la
 INTERNAL_PTHREAD_LIB = $(top_builddir)/win32/contrib/pthreads/libpthread.la
-TIMER_LIB = $(top_builddir)/win32/contrib/libtimer.la
 DEF_FILE = libxine-$(XINE_MAJOR).def
 if !HAVE_ZLIB
 zlib_dep = $(INTERNAL_ZLIB_LIB)
@@ -17,7 +17,6 @@ endif
 if WIN32
 dirent_lib = $(DIRENT_LIB)
 pthread_dep = $(INTERNAL_PTHREAD_LIB)
-timer_lib = $(TIMER_LIB)
 def_ldflags="-Wl,--output-def,$(DEF_FILE)"
 endif
 
@@ -32,10 +31,10 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 EXTRA_DIST = lrb.c lrb.h
 
 libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(zlib_dep) \
-                          $(dirent_lib) $(pthread_dep) $(timer_lib)
+                          $(dirent_lib) $(pthread_dep) $(LIBXINEPOSIX)
 libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \
 		    -lm $(XINEUTILS_LIB) $(LIBICONV) $(FT2_LIBS) \
-                    $(dirent_lib) $(timer_lib)
+                    $(dirent_lib) $(LIBXINEPOSIX)
 
 libxine_la_LDFLAGS =  \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(def_ldflags)
@@ -71,6 +70,3 @@ $(INTERNAL_ZLIB_LIB):
 
 $(DIRENT_LIB):
 	$(MAKE) -C $(top_builddir)/win32/contrib libdirent.la
-
-$(TIMER_LIB):
-	$(MAKE) -C $(top_builddir)/win32/contrib libtimer.la
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index 495658d11..d09b64c3d 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -29,7 +29,7 @@
  * - it's possible speeder saving streams in the xine without playing:
  *     xine stream_mrl#save:file.raw\;noaudio\;novideo
  *
- * $Id: input_rip.c,v 1.23 2004/09/17 19:21:46 valtri Exp $
+ * $Id: input_rip.c,v 1.24 2004/09/20 19:30:05 valtri Exp $
  */
 
 /* TODO:
@@ -44,6 +44,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef HAVE_LIBGEN_H
+#include <libgen.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>
@@ -569,7 +572,7 @@ input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *f
   this->savepos = 0;
 
   fnc = strdup(filename);
-  target_basename = xine_basename(fnc);
+  target_basename = basename(fnc);
   dir_file_concat(target, MAX_TARGET_LEN, stream->xine->save_path, 
                   target_basename);
   strcpy(target_no, target);
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 51ed0beb3..fff4f028d 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.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: utils.c,v 1.33 2004/09/12 19:23:36 mroi Exp $
+ * $Id: utils.c,v 1.34 2004/09/20 19:30:05 valtri Exp $
  *
  */
 #define	_POSIX_PTHREAD_SEMANTICS 1	/* for 5-arg getpwuid_r on solaris */
@@ -31,7 +31,7 @@
 
 #include <errno.h>
 #include <pwd.h>
-#include <netdb.h>
+#include <time.h>
 #include <unistd.h>
 
 #if HAVE_EXECINFO_H
@@ -46,11 +46,7 @@
 #include <langinfo.h>
 #endif
 
-#if HAVE_LIBGEN_H
-#include <libgen.h>
-#endif
-
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(WIN32)
 #include <windows.h>
 #endif
 
@@ -418,7 +414,11 @@ void xine_usec_sleep(unsigned usec) {
   ts.tv_nsec = (usec % 1000000) * 1000;
   nanosleep(&ts, NULL);
 #else
+#  if WIN32
+  Sleep(usec / 1000);
+#  else
   usleep(usec);
+#  endif
 #endif
 }
 
@@ -554,65 +554,3 @@ const char *xine_guess_spu_encoding(void) {
 
   return "iso-8859-1";
 }
-
-
-#ifndef HAVE_BASENAME
-#define FILESYSTEM_PREFIX_LEN(filename) 0
-#define ISSLASH(C) ((C) == '/')
-#endif
-
-/*
- * get base name
- *
- * (adopted from sh-utils)
- */
-char *xine_basename (char *name) {
-#ifndef HAVE_BASENAME
-  char const *base = name + FILESYSTEM_PREFIX_LEN (name);
-  char const *p;
-
-  for (p = base; *p; p++)
-    {
-      if (ISSLASH (*p))
-	{
-	  /* Treat multiple adjacent slashes like a single slash.  */
-	  do p++;
-	  while (ISSLASH (*p));
-
-	  /* If the file name ends in slash, use the trailing slash as
-	     the basename if no non-slashes have been found.  */
-	  if (! *p)
-	    {
-	      if (ISSLASH (*base))
-		base = p - 1;
-	      break;
-	    }
-
-	  /* *P is a non-slash preceded by a slash.  */
-	  base = p;
-	}
-    }
-
-  return (char *) base;
-#else
-  return basename(name);
-#endif
-}
-
-/**
- * get error descriptions in DNS lookups
- */
-const char *xine_hstrerror(int err) {
-#ifndef HAVE_HSTRERROR
-  switch (err) {
-    case 0: return _("No error");
-    case HOST_NOT_FOUND: return _("Unknown host");
-    case NO_DATA: return _("No address associated with name");
-    case NO_RECOVERY: return _("Unknown server error");
-    case TRY_AGAIN: return _("Host name lookup failure");
-    default: return _("Unknown error");
-  }
-#else
-  return hstrerror(err);
-#endif
-}
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 6f5fecdf8..6a4be56bf 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -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: xineutils.h,v 1.92 2004/09/06 18:34:39 valtri Exp $
+ * $Id: xineutils.h,v 1.93 2004/09/20 19:30:05 valtri Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -577,27 +577,6 @@ typedef	union {
 #endif /*ARCH_X86 */
 
 
-#ifndef HAVE_LSTAT
-#  define lstat(FILENAME, BUF) stat((FILENAME), (BUF))
-#endif
-
-
-#ifdef _MSC_VER
-#  define snprintf _snprintf
-#  define vsnprintf _vsnprintf
-#endif
-
-
-#ifdef WIN32
-#  ifndef strcasecmp
-#    define strcasecmp _stricmp
-#  endif
-#  ifndef strncasecmp
-#    define strncasecmp _strnicmp
-#  endif
-#endif
-
-
 		     /* Optimized/fast memcpy */
 
 /*
@@ -679,78 +658,10 @@ void xine_strdupa(char *dest, char *src);
                                 }                                           \
                               } while(0)
 
-/* Shamefully copied from glibc 2.2.3 */
-#ifdef HAVE_STRPBRK
-#define xine_strpbrk strpbrk
-#else
-static inline char *_private_strpbrk(const char *s, const char *accept) {
-
-  while(*s != '\0') {
-    const char *a = accept;
-    while(*a != '\0')
-      if(*a++ == *s)
-	return(char *) s;
-    ++s;
-  }
-
-  return NULL;
-}
-#define xine_strpbrk _private_strpbrk
-#endif
-
-#if defined HAVE_STRSEP && !defined(_MSC_VER)
-#define xine_strsep strsep
-#else
-static inline char *_private_strsep(char **stringp, const char *delim) {
-  char *begin, *end;
-
-  begin = *stringp;
-  if(begin == NULL)
-    return NULL;
-
-  if(delim[0] == '\0' || delim[1] == '\0') {
-    char ch = delim[0];
-
-    if(ch == '\0')
-      end = NULL;
-    else {
-      if(*begin == ch)
-	end = begin;
-      else if(*begin == '\0')
-	end = NULL;
-      else
-	end = strchr(begin + 1, ch);
-    }
-  }
-  else
-    end = xine_strpbrk(begin, delim);
-
-  if(end) {
-    *end++ = '\0';
-    *stringp = end;
-  }
-  else
-    *stringp = NULL;
-
-  return begin;
-}
-#define xine_strsep _private_strsep
-#endif
-
-
-#ifdef HAVE_SETENV
-#define	xine_setenv	setenv
-#else
-static inline void _private_setenv(const char *name, const char *val, int _xx) {
-  int  len  = strlen(name) + strlen(val) + 2;
-  char *env = (char *)malloc(len);
-
-  sprintf(env, "%s%c%s", name, '=', val);
-  putenv(env);
-  /*free(env); The string passed to putenv must not be freed*/
-}
-#define	xine_setenv	_private_setenv
-#endif
+/* compatibility macros */
+#define xine_strpbrk(S, ACCEPT) strpbrk((S), (ACCEPT))
+#define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM))
+#define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX))
 
 /*
  * Color Conversion Utility Functions
@@ -1118,16 +1029,6 @@ char *xine_get_system_encoding(void);
  */
 const char *xine_guess_spu_encoding(void);
 
-/**
- * get base name
- */
-char *xine_basename (char *name);
-
-/**
- * get error descriptions in DNS lookups
- */
-const char *xine_hstrerror(int err);
-
 #if defined(__CYGWIN__) || defined(WIN32)
 char *exec_path_append_subdir(char * string);
 #endif
diff --git a/win32/contrib/Makefile.am b/win32/contrib/Makefile.am
index ce9fd2d17..f38c48ac5 100644
--- a/win32/contrib/Makefile.am
+++ b/win32/contrib/Makefile.am
@@ -2,14 +2,12 @@ include $(top_srcdir)/misc/Makefile.common
 
 SUBDIRS = zlib pthreads
 
-noinst_HEADERS = dirent/dirent.h timer/timer.h
+noinst_HEADERS = dirent/dirent.h
 
 if WIN32
-win32libs = libtimer.la libdirent.la
+win32libs = libdirent.la
 endif
 
 noinst_LTLIBRARIES = $(win32libs)
 
-libtimer_la_SOURCES = timer/timer.c
-
 libdirent_la_SOURCES = dirent/dirent.c
diff --git a/win32/contrib/pthreads/Makefile.am b/win32/contrib/pthreads/Makefile.am
index 8535ffc9a..31a792050 100644
--- a/win32/contrib/pthreads/Makefile.am
+++ b/win32/contrib/pthreads/Makefile.am
@@ -2,7 +2,7 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 AM_CPPFLAGS = -D_WIN32_WINNT=0x400 -DHAVE_CONFIG_H -DPTW32_BUILD -D__CLEANUP_C
 
-EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTORS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw
+EXTRA_DIST = acconfig.h ANNOUNCE CONTRIBUTORS COPYING.LIB ChangeLog FAQ MAINTAINERS NEWS PROGRESS README README.CV README.NONPORTABLE README.WinCE TODO WinCE-PORT build.tar.gz config.h.in pthread.def pthread.dsp pthread.dsw diff_to_original.patch
 
 if WIN32
 noinst_LTLIBRARIES = libpthread.la
diff --git a/win32/contrib/pthreads/pthread.h b/win32/contrib/pthreads/pthread.h
index 31e2cf918..60973c44c 100644
--- a/win32/contrib/pthreads/pthread.h
+++ b/win32/contrib/pthreads/pthread.h
@@ -978,11 +978,6 @@ int * _errno( void );
  * actually exist on WIN32.
  */
 
-#if !defined(__MINGW32__)
-#define strtok_r( _s, _sep, _lasts ) \
-	( *(_lasts) = strtok( (_s), (_sep) ) )
-#endif /* !__MINGW32__ */
-
 #define asctime_r( _tm, _buf ) \
 	( strcpy( (_buf), asctime( (_tm) ) ), \
 	  (_buf) )
diff --git a/win32/contrib/timer/timer.c b/win32/contrib/timer/timer.c
deleted file mode 100644
index 3b171117c..000000000
--- a/win32/contrib/timer/timer.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/* 
- * Copyright (C) 2000-2001 the xine project
- * 
- * This file is part of xine, a unix video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * xine 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 General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
- *
- * WIN32 PORT,
- * by Matthew Grooms <elon@altavista.com>
- *
- * timer.c - Missing unix timer functions
- *
- */
-
-#include <sys/timeb.h>
-#include <signal.h>
-#include "timer.h"
-
-
-#ifndef SIGALRM
-#define SIGALRM 14
-#endif
-
-
-int gettimeofday(struct timeval *tv, struct timezone *tz) {
-  struct timeb timebuffer;
-
-  ftime(&timebuffer);
-  tv->tv_sec = timebuffer.time; 
-  tv->tv_usec = timebuffer.millitm * 1000; 
-
-  return 0;
-}
-
-
-/*
-	These functions are designed to mimick
-	a subset of itimer for use with the 
-	alarm signal on win32. This is just
-	enough for xine to work.
-*/
-
-static HANDLE sigalarm = 0;
-
-int setitimer( int which, struct itimerval * value, struct itimerval *ovalue )
-{
-	long int miliseconds;
-		
-	if( !sigalarm )
-		sigalarm = CreateEvent( 0, FALSE, TRUE, "SIGALARM" );
-
-    miliseconds = value->it_value.tv_usec / 1000;
-
-	timeSetEvent( miliseconds, 0, ( LPTIMECALLBACK ) sigalarm, 0, TIME_PERIODIC | TIME_CALLBACK_EVENT_PULSE );
-
-	return 0;
-}
-
-/*
-	Wait for sigalarm to wake the thread
-*/
-
-int pause( void )
-{
-	WaitForSingleObject( sigalarm, INFINITE );
-
-	return 0;
-}
-
-int nanosleep( const struct timespec * rqtp, struct timespec * rmtp )
-{
-	Sleep( rqtp->tv_nsec / 1000000 );
-
-	return 0;
-}
-
-unsigned int sleep( unsigned int seconds )
-{
-	Sleep( seconds * 1000 );
-	return 0;
-}
-
-static UINT alarmid = 0;
-void CALLBACK AlarmCallback(UINT wTimerID, 
-							UINT msg, 
-							DWORD dwUser, 
-							DWORD dw1, 
-							DWORD dw2)
-{
-	if (alarmid) {
-		alarmid = 0;
-		raise(SIGALRM);
-	}
-} 
-
-int alarm( int sec )
-{
-	long int miliseconds;
-
-	if (sec) {
-	  if (!alarmid) {
-	    miliseconds = sec * 1000;
-		timeSetEvent( miliseconds, 0, ( LPTIMECALLBACK ) AlarmCallback, 0, TIME_ONESHOT | TIME_CALLBACK_FUNCTION );
-	  }
-	}
-	else {
-	  if (alarmid) {
-	    timeKillEvent(alarmid);
-		alarmid = 0;
-	  }
-	}
-
-	return 0;
-}
diff --git a/win32/contrib/timer/timer.h b/win32/contrib/timer/timer.h
deleted file mode 100644
index fb8c357af..000000000
--- a/win32/contrib/timer/timer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <time.h>
-#include <winsock.h>
-#include <pthread.h>
-
-#ifndef _ITIMER_
-#define _ITIMER_
-
-#define ITIMER_REAL		0
-#define ITIMER_VIRTUAL	1
-
-//	time reference
-//	----------------------------------
-//	
-//	1,000			milliseconds / sec
-//	1,000,000		microseconds / sec
-//	1,000,000,000	nanoseconds  / sec
-//
-//  timeval.time_sec  = seconds
-//  timeval.time_usec = microseconds
-
-struct itimerval
-{
-	struct timeval it_interval;    /* timer interval */
-	struct timeval it_value;       /* current value */
-};
-
-struct timezone {
-    int     tz_minuteswest; /* minutes west of Greenwich */
-    int     tz_dsttime;     /* type of dst correction */
-};
-
-int gettimeofday( struct timeval *tp, struct timezone *tzp );
-int setitimer( int which, struct itimerval * value, struct itimerval *ovalue );
-int pause( void );
-
-unsigned int sleep( unsigned int seconds );
-int nanosleep( const struct timespec *rqtp, struct timespec *rmtp );
-int alarm( int sec );
-
-
-
-#endif
-
diff --git a/win32/include/Makefile.am b/win32/include/Makefile.am
index 1b13e092b..d53081b6c 100644
--- a/win32/include/Makefile.am
+++ b/win32/include/Makefile.am
@@ -1,24 +1,14 @@
 include $(top_srcdir)/misc/Makefile.common
 
-msvc_headers = \
+EXTRA_DIST = \
+	msvc/sys/time.h \
+	msvc/config.h \
 	msvc/inttypes.h \
 	msvc/stdint.h \
-	msvc/sys/time.h
-
-if WIN32
-  install_h = $(msvc_headers)
-else
-  dist_h = $(msvc_headers)
-endif
-
-EXTRA_DIST = $(dist_h) \
 	sys/socket.h \
-	msvc/config.h \
 	netinet/in.h \
 	sys/socket.h \
 	dlfcn.h \
 	netdb.h \
 	pwd.h \
 	unistd.h
-
-nobase_include_HEADERS = $(install_h)
diff --git a/win32/include/msvc/config.h b/win32/include/msvc/config.h
index 2b44ff85c..a0d35a972 100644
--- a/win32/include/msvc/config.h
+++ b/win32/include/msvc/config.h
@@ -609,3 +609,5 @@
 
 /* define ssize_t to __int64 if it's missing in default includes */
 #define ssize_t __int64
+
+#include "os_internal.h"
diff --git a/win32/include/msvc/inttypes.h b/win32/include/msvc/inttypes.h
index b7e13daf3..2934bf43a 100644
--- a/win32/include/msvc/inttypes.h
+++ b/win32/include/msvc/inttypes.h
@@ -29,34 +29,20 @@
 
 #include <stdint.h>
 
-#define int8_t			signed char
-#define int16_t			signed short
-#define int32_t			signed long
-#define int64_t			signed hyper
-
-#define uint8_t			unsigned char
-#define uint16_t		unsigned short
-#define uint32_t		unsigned long
-#define uint64_t		unsigned hyper
-
-#define intptr_t		signed int
-#define uintptr_t		unsigned int
-
-#define __int8_t        int8_t
-#define __int16_t       int16_t
-#define __int32_t       int32_t
-#define __int64_t       int64_t
-
-#define __uint8_t       uint8_t
-#define __uint16_t      uint16_t
-#define __uint32_t      uint32_t
-#define __uint64_t      uint64_t
-
-#define __intptr_t      intptr_t
-#define __uintptr_t     uintptr_t
-
-typedef __int64         ulonglong;
-typedef __int64         longlong;
+typedef __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+typedef int intptr_t;
+typedef unsigned int uintptr_t;
+typedef __int64 intmax_t;
+typedef unsigned __int64 uintmax_t;
+typedef signed __int64 intmax_t;
+typedef unsigned __int64 uintmax_t;
 
 #define __WORDSIZE 32
 
@@ -188,6 +174,15 @@ typedef __int64         longlong;
 # define PRIxPTR        __PRIPTR_PREFIX "x"
 # define PRIXPTR        __PRIPTR_PREFIX "X"
 
+
+/* Macros for scanning `intmax_t' and `uintmax_t'. */
+#define SCNdMAX         __PRI64_PREFIX "d"
+#define SCNiMAX         __PRI64_PREFIX "i"
+#define SCNoMAX         __PRI64_PREFIX "o"
+#define SCNuMAX         __PRI64_PREFIX "u"
+#define SCNxMAX         __PRI64_PREFIX "x"
+#define SCNXMAX         __PRI64_PREFIX "X"
+
 #endif /* !defined __cplusplus || defined __STDC_FORMAT_MACROS */
 
 
diff --git a/win32/include/msvc/stdint.h b/win32/include/msvc/stdint.h
index fe934b846..7b9d4a090 100644
--- a/win32/include/msvc/stdint.h
+++ b/win32/include/msvc/stdint.h
@@ -27,7 +27,7 @@ details. */
  * along with self program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: stdint.h,v 1.1 2004/04/06 19:20:21 valtri Exp $
+ * $Id: stdint.h,v 1.2 2004/09/20 19:30:08 valtri Exp $
  */
 
 /* Modified original CygWin version for using by MSVC port. */
@@ -35,60 +35,73 @@ details. */
 #ifndef _STDINT_H
 #define _STDINT_H
 
-/* Exact-width integer types */
+/* Macros for minimum-width integer constant expressions */
+
+#define INT8_C(x) x
+#define INT16_C(x) x
+#define INT32_C(x) x ## L
+#define INT64_C(x) x ## I64
+
+#define UINT8_C(x) x ## U
+#define UINT16_C(x) x ## U
+#define UINT32_C(x) x ## UL
+#define UINT64_C(x) x ## UI64
 
-#include <inttypes.h>
+/* Macros for greatest-width integer constant expressions */
+
+#define INTMAX_C(x) x ## I64
+#define UINTMAX_C(x) x ## UI64
 
 /* Limits of exact-width integer types */
 
 #define INT8_MIN (-128)
 #define INT16_MIN (-32768)
 #define INT32_MIN (-2147483647 - 1)
-#define INT64_MIN (-9223372036854775807LL - 1LL)
+#define INT64_MIN (-INT64_C(9223372036854775807) - 1)
 
 #define INT8_MAX (127)
 #define INT16_MAX (32767)
 #define INT32_MAX (2147483647)
-#define INT64_MAX (9223372036854775807LL)
+#define INT64_MAX (INT64_C(9223372036854775807))
 
 #define UINT8_MAX (255)
 #define UINT16_MAX (65535)
 #define UINT32_MAX (4294967295UL)
-#define UINT64_MAX (18446744073709551615ULL)
+#define UINT64_MAX (UINT64_C(18446744073709551615))
 
 /* Limits of minimum-width integer types */
 
 #define INT_LEAST8_MIN (-128)
 #define INT_LEAST16_MIN (-32768)
 #define INT_LEAST32_MIN (-2147483647 - 1)
-#define INT_LEAST64_MIN (-9223372036854775807LL - 1LL)
+#define INT_LEAST64_MIN (-INT64_C(9223372036854775807) - 1)
 
 #define INT_LEAST8_MAX (127)
 #define INT_LEAST16_MAX (32767)
 #define INT_LEAST32_MAX (2147483647)
-#define INT_LEAST64_MAX (9223372036854775807LL)
+#define INT_LEAST64_MAX (INT64_C(9223372036854775807))
 
 #define UINT_LEAST8_MAX (255)
 #define UINT_LEAST16_MAX (65535)
 #define UINT_LEAST32_MAX (4294967295UL)
-#define UINT_LEAST64_MAX (18446744073709551615ULL)
+#define UINT_LEAST64_MAX (UINT64_C(18446744073709551615))
 
 /* Limits of fastest minimum-width integer types */
 
 #define INT_FAST8_MIN (-128)
 #define INT_FAST16_MIN (-2147483647 - 1)
 #define INT_FAST32_MIN (-2147483647 - 1)
-#define INT_FAST64_MIN (-9223372036854775807LL - 1LL)
+#define INT_FAST64_MIN (-INT64_C(9223372036854775807) - 1)
 
 #define INT_FAST8_MAX (127)
 #define INT_FAST16_MAX (2147483647)
 #define INT_FAST32_MAX (2147483647)
-#define INT_FAST64_MAX (9223372036854775807LL)
+#define INT_FAST64_MAX (INT64_C(9223372036854775807))
 
 #define UINT_FAST8_MAX (255)
 #define UINT_FAST16_MAX (4294967295UL)
 #define UINT_FAST32_MAX (4294967295UL)
-#define UINT_FAST64_MAX (18446744073709551615ULL)
+#define UINT_FAST64_MAX (UINT64_C(18446744073709551615))
 
 /* Limits of integer types capable of holding object pointers */
 
@@ -98,9 +111,9 @@ details. */
 
 /* Limits of greatest-width integer types */
 
-#define INTMAX_MIN (-9223372036854775807LL - 1LL)
-#define INTMAX_MAX (9223372036854775807LL)
-#define UINTMAX_MAX (18446744073709551615ULL)
+#define INTMAX_MIN (-INT64_C(9223372036854775807) - 1)
+#define INTMAX_MAX (INT64_C(9223372036854775807))
+#define UINTMAX_MAX (UINT64_C(18446744073709551615))
 
 /* Limits of other integer types */
 
@@ -135,21 +148,4 @@ details. */
 #define WINT_MAX (2147483647)
 #endif
 
-/* Macros for minimum-width integer constant expressions */
-
-#define INT8_C(x) x
-#define INT16_C(x) x
-#define INT32_C(x) x ## L
-#define INT64_C(x) x ## LL
-
-#define UINT8_C(x) x ## U
-#define UINT16_C(x) x ## U
-#define UINT32_C(x) x ## UL
-#define UINT64_C(x) x ## ULL
-
-/* Macros for greatest-width integer constant expressions */
-
-#define INTMAX_C(x) x ## L
-#define UINTMAX_C(x) x ## UL
-
 #endif /* _STDINT_H */
diff --git a/win32/include/unistd.h b/win32/include/unistd.h
index b08706535..daba335c9 100644
--- a/win32/include/unistd.h
+++ b/win32/include/unistd.h
@@ -30,9 +30,7 @@
 #include <errno.h>
 #include <direct.h>
 
-#include <timer.h>
-
-#include <config.h>
+#include "config.h"
 
 #ifndef _SYS_UNISTD_H_
 #define _SYS_UNISTD_H_
diff --git a/win32/libdvdnav.dsp b/win32/libdvdnav.dsp
index 6efe4038e..d46eb362c 100644
--- a/win32/libdvdnav.dsp
+++ b/win32/libdvdnav.dsp
@@ -40,12 +40,12 @@ RSC=rc.exe
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
-MTL=midl.exe
 LINK32=link.exe
 # ADD BASE LINK32 /machine:IX86
 # ADD LINK32 /machine:IX86
+MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "contrib/timer" /I "../src/input/libdvdcss/src" /I ".." /I "../src" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "../src/input/libdvdcss/src" /I "../src" /D "WIN32" /D "NDEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -68,13 +68,13 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-MTL=midl.exe
 LINK32=link.exe
 # ADD BASE LINK32 /machine:IX86
 # ADD LINK32 /debug /machine:IX86 /out:"Debug/libdvdnav.lib" /implib:"Debug/libdvdnav.lib"
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
+MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "contrib/timer" /I "../src/input/libdvdcss/src" /I ".." /I "../src" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /FR"Debug/libdvdnav/" /Fp"Debug/libdvdnav/libdvdnav.pch" /YX /Fo"Debug/libdvdnav/" /Fd"Debug/libdvdnav/" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "../src/xine-utils" /I "contrib/dirent" /I "contrib/pthreads" /I "../src/input/libdvdcss/src" /I "../src" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /FR"Debug/libdvdnav/" /Fp"Debug/libdvdnav/libdvdnav.pch" /YX /Fo"Debug/libdvdnav/" /Fd"Debug/libdvdnav/" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/win32/libxine.def b/win32/libxine.def
index f4bb6a5ad..90998afd4 100644
--- a/win32/libxine.def
+++ b/win32/libxine.def
@@ -4,7 +4,6 @@
 EXPORTS
 
 ;---- xine-utils ----
-gettimeofday
 xine_mm_accel
 xine_fast_memcpy
 xine_probe_fast_memcpy
@@ -35,8 +34,6 @@ xine_list_append_content
 xine_list_insert_content
 xine_list_delete_current
 
-xine_basename
-
 xine_buffer_init
 _xine_buffer_free
 xine_buffer_dup
@@ -58,6 +55,8 @@ xml_parser_dump_tree
 lexer_init
 lexer_get_token
 
+xine_guess_spu_encoding
+
 ;---- xine-engine ----
 xine_init
 xine_exit
@@ -247,6 +246,8 @@ _x_io_select
 _x_io_tcp_connect
 _x_io_tcp_read
 _x_io_tcp_write
+_x_io_tcp_read_line
+_x_io_tcp_connect_finish
 _x_io_file_read
 _x_io_file_write
 
@@ -264,6 +265,7 @@ _x_meta_info_get
 _x_meta_info_get_public
 
 _x_get_current_info
+_x_spu_decoder_sleep
 
 init_yuv_conversion
 init_yuv_planes
diff --git a/win32/libxine.dsp b/win32/libxine.dsp
index 4f5ad9c34..45f5fd788 100644
--- a/win32/libxine.dsp
+++ b/win32/libxine.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /D "HAVE_NANOSLEEP" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -76,7 +76,7 @@ PostBuild_Cmds=scripts\move_xine_fonts.bat Release
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /D "HAVE_NANOSLEEP" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/libxinesupport.def b/win32/libxinesupport.def
index 8a5bca041..5f267c841 100644
--- a/win32/libxinesupport.def
+++ b/win32/libxinesupport.def
@@ -210,12 +210,12 @@ gzputs
 gzgets
 
 ;------------------------------------------------------------
-; timer exports
-
-gettimeofday
-setitimer
-pause
-sleep
-nanosleep
-alarm
+; xine posix exports
 
+_xine_private_basename
+_xine_private_gettimeofday
+_xine_private_hstrerror
+_xine_private_setenv
+_xine_private_strndup
+_xine_private_strsep
+_xine_private_strtok_r
diff --git a/win32/libxinesuppt.dsp b/win32/libxinesuppt.dsp
index 2b2ecde05..61775cc76 100644
--- a/win32/libxinesuppt.dsp
+++ b/win32/libxinesuppt.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/dirent" /I "contrib/pthreads" /I "../src/xine-engine" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../lib" /I "include" /I "include/msvc" /I "contrib/dirent" /I "contrib/pthreads" /I "../src/xine-engine" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -90,189 +90,218 @@ LINK32=link.exe
 
 # Name "libxinesuppt - Win32 Release"
 # Name "libxinesuppt - Win32 Debug"
+
 # Begin Group "Source Files ( pthreads )"
 
 # PROP Default_Filter ""
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\attr.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\barrier.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\cancel.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\cleanup.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\condvar.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\create.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\dll.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\errno.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\exit.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\fork.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\global.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\misc.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\mutex.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\nonportable.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\private.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\rwlock.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\sched.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\sched.h
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\semaphore.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\signal.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\spin.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\sync.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\pthreads\tsd.c
 # End Source File
+
 # End Group
+
 # Begin Group "DLL Defs"
 
 # PROP Default_Filter ""
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\libxinesupport.def
 # End Source File
+
 # End Group
+
 # Begin Group "Source Files ( zlib )"
 
 # PROP Default_Filter ""
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\adler32.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\compress.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\crc32.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\deflate.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\gzio.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\infblock.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\infcodes.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\inffast.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\inflate.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\inftrees.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\infutil.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\trees.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\uncompr.c
 # End Source File
-# Begin Source File
 
+# Begin Source File
 SOURCE=.\contrib\zlib\zutil.c
 # End Source File
+
 # End Group
-# Begin Group "Source Files ( other )"
 
+# Begin Group "Source Files ( dirent )"
 # PROP Default_Filter ""
+
+# Begin Source File
+SOURCE=.\contrib\dirent\dirent.c
+# End Source File
+
 # End Group
-# Begin Group "Source Files ( timer )"
 
+# Begin Group "Source Files ( posix )"
 # PROP Default_Filter ""
+
 # Begin Source File
+SOURCE=..\lib\basename.c
+# End Source File
 
-SOURCE=.\contrib\timer\timer.c
+# Begin Source File
+SOURCE=..\lib\gettimeofday.c
 # End Source File
-# End Group
-# Begin Group "Source Files ( dirent )"
 
-# PROP Default_Filter ""
 # Begin Source File
+SOURCE=..\lib\hstrerror.c
+# End Source File
 
-SOURCE=.\contrib\dirent\dirent.c
+# Begin Source File
+SOURCE=..\lib\setenv.c
 # End Source File
+
+# Begin Source File
+SOURCE=..\lib\strndup.c
+# End Source File
+
+# Begin Source File
+SOURCE=..\lib\strsep.c
+# End Source File
+
+# Begin Source File
+SOURCE=..\lib\strtok_r.c
+# End Source File
+
 # End Group
+
 # End Target
 # End Project
diff --git a/win32/xineplug_ao_out_directx.dsp b/win32/xineplug_ao_out_directx.dsp
index 564b528cc..6f0acb6f5 100644
--- a/win32/xineplug_ao_out_directx.dsp
+++ b/win32/xineplug_ao_out_directx.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_a52.dsp b/win32/xineplug_decode_a52.dsp
index dc6c5ae52..931866d95 100644
--- a/win32/xineplug_decode_a52.dsp
+++ b/win32/xineplug_decode_a52.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include/msvc" /I "." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include/msvc" /I "." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_dts.dsp b/win32/xineplug_decode_dts.dsp
index c47ab4cb0..e1025c971 100644
--- a/win32/xineplug_decode_dts.dsp
+++ b/win32/xineplug_decode_dts.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I ".." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".." /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_ff.dsp b/win32/xineplug_decode_ff.dsp
index dce0b4199..91016ee16 100644
--- a/win32/xineplug_decode_ff.dsp
+++ b/win32/xineplug_decode_ff.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src/xine-engine" /I "../include" /I "contrib/timer" /I "../src" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src/xine-engine" /I "contrib/timer" /I "../src" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src/xine-engine" /I "../include" /I "contrib/timer" /I "../src" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src/xine-engine" /I "contrib/timer" /I "../src" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /D "SIMPLE_IDCT" /D "HAVE_AV_CONFIG_H" /D "RUNTIME_CPUDETECT" /D "USE_FASTMEMCPY" /D "CONFIG_RISKY" /D "CONFIG_DECODERS" /D "XINE_MPEG_ENCODER" /FD /GZ /c
 # SUBTRACT CPP /X /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
diff --git a/win32/xineplug_decode_lpcm.dsp b/win32/xineplug_decode_lpcm.dsp
index 5af292dd0..0a0cb24ed 100644
--- a/win32/xineplug_decode_lpcm.dsp
+++ b/win32/xineplug_decode_lpcm.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_mad.dsp b/win32/xineplug_decode_mad.dsp
index 5939fb453..9738ab151 100644
--- a/win32/xineplug_decode_mad.dsp
+++ b/win32/xineplug_decode_mad.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "FPM_DEFAULT" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "FPM_DEFAULT" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "FPM_DEFAULT" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "FPM_DEFAULT" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_mpeg2.dsp b/win32/xineplug_decode_mpeg2.dsp
index 832cf042b..d0a493ef7 100644
--- a/win32/xineplug_decode_mpeg2.dsp
+++ b/win32/xineplug_decode_mpeg2.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_real.dsp b/win32/xineplug_decode_real.dsp
index 3c354f195..1a0a776a6 100644
--- a/win32/xineplug_decode_real.dsp
+++ b/win32/xineplug_decode_real.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_spu.dsp b/win32/xineplug_decode_spu.dsp
index 242d73273..1fed8fc9b 100644
--- a/win32/xineplug_decode_spu.dsp
+++ b/win32/xineplug_decode_spu.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_spucc.dsp b/win32/xineplug_decode_spucc.dsp
index 7b5f82973..9fe33fb06 100644
--- a/win32/xineplug_decode_spucc.dsp
+++ b/win32/xineplug_decode_spucc.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_decode_sputext.dsp b/win32/xineplug_decode_sputext.dsp
index 080fc0258..885d1ec94 100644
--- a/win32/xineplug_decode_sputext.dsp
+++ b/win32/xineplug_decode_sputext.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_asf.dsp b/win32/xineplug_dmx_asf.dsp
index e174562d7..dd3f82933 100644
--- a/win32/xineplug_dmx_asf.dsp
+++ b/win32/xineplug_dmx_asf.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_ASF_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_audio.dsp b/win32/xineplug_dmx_audio.dsp
index 313d25baa..3fe1bf17f 100755
--- a/win32/xineplug_dmx_audio.dsp
+++ b/win32/xineplug_dmx_audio.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/libflac" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/libflac" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AUDIO_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -114,6 +114,10 @@ SOURCE=..\src\demuxers\demux_cdda.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\src\demuxers\demux_flac.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\demuxers\demux_mpgaudio.c
 # End Source File
 # Begin Source File
diff --git a/win32/xineplug_dmx_avi.dsp b/win32/xineplug_dmx_avi.dsp
index 12ba67872..581949f4f 100644
--- a/win32/xineplug_dmx_avi.dsp
+++ b/win32/xineplug_dmx_avi.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_AVI_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_lpcm.dsp b/win32/xineplug_dmx_lpcm.dsp
index caeea0a82..7d795d1ce 100755
--- a/win32/xineplug_dmx_lpcm.dsp
+++ b/win32/xineplug_dmx_lpcm.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_mpeg.dsp b/win32/xineplug_dmx_mpeg.dsp
index 73c6ff013..071c00ce0 100644
--- a/win32/xineplug_dmx_mpeg.dsp
+++ b/win32/xineplug_dmx_mpeg.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_mpeg_block.dsp b/win32/xineplug_dmx_mpeg_block.dsp
index 2ef3add64..14366eb1d 100644
--- a/win32/xineplug_dmx_mpeg_block.dsp
+++ b/win32/xineplug_dmx_mpeg_block.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_mpeg_pes.dsp b/win32/xineplug_dmx_mpeg_pes.dsp
index 9e3fb9dc4..a66742343 100644
--- a/win32/xineplug_dmx_mpeg_pes.dsp
+++ b/win32/xineplug_dmx_mpeg_pes.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_mpeg_ts.dsp b/win32/xineplug_dmx_mpeg_ts.dsp
index 398dd1ba2..a09124a48 100644
--- a/win32/xineplug_dmx_mpeg_ts.dsp
+++ b/win32/xineplug_dmx_mpeg_ts.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_nsv.dsp b/win32/xineplug_dmx_nsv.dsp
index 19cb81481..e9da02eb9 100755
--- a/win32/xineplug_dmx_nsv.dsp
+++ b/win32/xineplug_dmx_nsv.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_NSV_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_pva.dsp b/win32/xineplug_dmx_pva.dsp
index 63d03d05b..85f91693f 100755
--- a/win32/xineplug_dmx_pva.dsp
+++ b/win32/xineplug_dmx_pva.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_PVA_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_real.dsp b/win32/xineplug_dmx_real.dsp
index 96a9b840b..1c8596563 100755
--- a/win32/xineplug_dmx_real.dsp
+++ b/win32/xineplug_dmx_real.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_REAL_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_slave.dsp b/win32/xineplug_dmx_slave.dsp
index 78b587606..1c51fb0f5 100755
--- a/win32/xineplug_dmx_slave.dsp
+++ b/win32/xineplug_dmx_slave.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SLAVE_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_sputext.dsp b/win32/xineplug_dmx_sputext.dsp
index 2fefafd51..3662958d1 100644
--- a/win32/xineplug_dmx_sputext.dsp
+++ b/win32/xineplug_dmx_sputext.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_yuv4mpeg2.dsp b/win32/xineplug_dmx_yuv4mpeg2.dsp
index 5a98fb79f..342901fe6 100755
--- a/win32/xineplug_dmx_yuv4mpeg2.dsp
+++ b/win32/xineplug_dmx_yuv4mpeg2.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV4MPEG2_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_dmx_yuv_frames.dsp b/win32/xineplug_dmx_yuv_frames.dsp
index 57d5c7b28..fcdcc0234 100755
--- a/win32/xineplug_dmx_yuv_frames.dsp
+++ b/win32/xineplug_dmx_yuv_frames.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_YUV_FRAMES_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_inp_cdda.dsp b/win32/xineplug_inp_cdda.dsp
index 05e00820f..b3d0aec5d 100755
--- a/win32/xineplug_inp_cdda.dsp
+++ b/win32/xineplug_inp_cdda.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/dirent" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/dirent" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -95,12 +95,20 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
+SOURCE=..\src\input\base64.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\input\input_cdda.c
 # End Source File
 # Begin Source File
 
 SOURCE=..\src\input\media_helper.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\src\input\sha1.c
+# End Source File
 # End Group
 # Begin Group "DLL Defs"
 
diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp
index d1ef90835..9d8818a5b 100644
--- a/win32/xineplug_inp_dvd.dsp
+++ b/win32/xineplug_inp_dvd.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS." /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS." /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_inp_file.dsp b/win32/xineplug_inp_file.dsp
index c3d0b3123..0003e9ead 100644
--- a/win32/xineplug_inp_file.dsp
+++ b/win32/xineplug_inp_file.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_FILE_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_inp_http.dsp b/win32/xineplug_inp_http.dsp
index b7f0c3f6f..bf5f512ac 100755
--- a/win32/xineplug_inp_http.dsp
+++ b/win32/xineplug_inp_http.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_HTTP_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_inp_net.dsp b/win32/xineplug_inp_net.dsp
index 68aa847e7..5e2470a7c 100755
--- a/win32/xineplug_inp_net.dsp
+++ b/win32/xineplug_inp_net.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /D "XINE_COMPILE" /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/dirent" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_NET_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_vo_out_directx.dsp b/win32/xineplug_vo_out_directx.dsp
index 045812e15..1a650601c 100644
--- a/win32/xineplug_vo_out_directx.dsp
+++ b/win32/xineplug_vo_out_directx.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/win32/xineplug_vo_out_sdl.dsp b/win32/xineplug_vo_out_sdl.dsp
index b3d013d8e..3301c3021 100755
--- a/win32/xineplug_vo_out_sdl.dsp
+++ b/win32/xineplug_vo_out_sdl.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 LIB32=link.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "include" /I "include/msvc" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../lib" /I "../include" /I "include" /I "include/msvc" /I "contrib/pthreads" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_SDL_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /FR /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"