diff --git a/build/msvc-app.mk b/build/msvc-app.mk
new file mode 100644
index 00000000..10c09548
--- /dev/null
+++ b/build/msvc-app.mk
@@ -0,0 +1,15 @@
+include $(SRC_PATH)build/msvc-common.mk
+CFLAGS_OPT += -MD
+CFLAGS_DEBUG += -MDd
+CFLAGS += -DUNICODE
+# Ignore warnings about the main function prototype when building with -ZW
+CXXFLAGS += -ZW -wd4447
+# Ignore warnings about code built with -ZW in .lib files
+AR_OPTS += -ignore:4264
+
+# WelsThreadLib requires building with -ZW, since it uses new Windows Runtime
+# classes for creating threads.
+# If linking an .exe that contains Windows Runtime code, the first object
+# file linked into the exe also needs to be built with -ZW (otherwise the build
+# fails with "vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker",
+# so set it on all files.
diff --git a/build/platform-msvc-app.mk b/build/platform-msvc-app.mk
new file mode 100644
index 00000000..3a394e06
--- /dev/null
+++ b/build/platform-msvc-app.mk
@@ -0,0 +1,3 @@
+include $(SRC_PATH)build/msvc-app.mk
+CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_APP
+
diff --git a/build/platform-msvc-wp.mk b/build/platform-msvc-wp.mk
index 40ffeaa0..0c8cf11f 100644
--- a/build/platform-msvc-wp.mk
+++ b/build/platform-msvc-wp.mk
@@ -1,18 +1,6 @@
 ARCH = arm
-include $(SRC_PATH)build/msvc-common.mk
-CFLAGS_OPT += -MD
-CFLAGS_DEBUG += -MDd
-CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DWINDOWS_PHONE -DUNICODE
-# Ignore warnings about the main function prototype when building with -ZW
-CXXFLAGS += -ZW -wd4447
+include $(SRC_PATH)build/msvc-app.mk
+CFLAGS += -DWINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP -DWINDOWS_PHONE
 LDFLAGS += -nodefaultlib:kernel32.lib -nodefaultlib:ole32.lib WindowsPhoneCore.lib
-UTSHLDFLAGS=-def:ut.def
-# Ignore warnings about code built with -ZW in .lib files
-AR_OPTS += -ignore:4264
+UTSHLDFLAGS = -def:ut.def
 
-# WelsThreadLib requires building with -ZW, since it uses new Windows Runtime
-# classes for creating threads.
-# If linking an .exe that contains Windows Runtime code, the first object
-# file linked into the exe also needs to be built with -ZW (otherwise the build
-# fails with "vccorlib_lib_should_be_specified_before_msvcrt_lib_to_linker",
-# so set it on all files.