7 files changed, 16 insertions, 19 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index b733f5b..09aed17 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -26,9 +26,11 @@
 #include "ppf.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <process.h>
 #include <windows.h>
 #define strcasecmp _stricmp
+#define usleep(x) Sleep((x) / 1000)
 #else
 #include <pthread.h>
 #include <sys/time.h>
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index b686855..3a2eb1f 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -126,7 +126,7 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 #define STATUS_ERROR     (1<<0) // 0x01
 
 /* Errors */
-#define ERROR_NOT_READY  (1<<7) // 0x80
+#define ERROR_NOTREADY   (1<<7) // 0x80
 #define ERROR_INVALIDCMD (1<<6) // 0x40
 #define ERROR_INVALIDARG (1<<5) // 0x20
 
@@ -984,7 +984,7 @@ void cdrInterrupt() {
 		case DRIVESTATE_PREPARE_CD:
 			SetResultSize(2);
 			cdr.Result[0] = cdr.StatP | STATUS_ERROR;
-			cdr.Result[1] = ERROR_NOT_READY;
+			cdr.Result[1] = ERROR_NOTREADY;
 			cdr.Stat = DiskError;
 			break;
 		}
diff --git a/libpcsxcore/memmap_win32.c b/libpcsxcore/memmap_win32.c
index f4dbdd6..294f058 100644
--- a/libpcsxcore/memmap_win32.c
+++ b/libpcsxcore/memmap_win32.c
@@ -2,7 +2,7 @@
 #include <errno.h>
 #include <io.h>
 
-#include "mman.h"
+#include "memmap.h"
 
 #ifndef FILE_MAP_EXECUTE
 #define FILE_MAP_EXECUTE    0x0020
diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index b7a2489..092c8ae 100644
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -305,7 +305,7 @@ static int ari64_init()
 {
 	extern void (*psxCP2[64])();
 	extern void psxNULL();
-	extern u_char *out;
+	extern unsigned char *out;
 	size_t i;
 
 	new_dynarec_init();
@@ -438,7 +438,7 @@ int new_dynarec_hacks;
 void *psxH_ptr;
 void *zeromem_ptr;
 u8 zero_mem[0x1000];
-u_char *out;
+unsigned char *out;
 void *mem_rtab;
 void *scratch_buf_ptr;
 void new_dynarec_init() { (void)ari64_execute; }
diff --git a/libpcsxcore/new_dynarec/pcsxmem.c b/libpcsxcore/new_dynarec/pcsxmem.c
index d5c32be..9376ff4 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.c
+++ b/libpcsxcore/new_dynarec/pcsxmem.c
@@ -292,7 +292,7 @@ void new_dyna_pcsx_mem_load_state(void)
 	map_rcnt_rcount2(rcnts[2].mode);
 }
 
-int pcsxmem_is_handler_dynamic(u_int addr)
+int pcsxmem_is_handler_dynamic(unsigned int addr)
 {
 	if ((addr & 0xfffff000) != 0x1f801000)
 		return 0;
diff --git a/libpcsxcore/new_dynarec/pcsxmem.h b/libpcsxcore/new_dynarec/pcsxmem.h
index 99bb5d4..72892a8 100644
--- a/libpcsxcore/new_dynarec/pcsxmem.h
+++ b/libpcsxcore/new_dynarec/pcsxmem.h
@@ -6,4 +6,4 @@ void new_dyna_pcsx_mem_reset(void);
 void new_dyna_pcsx_mem_load_state(void);
 void new_dyna_pcsx_mem_shutdown(void);
 
-int pcsxmem_is_handler_dynamic(u_int addr);
+int pcsxmem_is_handler_dynamic(unsigned int addr);
diff --git a/libpcsxcore/plugins.h b/libpcsxcore/plugins.h
index e6ac694..132df90 100644
--- a/libpcsxcore/plugins.h
+++ b/libpcsxcore/plugins.h
@@ -33,24 +33,19 @@ extern "C" {
 typedef void* HWND;
 #define CALLBACK
 
-typedef long (*GPUopen)(unsigned long *, char *, char *);
-typedef long (*SPUopen)(void);
-typedef long (*PADopen)(unsigned long *);
-typedef long (*NETopen)(unsigned long *);
-typedef long (*SIO1open)(unsigned long *);
-
 #else
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
-typedef long (CALLBACK* GPUopen)(HWND);
-typedef long (CALLBACK* SPUopen)(HWND);
-typedef long (CALLBACK* PADopen)(HWND);
-typedef long (CALLBACK* NETopen)(HWND);
-typedef long (CALLBACK* SIO1open)(HWND);
-
 #endif
 
+typedef long (CALLBACK *GPUopen)(unsigned long *, char *, char *);
+typedef long (CALLBACK *SPUopen)(void);
+typedef long (CALLBACK *PADopen)(unsigned long *);
+typedef long (CALLBACK *NETopen)(unsigned long *);
+typedef long (CALLBACK *SIO1open)(unsigned long *);
+
 #include "spu.h"
 
 #include "psemu_plugin_defs.h"