diff --git a/Makefile b/Makefile
index 2a2c0bc2e6..e1e5d2aeb8 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,11 @@ include config.mk
 
 TARGET = retroarch
 
-OBJDIR := obj-unix
+ifeq ($(DEBUG), 1)
+   OBJDIR := obj-unix/debug
+else
+   OBJDIR := obj-unix/release
+endif
 
 OBJ :=
 LIBS :=
@@ -71,6 +75,7 @@ endif
 
 ifeq ($(DEBUG), 1)
    OPTIMIZE_FLAG = -O0 -g
+   DEFINES += -DDEBUG -D_DEBUG
 else
    OPTIMIZE_FLAG = -O3 -ffast-math
 endif
diff --git a/audio/drivers/wasapi.c b/audio/drivers/wasapi.c
index 249ab3589d..593a377082 100644
--- a/audio/drivers/wasapi.c
+++ b/audio/drivers/wasapi.c
@@ -23,11 +23,11 @@
 
 #include <windows.h>
 #include <winerror.h>
+#include <propidl.h>
 #include <initguid.h>
 #include <mmdeviceapi.h>
 #include <mmreg.h>
 #include <audioclient.h>
-#include <propidl.h>
 
 #include <lists/string_list.h>
 #include <queues/fifo_queue.h>
diff --git a/config.def.h b/config.def.h
index 5d0509a835..e020a3bdbf 100644
--- a/config.def.h
+++ b/config.def.h
@@ -670,7 +670,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/apple/
 #endif
 #elif defined(_WIN32) && !defined(_XBOX)
 #if _MSC_VER == 1600
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(_M_X64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86_64/latest/";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2010/x86/latest/";
@@ -680,7 +680,7 @@ static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/window
 #elif _MSC_VER == 1310
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows-msvc2003/x86/latest/";
 #else
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(_M_X64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86_64/latest/";
 #elif defined(__i386__) || defined(__i486__) || defined(__i686__) || defined(_M_IX86) || defined(_M_IA64)
 static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/windows/x86/latest/";
diff --git a/deps/libz/deflate.c b/deps/libz/deflate.c
index 6fc862e5a7..dc570923cb 100644
--- a/deps/libz/deflate.c
+++ b/deps/libz/deflate.c
@@ -49,8 +49,11 @@
 
 /* @(#) $Id$ */
 
-#include "deflate.h"
+#ifdef DEBUG
+#include <stdio.h>
+#endif
 
+#include "deflate.h"
 const char deflate_copyright[] =
 " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
 /*
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 66f4ae4b57..35a252702e 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -21,14 +21,6 @@
 #undef DIRECTINPUT_VERSION
 #define DIRECTINPUT_VERSION 0x0800
 
-#ifndef WM_MOUSEHWHEEL
-#define WM_MOUSEHWHEEL 0x20e
-#endif
-
-#ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL 0x020A
-#endif
-
 #include <dinput.h>
 #include <dbt.h>
 
@@ -39,6 +31,14 @@
 
 #include <windowsx.h>
 
+#ifndef WM_MOUSEHWHEEL
+#define WM_MOUSEHWHEEL 0x20e
+#endif
+
+#ifndef WM_MOUSEWHEEL
+#define WM_MOUSEWHEEL 0x020A
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
 #endif
diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c
index cbb7047ba2..836052fad4 100644
--- a/intl/msg_hash_ko.c
+++ b/intl/msg_hash_ko.c
@@ -25,6 +25,12 @@
 #include "../configuration.h"
 #include "../verbosity.h"
 
+#if defined(_MSC_VER) && !defined(_XBOX)
+/* https://support.microsoft.com/en-us/kb/980263 */
+#pragma execution_character_set("utf-8")
+#pragma warning(disable: 4566)
+#endif
+
 int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
     uint32_t driver_hash = 0;
     settings_t *settings = config_get_ptr();
diff --git a/libretro-common/gfx/scaler/scaler_filter.c b/libretro-common/gfx/scaler/scaler_filter.c
index b329779a3b..6134e99f71 100644
--- a/libretro-common/gfx/scaler/scaler_filter.c
+++ b/libretro-common/gfx/scaler/scaler_filter.c
@@ -26,8 +26,8 @@
 #include <gfx/scaler/filter.h>
 #include <gfx/scaler/scaler_int.h>
 #include <retro_inline.h>
-#include <retro_math.h>
 #include <filters.h>
+#include <retro_math.h>
 
 #define FILTER_UNITY (1 << 14)
 
diff --git a/libretro-common/include/gfx/scaler/scaler.h b/libretro-common/include/gfx/scaler/scaler.h
index 469afaf3ce..8d97515616 100644
--- a/libretro-common/include/gfx/scaler/scaler.h
+++ b/libretro-common/include/gfx/scaler/scaler.h
@@ -23,13 +23,13 @@
 #ifndef __LIBRETRO_SDK_SCALER_H__
 #define __LIBRETRO_SDK_SCALER_H__
 
-#include <retro_common_api.h>
-
 #include <stdint.h>
 #include <stddef.h>
 #include <boolean.h>
 #include <clamping.h>
 
+#include <retro_common_api.h>
+
 RETRO_BEGIN_DECLS
 
 enum scaler_pix_fmt
diff --git a/libretro-common/include/retro_common_api.h b/libretro-common/include/retro_common_api.h
index c2eeac0d86..ff38f9837c 100644
--- a/libretro-common/include/retro_common_api.h
+++ b/libretro-common/include/retro_common_api.h
@@ -76,11 +76,15 @@ typedef int ssize_t;
 #endif
 
 #ifdef _MSC_VER
+#if _MSC_VER >= 1800
+#include <inttypes.h>
+#else
 #ifndef PRId64
 #define PRId64 "I64d"
 #define PRIu64 "I64u"
 #define PRIuPTR "Iu"
 #endif
+#endif
 #else
 /* C++11 says this one isn't needed, but apparently (some versions of) mingw require it anyways */
 /* https://stackoverflow.com/questions/8132399/how-to-printf-uint64-t-fails-with-spurious-trailing-in-format */
diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index b5eeb8849f..be1b90b91b 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -32,6 +32,7 @@
 #endif
 #include <compat/strl.h>
 #include <string/stdstring.h>
+#include <retro_common_api.h>
 
 enum
 {
@@ -397,9 +398,9 @@ struct http_t *net_http_new(struct http_connection_t *conn)
 
       post_len = strlen(conn->postdatacopy);
 #ifdef _WIN32
-      len = snprintf(NULL, 0, "%I64u", post_len);
+      len = snprintf(NULL, 0, "%"PRIuPTR, post_len);
       len_str = (char*)malloc(len + 1);
-      snprintf(len_str, len + 1, "%I64u", post_len);
+      snprintf(len_str, len + 1, "%"PRIuPTR, post_len);
 #else
       len = snprintf(NULL, 0, "%llu", (long long unsigned)post_len);
       len_str = (char*)malloc(len + 1);
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 399af59244..71a0844737 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -50,6 +50,7 @@
 #include <setupapi.h>
 #include <hidsdi.h>
 /* Why doesn't including cguid.h work to get a GUID_NULL instead? */
+__attribute__((weak))
 const GUID GUID_NULL = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};
 #endif
 
diff --git a/ui/drivers/win32/ui_win32_browser_window.c b/ui/drivers/win32/ui_win32_browser_window.c
index 213f6e46bc..6ebcc3b670 100644
--- a/ui/drivers/win32/ui_win32_browser_window.c
+++ b/ui/drivers/win32/ui_win32_browser_window.c
@@ -19,7 +19,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "../../gfx/common/win32_common.h"
 #include <windows.h>
+#include <commdlg.h>
+#include <commctrl.h>
 
 #include "../../ui_companion_driver.h"