diff --git a/build/common.gypi b/build/common.gypi
index ec53bdc9c..3ae185ed0 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -79,11 +79,23 @@
             # Most of the executables we'll ever create are tests
             # and utilities with console output.
             'SubSystem': '1',  # /SUBSYSTEM:CONSOLE
+            'AdditionalLibraryDirectories': [
+              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
+            ],
+          },
+          'VCLibrarianTool': {
+            'AdditionalLibraryDirectories': [
+              '$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86',
+            ],
           },
           'VCResourceCompilerTool': {
             'Culture': '1033',
           },
         },
+        'msvs_system_include_dirs': [
+          '$(ProgramFiles)/Windows Kits/8.0/Include/shared',
+          '$(ProgramFiles)/Windows Kits/8.0/Include/um',
+        ],
       },  # Common
       'Debug': {
         'inherit_from': ['Common'],
diff --git a/samples/build_samples.gyp b/samples/build_samples.gyp
index ccf8ddc78..a70eb0498 100644
--- a/samples/build_samples.gyp
+++ b/samples/build_samples.gyp
@@ -37,7 +37,6 @@
           ],
           'msvs_settings': {
             'VCLinkerTool': {
-              'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
               'AdditionalDependencies': ['d3d9.lib'],
             }
           }
diff --git a/src/build_angle.gypi b/src/build_angle.gypi
index e43e80eee..6cf3fd850 100644
--- a/src/build_angle.gypi
+++ b/src/build_angle.gypi
@@ -340,7 +340,6 @@
           'msvs_disabled_warnings': [ 4267 ],
           'msvs_settings': {
             'VCLinkerTool': {
-              'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
               'AdditionalDependencies': [
                 'd3d9.lib',
                 'dxguid.lib',
@@ -355,7 +354,6 @@
           'include_dirs': [
             '.',
             '../include',
-            '$(DXSDK_DIR)/include',
           ],
           'sources': [
             'common/angleutils.h',
@@ -380,7 +378,6 @@
           'msvs_disabled_warnings': [ 4267 ],
           'msvs_settings': {
             'VCLinkerTool': {
-              'AdditionalLibraryDirectories': ['$(DXSDK_DIR)/lib/x86'],
               'AdditionalDependencies': [
                 'd3d9.lib',
                 'dwmapi.lib',