diff --git a/src/defaults.cc b/src/defaults.cc
index eb9e0deab0..cbbe53729e 100644
--- a/src/defaults.cc
+++ b/src/defaults.cc
@@ -25,6 +25,9 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// The GYP based build ends up defining USING_V8_SHARED when compiling this
+// file.
+#undef USING_V8_SHARED
 #include "../include/v8-defaults.h"
 
 #include "platform.h"
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 846472dc2d..83549ddf6c 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -61,6 +61,10 @@
             # Note: on non-Windows we still build this file so that gyp
             # has some sources to link into the component.
             '../../src/v8dll-main.cc',
+            '../../src/defaults.cc',
+          ],
+          'include_dirs': [
+            '../../include',
           ],
           'defines': [
             'V8_SHARED',