diff --git a/Makefile.common b/Makefile.common
index 6cad8aa7e7..4822d6b657 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -709,7 +709,8 @@ ifneq ($(findstring Win32,$(OS)),)
    OBJ += media/rarch.o \
           input/drivers_keyboard/keyboard_event_win32.o \
 			 gfx/drivers_wm/win32_common.o \
-			 gfx/drivers_wm/win32_dwm_common.o
+			 gfx/drivers_wm/win32_dwm_common.o \
+			 frontend/drivers/platform_win32.o
 endif
 
 # Record
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
new file mode 100644
index 0000000000..3cdda1c3f3
--- /dev/null
+++ b/frontend/drivers/platform_win32.c
@@ -0,0 +1,38 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * Copyright (C) 2011-2015 - Daniel De Matteis
+ * Copyright (C) 2012-2014 - Jason Fetters
+ * Copyright (C) 2014-2015 - Jay McCarthy
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../frontend.h"
+
+#include <stdint.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <string.h>
+
+const frontend_ctx_driver_t frontend_ctx_win32 = {
+   NULL,                         /* environment_get */
+   NULL,                         /* init */
+   NULL,                         /* deinit */
+   NULL,                         /* exitspawn */
+   NULL,                         /* process_args */
+   NULL,                         /* exec */
+   NULL,                         /* set_fork */
+   NULL,                         /* shutdown */
+   NULL,                         /* get_name */
+   NULL,                         /* get_rating */
+   NULL,                         /* load_content */
+   "win32",
+};
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 1593d72dc1..7d7635d615 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -45,6 +45,9 @@ static const frontend_ctx_driver_t *frontend_ctx_drivers[] = {
 #endif
 #if defined(_3DS)
    &frontend_ctx_ctr,
+#endif
+#if defined(_WIN32) && !defined(_XBOX)
+   &frontend_win32,
 #endif
    &frontend_ctx_null,
    NULL
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3e6a3dc1da..714ea82be8 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -606,6 +606,9 @@ FRONTEND
 
 #include "../frontend/frontend_driver.c"
 
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../frontend/drivers/platform_win32.c"
+#endif
 #if defined(__CELLOS_LV2__)
 #include "../frontend/drivers/platform_ps3.c"
 #elif defined(GEKKO)