diff --git a/src/libs/confscreens/playerconfig.cpp b/src/libs/confscreens/playerconfig.cpp
index 233acd257..6a5e78599 100644
--- a/src/libs/confscreens/playerconfig.cpp
+++ b/src/libs/confscreens/playerconfig.cpp
@@ -23,7 +23,6 @@
 #include <deque>
 
 #include <tgfclient.h>
-//#include <track.h>
 #include <robot.h>
 #include <playerpref.h>
 #include <gui.h>
@@ -497,7 +496,6 @@ GenPlayerList(void)
     const char *driver;
     int skilllevel;
     const char *str;
-    int found;
     int racenumber;
     float color[4];
     
diff --git a/src/modules/networking/network.cpp b/src/modules/networking/network.cpp
index c56b52f46..a1c6ea0f0 100644
--- a/src/modules/networking/network.cpp
+++ b/src/modules/networking/network.cpp
@@ -687,7 +687,6 @@ void Network::ReadCarStatusPacket(ENetPacket *pPacket)
 				}
 				else
 				{
-					float delta = pNData->m_vecCarStatus[i].time - status.time;
 					GfOut("Rejected car status from startRank %i\n",status.startRank);
 				}
 				GfOut("Recieved car status from startRank %i\n",status.startRank);
@@ -766,7 +765,6 @@ void Network::ReadCarControlsPacket(ENetPacket *pPacket)
 				}
 				else
 				{
-					float delta = pNData->m_vecCarCtrls[i].time - ctrl.time;
 					GfOut("Rejected car control from startRank %i\n",ctrl.startRank);
 				}
 			}
diff --git a/src/modules/track/track.cpp b/src/modules/track/track.cpp
index aa102e176..1622c40fa 100644
--- a/src/modules/track/track.cpp
+++ b/src/modules/track/track.cpp
@@ -18,18 +18,18 @@
  ***************************************************************************/
 
 
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #include <cstring>
 #include <ctime>
+#include <cmath>
 
 #include <raceman.h>
 #include <tgf.h>
 #include <track.h>
 #include "trackinc.h"
 
-const tdble DEGPRAD = 180.0 / PI;   /* degrees per radian */
+static const tdble DEGPRAD = (tdble)(180.0 / PI);   /* degrees per radian */
 
 static tTrack	*theTrack = NULL;
 static tRoadCam *theCamList;