diff --git a/common.gypi b/common.gypi
index 537be24c2fabe0..2027a4e1050430 100644
--- a/common.gypi
+++ b/common.gypi
@@ -615,7 +615,7 @@
           '-q64',
         ],
         # for addons due to v8config.h include of "zos-base.h":
-        'include_dirs':  ['$(ZOSLIB_INCLUDES)'],
+        'include_dirs':  ['<(zoslib_include_dir)'],
       }],
     ],
   }
diff --git a/configure.py b/configure.py
index 9a740caf14e398..8f74784cc0cfad 100755
--- a/configure.py
+++ b/configure.py
@@ -1159,7 +1159,8 @@ def configure_zos(o):
   o['variables']['node_static_zoslib'] = b(True)
   if options.static_zoslib_gyp:
     # Apply to all Node.js components for now
-    o['include_dirs'] += [os.path.dirname(options.static_zoslib_gyp) + '/include']
+    o['variables']['zoslib_include_dir'] = os.path.dirname(options.static_zoslib_gyp) + '/include'
+    o['include_dirs'] += [o['variables']['zoslib_include_dir']]
   else:
     raise Exception('--static-zoslib-gyp=<path to zoslib.gyp file> is required.')