diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index ac4fcce53b..4f6b88bf8d 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2183,7 +2183,6 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr
 
 				/* Allocate space for this industry. */
 				if (*tilespec == NULL) {
-					int tempid;
 					*tilespec = CallocT<IndustryTileSpec>(1);
 					tsp = *tilespec;
 
@@ -2199,7 +2198,7 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr
 					tsp->grf_prop.local_id = indtid + i;
 					tsp->grf_prop.subst_id = subs_id;
 					tsp->grf_prop.grffile = _cur_grffile;
-					tempid = _industile_mngr.AddEntityID(indtid + i, _cur_grffile->grfid, subs_id); // pre-reserve the tile slot
+					_industile_mngr.AddEntityID(indtid + i, _cur_grffile->grfid, subs_id); // pre-reserve the tile slot
 				}
 			} break;
 
diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp
index ffe62f7fab..a4ea8f70c6 100644
--- a/src/pathfinder/npf/aystar.cpp
+++ b/src/pathfinder/npf/aystar.cpp
@@ -158,7 +158,7 @@ static int AyStarMain_CheckTile(AyStar *aystar, AyStarNode *current, OpenListNod
  */
 static int AyStarMain_Loop(AyStar *aystar)
 {
-	int i, r;
+	int i;
 
 	/* Get the best node from OpenList */
 	OpenListNode *current = AyStarMain_OpenList_Pop(aystar);
@@ -182,7 +182,7 @@ static int AyStarMain_Loop(AyStar *aystar)
 	/* Go through all neighbours */
 	for (i = 0; i < aystar->num_neighbours; i++) {
 		/* Check and add them to the OpenList if needed */
-		r = aystar->checktile(aystar, &aystar->neighbours[i], current);
+		aystar->checktile(aystar, &aystar->neighbours[i], current);
 	}
 
 	/* Free the node */