diff --git a/polymer/eduke32/source/sw/src/game.c b/polymer/eduke32/source/sw/src/game.c
index e44894d28..3075551ad 100644
--- a/polymer/eduke32/source/sw/src/game.c
+++ b/polymer/eduke32/source/sw/src/game.c
@@ -4538,7 +4538,7 @@ FunctionKeys(PLAYERp pp)
                     if (pnum != myconnectindex)
                     {
                         sprintf(ds,"%s: %s",pp->PlayerName, WangBangMacro[fn_key-1]);
-                        SendMessage(pnum, ds);
+                        SW_SendMessage(pnum, ds);
                     }
                 }
             }
@@ -4838,9 +4838,9 @@ SEND_MESSAGE:
                         if (pnum != myconnectindex)
                         {
                             if (TeamSendAll)
-                                SendMessage(pnum, ds);
+                                SW_SendMessage(pnum, ds);
                             else if (User[pp->PlayerSprite]->spal == User[Player[pnum].PlayerSprite]->spal)
-                                SendMessage(pnum, ds);
+                                SW_SendMessage(pnum, ds);
                         }
                     }
                 }
@@ -4849,7 +4849,7 @@ SEND_MESSAGE:
                     {
                         if (pnum != myconnectindex)
                         {
-                            SendMessage(pnum, ds);
+                            SW_SendMessage(pnum, ds);
                         }
                     }
                     adduserquote(MessageInputString);
diff --git a/polymer/eduke32/source/sw/src/jsector.c b/polymer/eduke32/source/sw/src/jsector.c
index 7f984a75e..83e2f3921 100644
--- a/polymer/eduke32/source/sw/src/jsector.c
+++ b/polymer/eduke32/source/sw/src/jsector.c
@@ -1167,7 +1167,7 @@ KillOrgTile(OrgTileP tp)
     ASSERT(tp);
     ASSERT(ValidPtr(tp));
 
-    DELETE(tp);
+    REMOVE(tp);
 
     FreeMem(tp);
 }
diff --git a/polymer/eduke32/source/sw/src/lists.h b/polymer/eduke32/source/sw/src/lists.h
index 164f120e0..ac0794bcf 100644
--- a/polymer/eduke32/source/sw/src/lists.h
+++ b/polymer/eduke32/source/sw/src/lists.h
@@ -54,7 +54,7 @@ typedef
                                     ((LIST)  list)->Prev = (LIST) nodep,        \
                                     ((LIST) nodep)->Prev->Next = (LIST) nodep)
 
-#define DELETE(nodep)        ( ((LIST) nodep)->Prev->Next = ((LIST) nodep)->Next, \
+#define REMOVE(nodep)        ( ((LIST) nodep)->Prev->Next = ((LIST) nodep)->Next, \
                                ((LIST) nodep)->Next->Prev = ((LIST) nodep)->Prev)
 
 
diff --git a/polymer/eduke32/source/sw/src/net.c b/polymer/eduke32/source/sw/src/net.c
index 8f9b4656f..1cd4c2c76 100644
--- a/polymer/eduke32/source/sw/src/net.c
+++ b/polymer/eduke32/source/sw/src/net.c
@@ -434,7 +434,7 @@ ResumeAction(void)
 }
 
 void
-SendMessage(short pnum, char *text)
+SW_SendMessage(short pnum, char *text)
 {
     if (!CommEnabled)
         return;
@@ -561,12 +561,12 @@ CheckVersion(int GameVersion)
 
                 if (!Player[pnum].PlayerVersion)
                 {
-                    SendMessage(pnum, VERSION_MSG);
-                    SendMessage(pnum, VERSION_MSG);
-                    SendMessage(pnum, VERSION_MSG);
-                    SendMessage(pnum, VERSION_MSG);
-                    SendMessage(pnum, VERSION_MSG);
-                    SendMessage(pnum, VERSION_MSG);
+                    SW_SendMessage(pnum, VERSION_MSG);
+                    SW_SendMessage(pnum, VERSION_MSG);
+                    SW_SendMessage(pnum, VERSION_MSG);
+                    SW_SendMessage(pnum, VERSION_MSG);
+                    SW_SendMessage(pnum, VERSION_MSG);
+                    SW_SendMessage(pnum, VERSION_MSG);
                 }
             }
         }
@@ -795,7 +795,7 @@ SWBOOL MenuCommPlayerQuit(short quit_player)
         if (pnum != quit_player)
         {
             sprintf(ds,"%s has quit the game.",Player[myconnectindex].PlayerName);
-            SendMessage(pnum, ds);
+            SW_SendMessage(pnum, ds);
         }
     }
 
diff --git a/polymer/eduke32/source/sw/src/net.h b/polymer/eduke32/source/sw/src/net.h
index 01e67ca79..d9c3ecb85 100644
--- a/polymer/eduke32/source/sw/src/net.h
+++ b/polymer/eduke32/source/sw/src/net.h
@@ -200,7 +200,7 @@ SWBOOL MenuCommPlayerQuit(short quit_player);
 void SendVersion(int version);
 void InitNetPlayerOptions(void);
 void CheckVersion(int GameVersion);
-void SendMessage(short pnum,char *text);
+void SW_SendMessage(short pnum,char *text);
 void PauseGame(void);
 void ResumeGame(void);
 
diff --git a/polymer/eduke32/source/sw/src/panel.c b/polymer/eduke32/source/sw/src/panel.c
index 8144fe442..e0212fa61 100644
--- a/polymer/eduke32/source/sw/src/panel.c
+++ b/polymer/eduke32/source/sw/src/panel.c
@@ -1123,7 +1123,7 @@ SwordBlur(PANEL_SPRITEp psp)
 
     psp->shade += 10;
     // change sprites priority
-    DELETE(psp);
+    REMOVE(psp);
     psp->priority--;
     InsertPanelSprite(psp->PlayerP, psp);
 }
@@ -6361,7 +6361,7 @@ FistBlur(PANEL_SPRITEp psp)
 
     psp->shade += 10;
     // change sprites priority
-    DELETE(psp);
+    REMOVE(psp);
     psp->priority--;
     InsertPanelSprite(psp->PlayerP, psp);
 }
@@ -7252,7 +7252,7 @@ pKillSprite(PANEL_SPRITEp psp)
     PRODUCTION_ASSERT(psp);
     ASSERT(ValidPtr(psp));
 
-    DELETE(psp);
+    REMOVE(psp);
 
     FreeMem(psp);
 }
diff --git a/polymer/eduke32/source/sw/src/player.c b/polymer/eduke32/source/sw/src/player.c
index 3c7956a11..2efaedd42 100644
--- a/polymer/eduke32/source/sw/src/player.c
+++ b/polymer/eduke32/source/sw/src/player.c
@@ -6491,7 +6491,7 @@ DoPlayerDeathMessage(PLAYERp pp, PLAYERp killer)
             if (pnum == myconnectindex)
                 adduserquote(ds);
             else
-                SendMessage(pnum, ds);
+                SW_SendMessage(pnum, ds);
         }
     }