diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 4bb64471bc..cbfa048359 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -824,6 +824,8 @@ $(interpolationWeights)/splineInterpolationWeights/splineInterpolationWeights.C
 
 algorithms/indexedOctree/indexedOctreeName.C
 algorithms/indexedOctree/treeDataCell.C
+algorithms/indexedOctree/treeDataEdge.C
+algorithms/indexedOctree/treeDataPoint.C
 algorithms/indexedOctree/volumeType.C
 
 algorithms/dynamicIndexedOctree/dynamicIndexedOctreeName.C
diff --git a/src/meshTools/AABBTree/AABBTree.C b/src/OpenFOAM/algorithms/AABBTree/AABBTree.C
similarity index 99%
rename from src/meshTools/AABBTree/AABBTree.C
rename to src/OpenFOAM/algorithms/AABBTree/AABBTree.C
index 8e2cb995b9..755496f8f1 100644
--- a/src/meshTools/AABBTree/AABBTree.C
+++ b/src/OpenFOAM/algorithms/AABBTree/AABBTree.C
@@ -27,9 +27,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "AABBTree.H"
-#include "meshTools.H"
 #include "bitSet.H"
-//#include "OFstream.H"
 
 template<class Type>
 Foam::scalar Foam::AABBTree<Type>::tolerance_ = 1e-4;
@@ -46,9 +44,10 @@ void Foam::AABBTree<Type>::writeOBJ
 ) const
 {
     const pointField pts(bb.points());
-    for (const point& pt : pts)
+
+    for (const point& p : pts)
     {
-        meshTools::writeOBJ(os, pt);
+        os << "v " << p.x() << ' ' << p.y() << ' ' << p.z() << nl;
     }
 
     if (writeLinesOnly)
diff --git a/src/meshTools/AABBTree/AABBTree.H b/src/OpenFOAM/algorithms/AABBTree/AABBTree.H
similarity index 100%
rename from src/meshTools/AABBTree/AABBTree.H
rename to src/OpenFOAM/algorithms/AABBTree/AABBTree.H
diff --git a/src/meshTools/indexedOctree/treeDataEdge.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C
similarity index 100%
rename from src/meshTools/indexedOctree/treeDataEdge.C
rename to src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.C
diff --git a/src/meshTools/indexedOctree/treeDataEdge.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.H
similarity index 100%
rename from src/meshTools/indexedOctree/treeDataEdge.H
rename to src/OpenFOAM/algorithms/indexedOctree/treeDataEdge.H
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/OpenFOAM/algorithms/indexedOctree/treeDataPoint.C
similarity index 99%
rename from src/meshTools/indexedOctree/treeDataPoint.C
rename to src/OpenFOAM/algorithms/indexedOctree/treeDataPoint.C
index 76ca62e7fb..ce4a72f400 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/OpenFOAM/algorithms/indexedOctree/treeDataPoint.C
@@ -27,9 +27,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "treeDataPoint.H"
-#include "treeBoundBox.H"
 #include "indexedOctree.H"
-#include "triangleFuncs.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
diff --git a/src/meshTools/indexedOctree/treeDataPoint.H b/src/OpenFOAM/algorithms/indexedOctree/treeDataPoint.H
similarity index 100%
rename from src/meshTools/indexedOctree/treeDataPoint.H
rename to src/OpenFOAM/algorithms/indexedOctree/treeDataPoint.H
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 4194866ded..393e081018 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -89,9 +89,7 @@ regionSplit/localPointRegion.C
 
 regionSplit2D/regionSplit2D.C
 
-indexedOctree/treeDataEdge.C
 indexedOctree/treeDataFace.C
-indexedOctree/treeDataPoint.C
 indexedOctree/treeDataPrimitivePatchName.C
 indexedOctree/treeDataTriSurface.C