--- a/src/pathfinder/npf/aystar.cpp
+++ b/src/pathfinder/npf/aystar.cpp
@@ -29,8 +29,8 @@
 #include "../../core/alloc_func.hpp"
 #include "aystar.h"
 
-int _aystar_stats_open_size;
-int _aystar_stats_closed_size;
+static int _aystar_stats_open_size;
+static int _aystar_stats_closed_size;
 
 /* This looks in the Hash if a node exists in ClosedList
  *  If so, it returns the PathNode, else NULL */

--- a/src/pathfinder/yapf/yapf.h
+++ b/src/pathfinder/yapf/yapf.h
@@ -105,15 +105,6 @@
 /** Use this function to notify YAPF that track layout (or signal configuration) has change */
 void YapfNotifyTrackLayoutChange(TileIndex tile, Track track);
 
-/** performance measurement helpers */
-void *NpfBeginInterval();
-int NpfEndInterval(void *perf);
-
-
-extern int _aystar_stats_open_size;
-extern int _aystar_stats_closed_size;
-
-
 /** Base tile length units */
 enum {
 	YAPF_TILE_LENGTH = 100,

--- a/src/pathfinder/yapf/yapf_ship.cpp
+++ b/src/pathfinder/yapf/yapf_ship.cpp
@@ -185,21 +185,3 @@
 	Trackdir td_ret = pfnChooseShipTrack(v, tile, enterdir, tracks);
 	return (td_ret != INVALID_TRACKDIR) ? TrackdirToTrack(td_ret) : INVALID_TRACK;
 }
-
-/** performance measurement helper */
-void *NpfBeginInterval()
-{
-	CPerformanceTimer& perf = *new CPerformanceTimer;
-	perf.Start();
-	return &perf;
-}
-
-/** performance measurement helper */
-int NpfEndInterval(void *vperf)
-{
-	CPerformanceTimer& perf = *(CPerformanceTimer*)vperf;
-	perf.Stop();
-	int t = perf.Get(1000000);
-	delete &perf;
-	return t;
-}