diff --git a/common.gypi b/common.gypi
index fec045922..d07332760 100644
--- a/common.gypi
+++ b/common.gypi
@@ -88,6 +88,15 @@
       'OPENSSL_NO_INLINE_ASM',
       'OPENSSL_NO_NEXTPROTONEG',
     ],
+
+    'conditions': [
+      ['OS == "win"', {
+        'defines': [
+          '_WIN64=1',
+        ],
+      }],
+    ],
+
     'cflags': [
       '-std=c99',
     ],
@@ -115,7 +124,10 @@
             #'WarnAsError': 'true',
             'DebugInformationFormat': '3',
             'ExceptionHandling': '1', # /EHsc
-            'AdditionalOptions': ['/MP'],
+            'AdditionalOptions': [
+              '/MP',
+              '/TP', # Compile as C++
+            ],
           },
           #'VCLibrarianTool': {
           #  'AdditionalLibraryDirectories!':
diff --git a/third_party/wslay.gypi b/third_party/wslay.gypi
index 1a12f32f2..5f8edbf63 100644
--- a/third_party/wslay.gypi
+++ b/third_party/wslay.gypi
@@ -31,6 +31,7 @@
         ['OS == "win"', {
           'defines': [
             'HAVE_WINSOCK2_H=1',
+            'ssize_t=unsigned long long',
           ],
         }],
       ],
@@ -41,11 +42,17 @@
       ],
 
       'sources': [
+        'wslay/lib/includes/wslay/wslay.h',
         'wslay/lib/wslay_event.c',
+        'wslay/lib/wslay_event.h',
         'wslay/lib/wslay_frame.c',
+        'wslay/lib/wslay_frame.h',
         'wslay/lib/wslay_net.c',
+        'wslay/lib/wslay_net.h',
         'wslay/lib/wslay_queue.c',
+        'wslay/lib/wslay_queue.h',
         'wslay/lib/wslay_stack.c',
+        'wslay/lib/wslay_stack.h',
       ],
     }
   ]
diff --git a/xenia.gyp b/xenia.gyp
index ea41ebccb..cfa1cb34b 100644
--- a/xenia.gyp
+++ b/xenia.gyp
@@ -37,9 +37,10 @@
           }],
           ['_type=="executable"', {
             'conditions': [
-              ['OS != "mac"', {
+              ['OS == "win"', {
                 'libraries': [
                   '<@(llvm_libs)',
+                  'wsock32',
                 ],
               }],
               ['OS == "mac"', {