diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
index 4461ef5..77fc009 100644
--- a/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h
@@ -32,7 +32,7 @@
 #include <string.h>
 
 #ifdef WIN32
-
+#ifndef _LINUX
 /* pthread_mutex_* wrapper for win32 */
 #include <windows.h>
 #include <process.h>
@@ -40,6 +40,7 @@ typedef CRITICAL_SECTION pthread_mutex_t;
 #define pthread_mutex_init(a, b) InitializeCriticalSection(a)
 #define pthread_mutex_lock(a)    EnterCriticalSection(a)
 #define pthread_mutex_unlock(a)  LeaveCriticalSection(a)
+#endif
 #define pthread_mutex_destroy(a) DeleteCriticalSection(a)
 
 #ifndef HAVE_GETTIMEOFDAY
@@ -56,7 +57,10 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
 #define gettimeofday(TV, TZ) _private_gettimeofday((TV), (TZ))
 #endif
 
+#ifndef _LINUX
 #include <io.h> /* read() */
+#endif
+
 #define lseek64 _lseeki64
 
 #else
@@ -193,12 +197,12 @@ int64_t dvdnav_convert_time(dvd_time_t *time);
 /*
  * Get current playback state
  */
-dvdnav_status_t dvdnav_get_state(dvdnav_t *this, dvd_state_t *save_state);
+dvdnav_status_t dvdnav_get_state(dvdnav_t *me, dvd_state_t *save_state);
 
 /*
  * Resume playback state
  */
-dvdnav_status_t dvdnav_set_state(dvdnav_t *this, dvd_state_t *save_state);
+dvdnav_status_t dvdnav_set_state(dvdnav_t *me, dvd_state_t *save_state);
 /* end XBMC */
 
 /** USEFUL MACROS **/