diff --git a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
index a3a878469a..3db54a5a2b 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceIPL.cpp
@@ -274,7 +274,7 @@ u32 CEXIIPL::GetGCTime()
 
     // get the time ... 
     const u32 cJanuary2000 = 0x386d35a1;  // seconds between 1.1.1970 and 1.1.2000
-    __int64 ltime = Common::Timer::GetTimeSinceJan1970();
+    u64 ltime = Common::Timer::GetTimeSinceJan1970();
     return ((u32)ltime - cJanuary2000 - Bias);
 }
 
diff --git a/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp b/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp
index 6c4b3a6e56..c8fec8789b 100644
--- a/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp
+++ b/Source/Core/Core/Src/Plugins/Plugin_DVD.cpp
@@ -30,9 +30,9 @@ typedef void (__cdecl* TDVD_Initialize)	(SDVDInitialize);
 typedef void (__cdecl* TDVD_Shutdown)	();
 typedef void (__cdecl* TDVD_SetISOFile)	(const char*);
 typedef BOOL (__cdecl* TDVD_GetISOName)	(TCHAR*, int);
-typedef BOOL (__cdecl* TDVD_ReadToPtr)	(LPBYTE, unsigned __int64, unsigned __int64);
+typedef BOOL (__cdecl* TDVD_ReadToPtr)	(LPBYTE, u64, u64);
 typedef BOOL (__cdecl* TDVD_IsValid)	();
-typedef u32 (__cdecl* TDVD_Read32) (unsigned __int64);
+typedef u32 (__cdecl* TDVD_Read32) (u64);
 
 //! Function Pointer
 TGetDllInfo     g_GetDllInfo        = NULL;
@@ -145,7 +145,7 @@ void DVD_Shutdown()
 	g_DVD_Shutdown();
 }
 
-bool DVD_ReadToPtr(LPBYTE ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength)
+bool DVD_ReadToPtr(LPBYTE ptr, u64 _dwOffset, u64 _dwLength)
 {
 	return (g_DVD_ReadToPtr(ptr, _dwOffset, _dwLength) == TRUE) ? true : false;	
 }
@@ -155,7 +155,7 @@ bool DVD_IsValid()
     return (g_DVD_IsValid() == TRUE) ? true : false;
 }
 
-u32 DVD_Read32(unsigned __int64 _dwOffset)
+u32 DVD_Read32(u64 _dwOffset)
 {
 	return g_DVD_Read32(_dwOffset);
 }
diff --git a/Source/Core/Core/Src/Plugins/Plugin_DVD.h b/Source/Core/Core/Src/Plugins/Plugin_DVD.h
index 9c4af489b2..e2fd00576c 100644
--- a/Source/Core/Core/Src/Plugins/Plugin_DVD.h
+++ b/Source/Core/Core/Src/Plugins/Plugin_DVD.h
@@ -58,13 +58,13 @@ void DVD_SetISOFile(const char* _szFilename);
 BOOL DVD_GetISOName(TCHAR * _szFilename, int maxlen);
 
 //! DVDReadToPtr
-bool DVD_ReadToPtr(LPBYTE ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength);
+bool DVD_ReadToPtr(LPBYTE ptr, u64 _dwOffset, u64 _dwLength);
 
 //! DVD_IsValid
 bool DVD_IsValid();
 
 //! DVDRead32
-u32 DVD_Read32(unsigned __int64 _dwOffset);
+u32 DVD_Read32(u64 _dwOffset);
 
 //! SaveLoadState
 u32 SaveLoadState(char *ptr, BOOL save);
diff --git a/Source/Core/Core/Src/VolumeHandler.cpp b/Source/Core/Core/Src/VolumeHandler.cpp
index 1db86ae2cf..085639e3e7 100644
--- a/Source/Core/Core/Src/VolumeHandler.cpp
+++ b/Source/Core/Core/Src/VolumeHandler.cpp
@@ -50,7 +50,7 @@ u32 Read32(u64 _Offset)
     return 0;
 }
 
-bool ReadToPtr(u8* ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength)
+bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength)
 {
     if (g_pVolume != NULL)
     {
@@ -74,4 +74,4 @@ bool IsWii()
     return false;
 }
 
-}
+}
diff --git a/Source/Core/Core/Src/VolumeHandler.h b/Source/Core/Core/Src/VolumeHandler.h
index 41189fb14f..b36df9f3ab 100644
--- a/Source/Core/Core/Src/VolumeHandler.h
+++ b/Source/Core/Core/Src/VolumeHandler.h
@@ -19,7 +19,7 @@
 #define _VOLUMEHANDLER_H
 
 #include <string>
-#include "Common.h"
+#include "CommonTypes.h"
 #include "Volume.h"
 
 
@@ -30,7 +30,7 @@ void SetVolumeName(const std::string& _rFullPath);
 
 u32 Read32(u64 _Offset);
 
-bool ReadToPtr(u8* ptr, unsigned __int64 _dwOffset, unsigned __int64 _dwLength);
+bool ReadToPtr(u8* ptr, u64 _dwOffset, u64 _dwLength);
 
 bool IsValid();
 
diff --git a/Source/PluginSpecs/CommonTypes.h b/Source/PluginSpecs/CommonTypes.h
index 1647509c51..8bd75dc1ea 100644
--- a/Source/PluginSpecs/CommonTypes.h
+++ b/Source/PluginSpecs/CommonTypes.h
@@ -50,7 +50,6 @@ typedef char s8;
 typedef short s16;
 typedef int s32;
 typedef long long s64;
-#define __int64 long long
 
 #define TCHAR char