diff --git a/core/MatroskaParser.c b/core/MatroskaParser.c
index 61850a78a..34842e1ed 100644
--- a/core/MatroskaParser.c
+++ b/core/MatroskaParser.c
@@ -96,7 +96,6 @@ static char  *mystrdup(struct InputStream *is,const char *src) {
   return dst;
 }
 
-#ifdef _WIN32
 static void  strlcpy(char *dst,const char *src,unsigned size) {
   unsigned  i;
 
@@ -105,7 +104,6 @@ static void  strlcpy(char *dst,const char *src,unsigned size) {
   if (i<size)
     dst[i] = 0;
 }
-#endif
 
 struct Cue {
   ulonglong	Time;
diff --git a/core/audio_player_portaudio.cpp b/core/audio_player_portaudio.cpp
index 341428213..fcb739673 100644
--- a/core/audio_player_portaudio.cpp
+++ b/core/audio_player_portaudio.cpp
@@ -71,6 +71,9 @@ PortAudioPlayer::~PortAudioPlayer() {
 	if (!--pa_refcount) Pa_Terminate();
 }
 
+#ifdef __WIN32__
+typedef unsigned __int64 uint64_t;
+#endif
 
 //////////////////////
 // PortAudio callback
@@ -82,7 +85,7 @@ int PortAudioPlayer::paCallback(void *inputBuffer, void *outputBuffer, unsigned
 
 	// Calculate how much left
 	__int64 lenAvailable = player->endPos - player->playPos;
-	unsigned __int64 avail = 0;
+	uint64_t avail = 0;
 	if (lenAvailable > 0) {
 		avail = lenAvailable;
 		if (avail > framesPerBuffer) {
@@ -101,7 +104,7 @@ int PortAudioPlayer::paCallback(void *inputBuffer, void *outputBuffer, unsigned
 	}
 
 	// Pad end with blank
-	if (avail < (unsigned __int64) framesPerBuffer) {
+	if (avail < (uint64_t) framesPerBuffer) {
 		//provider->softStop = true;
 	}
 
diff --git a/core/utils.cpp b/core/utils.cpp
index 327427f78..b5f3227ae 100644
--- a/core/utils.cpp
+++ b/core/utils.cpp
@@ -44,12 +44,14 @@
 #endif
 
 
+#ifdef __WIN32__
 //////////////////////////
 // Absolute of 64 bit int
 __int64 abs64(__int64 input) {
 	if (input < 0) return -input;
 	return input;
 }
+#endif
 
 
 ///////////////////////////////////////
diff --git a/core/utils.h b/core/utils.h
index 7e995e6ae..aedd45fb2 100644
--- a/core/utils.h
+++ b/core/utils.h
@@ -36,7 +36,9 @@
 
 ///////////////////////
 // Function prototypes
+#ifdef __WIN32__
 __int64 abs64(__int64 input);
+#endif
 int CountMatches(wxString parent,wxString child);
 bool Copy(wxString src,wxString dst);
 bool Backup(wxString src,wxString dst);
diff --git a/core/video_display.cpp b/core/video_display.cpp
index 39d9dfc82..00cb98e91 100644
--- a/core/video_display.cpp
+++ b/core/video_display.cpp
@@ -180,7 +180,9 @@ void VideoDisplay::SetVideo(const wxString &filename) {
 				// Close mkv
 				MatroskaWrapper::wrapper.Close();
 			}
+#ifdef __WIN32__
 			else if (ext == _T(".avi")) KeyFrames = VFWWrapper::GetKeyFrames(filename);
+#endif
 
 			// Update size
 			UpdateSize();
diff --git a/core/video_display.h b/core/video_display.h
index e0e084987..1259b6e4b 100644
--- a/core/video_display.h
+++ b/core/video_display.h
@@ -41,7 +41,9 @@
 ///////////
 // Headers
 #include <wx/wxprec.h>
+#ifdef __WIN32__
 #include <windows.h>
+#endif
 #include <time.h>