diff --git a/include/gamespy/gsplatformutil.h b/include/gamespy/gsplatformutil.h
index 1af099a..b396f1f 100644
--- a/include/gamespy/gsplatformutil.h
+++ b/include/gamespy/gsplatformutil.h
@@ -32,7 +32,7 @@ unsigned int gsiGetResolvedIP(GSIResolveHostnameHandle handle);
 ///////////////////////////////////////////////////////////////////////////////
 // Get rid of compiler warnings when parameters are never used
 // (Mainly used in sample apps and callback for platform switches)
-#if (defined(__MWERKS__) && !defined(_NITRO)) || defined(WIN32)
+#if (defined(__MWERKS__) && !defined(_NITRO))
 #define GSI_UNUSED(x) x
 #elif defined(_PS2) || defined(_NITRO) || defined(_PS3) || defined(_MACOSX)
 #define GSI_UNUSED(x)                                                                                                  \
@@ -40,8 +40,8 @@ unsigned int gsiGetResolvedIP(GSIResolveHostnameHandle handle);
         void* y = &x;                                                                                                  \
         y = NULL;                                                                                                      \
     }
-#elif defined(_PSP)
-#define GSI_UNUSED(x) (void)x;
+#elif defined(_PSP) || defined(_WIN32)
+#define GSI_UNUSED(x) (void)x
 
 #else
 #define GSI_UNUSED(x)
diff --git a/src/gp/gpiconnect.c b/src/gp/gpiconnect.c
index 8882c26..6b703f6 100644
--- a/src/gp/gpiconnect.c
+++ b/src/gp/gpiconnect.c
@@ -424,7 +424,7 @@ static GPResult gpiSendLogin(GPConnection* connection, GPIConnectData* data)
     gpiAppendIntToBuffer(connection, &iconnection->outputBuffer, iconnection->partnerID);
     gpiAppendStringToBuffer(connection, &iconnection->outputBuffer, "\\response\\");
     gpiAppendStringToBuffer(connection, &iconnection->outputBuffer, response);
-    if (iconnection->firewall == GP_FIREWALL)
+    if (iconnection->firewall == GPITrue)
         gpiAppendStringToBuffer(connection, &iconnection->outputBuffer, "\\firewall\\1");
     gpiAppendStringToBuffer(connection, &iconnection->outputBuffer, "\\port\\");
     gpiAppendIntToBuffer(connection, &iconnection->outputBuffer, iconnection->peerPort);
diff --git a/src/gp/gpisearch.c b/src/gp/gpisearch.c
index 91234b3..fee0701 100644
--- a/src/gp/gpisearch.c
+++ b/src/gp/gpisearch.c
@@ -841,7 +841,7 @@ static GPResult gpiProcessSearch(GPConnection* connection, GPIOperation* operati
 
                     // Start a new operation if they want more matches.
                     ///////////////////////////////////////////////////
-                    if ((more == GP_MORE) && (arg.more == GP_MORE))
+                    if ((more == GPITrue) && (arg.more == GP_MORE))
                         CHECK_RESULT(gpiProfileSearch(connection,
                                                       data->nick,
                                                       data->uniquenick,
diff --git a/src/serverbrowsing/sb_serverbrowsing.c b/src/serverbrowsing/sb_serverbrowsing.c
index e355ad1..2113a3d 100644
--- a/src/serverbrowsing/sb_serverbrowsing.c
+++ b/src/serverbrowsing/sb_serverbrowsing.c
@@ -299,7 +299,7 @@ static SBError WaitForTriggerUpdate(ServerBrowser sb, SBBool viaMaster)
     while (sb->triggerIP != 0 && err == sbe_noerror) {
         msleep(10);
         err = ServerBrowserThink(sb);
-        if (viaMaster && sb->list.state == sb_disconnected) //we were supposed to get from master, and it's disconnected
+        if (viaMaster && sb->list.state == sl_disconnected) //we were supposed to get from master, and it's disconnected
             break;
     }
     return err;