diff --git a/.gitignore b/.gitignore
index ac592b5b..479861a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -174,4 +174,4 @@ build
 test-suite.log
 project.Makefile
 libzmq.target.mk
-
+out/
diff --git a/builds/gyp/platform.hpp b/builds/gyp/platform.hpp
index 935245c5..593d9ef9 100644
--- a/builds/gyp/platform.hpp
+++ b/builds/gyp/platform.hpp
@@ -40,29 +40,33 @@
 #if defined ZMQ_HAVE_WINDOWS
 #   define ZMQ_USE_SELECT 1
 
-#elseif defined ZMQ_HAVE_OSX
+#elif defined ZMQ_HAVE_OSX
 #   define ZMQ_USE_KQUEUE 1
-#   define ZMQ_HAVE_UIO 1
+#   define HAVE_POSIX_MEMALIGN 1
 #   define ZMQ_HAVE_SO_KEEPALIVE 1
 #   define ZMQ_HAVE_TCP_KEEPALIVE 1
 #   define ZMQ_HAVE_TCP_KEEPCNT 1
 #   define ZMQ_HAVE_TCP_KEEPINTVL 1
-#   define HAVE_POSIX_MEMALIGN 1
+#   define ZMQ_HAVE_UIO 1
 #   define HAVE_FORK 1
 
-#elseif defined ZMQ_HAVE_LINUX
+#elif defined ZMQ_HAVE_LINUX
 #   define ZMQ_USE_EPOLL 1
+#   define HAVE_POSIX_MEMALIGN 1
 #   define ZMQ_HAVE_EVENTFD 1
+#   define ZMQ_HAVE_IFADDRS 1
 #   define ZMQ_HAVE_SOCK_CLOEXEC 1
-#   define ZMQ_HAVE_SO_PEERCRED 1
-#   define ZMQ_HAVE_UIO 1
 #   define ZMQ_HAVE_SO_KEEPALIVE 1
+#   define ZMQ_HAVE_SO_PEERCRED 1
 #   define ZMQ_HAVE_TCP_KEEPCNT 1
 #   define ZMQ_HAVE_TCP_KEEPIDLE 1
 #   define ZMQ_HAVE_TCP_KEEPINTVL 1
-#   define HAVE_POSIX_MEMALIGN 1
+#   define ZMQ_HAVE_UIO 1
 #   define HAVE_CLOCK_GETTIME 1
 #   define HAVE_FORK 1
+
+#else
+#   error "No platform defined, abandoning"
 #endif
 
 #endif
diff --git a/project.gyp b/project.gyp
index 50ff9de9..c67955b5 100644
--- a/project.gyp
+++ b/project.gyp
@@ -1,6 +1,7 @@
 #
 #   This is the gyp script for libzmq
 #
+#   Use:
 #   gyp --depth=.
 {
   'targets': [
@@ -138,17 +139,17 @@
       'conditions': [
         [ 'OS=="win"', {
             "defines": [
-              "ZMQ_HAVE_WINDOWS"
+              "ZMQ_HAVE_WINDOWS=1"
             ]
         }],
         [ 'OS=="mac"', {
             "defines": [
-              "ZMQ_HAVE_OSX"
+              "ZMQ_HAVE_OSX=1"
             ]
         }],
         [ 'OS=="linux"', {
             "defines": [
-              "ZMQ_HAVE_LINUX"
+              "ZMQ_HAVE_LINUX=1"
             ]
         }]
       ]