diff --git a/src/pathfinder/npf/aystar.cpp b/src/pathfinder/npf/aystar.cpp
index 66f4343666..0af74d2bcf 100644
--- a/src/pathfinder/npf/aystar.cpp
+++ b/src/pathfinder/npf/aystar.cpp
@@ -38,12 +38,12 @@ static PathNode *AyStarMain_ClosedList_IsInList(AyStar *aystar, const AyStarNode
 
 /* This adds a node to the ClosedList
  *  It makes a copy of the data */
-static void AyStarMain_ClosedList_Add(AyStar *aystar, const PathNode *node)
+void AyStar::ClosedListAdd(const PathNode *node)
 {
 	/* Add a node to the ClosedList */
 	PathNode *new_node = MallocT<PathNode>(1);
 	*new_node = *node;
-	Hash_Set(&aystar->ClosedListHash, node->node.tile, node->node.direction, new_node);
+	Hash_Set(&this->ClosedListHash, node->node.tile, node->node.direction, new_node);
 }
 
 /* Checks if a node is in the OpenList
@@ -168,7 +168,7 @@ int AyStar::Loop()
 	}
 
 	/* Add the node to the ClosedList */
-	AyStarMain_ClosedList_Add(this, &current->path);
+	this->ClosedListAdd(&current->path);
 
 	/* Load the neighbours */
 	this->GetNeighbours(this, current);
diff --git a/src/pathfinder/npf/aystar.h b/src/pathfinder/npf/aystar.h
index c5f433a7a1..152af1b417 100644
--- a/src/pathfinder/npf/aystar.h
+++ b/src/pathfinder/npf/aystar.h
@@ -163,6 +163,8 @@ struct AyStar {
 	void OpenListAdd(PathNode *parent, const AyStarNode *node, int f, int g);
 	OpenListNode *OpenListIsInList(const AyStarNode *node);
 	OpenListNode *OpenListPop();
+
+	void ClosedListAdd(const PathNode *node);
 };
 
 #endif /* AYSTAR_H */