diff --git a/src/xenia/kernel/xsocket.cc b/src/xenia/kernel/xsocket.cc
index 3376f57df..3ff28a76e 100644
--- a/src/xenia/kernel/xsocket.cc
+++ b/src/xenia/kernel/xsocket.cc
@@ -70,9 +70,9 @@ X_STATUS XSocket::Initialize(AddressFamily af, Type type, Protocol proto) {
   type_ = type;
   proto_ = proto;
 
-  if (proto == Protocol::IPPROTO_VDP) {
+  if (proto == Protocol::XE_IPPROTO_VDP) {
     // VDP is a layer on top of UDP.
-    proto = Protocol::IPPROTO_UDP;
+    proto = Protocol::XE_IPPROTO_UDP;
   }
 
   native_handle_ = socket(af, type, proto);
diff --git a/src/xenia/kernel/xsocket.h b/src/xenia/kernel/xsocket.h
index 10dcf42f1..13a146f0f 100644
--- a/src/xenia/kernel/xsocket.h
+++ b/src/xenia/kernel/xsocket.h
@@ -90,13 +90,13 @@ class XSocket : public XObject {
   };
 
   enum Protocol {
-    IPPROTO_TCP = 6,
-    IPPROTO_UDP = 17,
+    XE_IPPROTO_TCP = 6,
+    XE_IPPROTO_UDP = 17,
 
     // LIVE Voice and Data Protocol
     // https://blog.csdn.net/baozi3026/article/details/4277227
     // Format: [cbGameData][GameData(encrypted)][VoiceData(unencrypted)]
-    IPPROTO_VDP = 254,
+    XE_IPPROTO_VDP = 254,
   };
 
   XSocket(KernelState* kernel_state);
diff --git a/src/xenia/kernel/xthread.h b/src/xenia/kernel/xthread.h
index 4c60e5c63..dd0fa31b8 100644
--- a/src/xenia/kernel/xthread.h
+++ b/src/xenia/kernel/xthread.h
@@ -222,6 +222,9 @@ struct X_KPCR {
   uint8_t unk_2AC[0x2C];            // 0x2AC
 };
 
+#ifdef WAIT_ANY
+#undef WAIT_ANY
+#endif
 enum : uint16_t {
   WAIT_ALL = 0,
   WAIT_ANY = 1,