diff --git a/src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.cpp
index 0ce010f316..b7d637c1f8 100644
--- a/src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/LastModifiedIndex.cpp
@@ -11,11 +11,11 @@
 #include <TypeConstants.h>
 
 #include <util/SinglyLinkedList.h>
-#include <util/TwoKeyAVLTree.h>
 
 #include "DebugSupport.h"
 #include "IndexImpl.h"
 #include "Node.h"
+#include "TwoKeyAVLTree.h"
 #include "Volume.h"
 
 
diff --git a/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp
index 25bb84cd97..9726b05a90 100644
--- a/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/NameIndex.cpp
@@ -8,11 +8,10 @@
 
 #include <TypeConstants.h>
 
-#include <util/TwoKeyAVLTree.h>
-
 #include "DebugSupport.h"
 #include "IndexImpl.h"
 #include "Node.h"
+#include "TwoKeyAVLTree.h"
 #include "Volume.h"
 
 
diff --git a/src/add-ons/kernel/file_systems/packagefs/SizeIndex.cpp b/src/add-ons/kernel/file_systems/packagefs/SizeIndex.cpp
index a8c7860c0e..18022286fd 100644
--- a/src/add-ons/kernel/file_systems/packagefs/SizeIndex.cpp
+++ b/src/add-ons/kernel/file_systems/packagefs/SizeIndex.cpp
@@ -11,11 +11,11 @@
 #include <TypeConstants.h>
 
 #include <util/SinglyLinkedList.h>
-#include <util/TwoKeyAVLTree.h>
 
 #include "DebugSupport.h"
 #include "IndexImpl.h"
 #include "Node.h"
+#include "TwoKeyAVLTree.h"
 #include "Volume.h"
 
 
diff --git a/headers/private/kernel/util/TwoKeyAVLTree.h b/src/add-ons/kernel/file_systems/packagefs/TwoKeyAVLTree.h
similarity index 99%
rename from headers/private/kernel/util/TwoKeyAVLTree.h
rename to src/add-ons/kernel/file_systems/packagefs/TwoKeyAVLTree.h
index 2c2ecd05c2..ee9d046e17 100644
--- a/headers/private/kernel/util/TwoKeyAVLTree.h
+++ b/src/add-ons/kernel/file_systems/packagefs/TwoKeyAVLTree.h
@@ -2,8 +2,8 @@
  * Copyright 2003-2011, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _KERNEL_UTIL_TWO_KEY_AVL_TREE_H
-#define _KERNEL_UTIL_TWO_KEY_AVL_TREE_H
+#ifndef TWO_KEY_AVL_TREE_H
+#define TWO_KEY_AVL_TREE_H
 
 
 #include <util/AVLTreeMap.h>
@@ -632,4 +632,4 @@ TWO_KEY_AVL_TREE_CLASS_NAME::_FindFirst(const PrimaryKey& key,
 }
 
 
-#endif	// _KERNEL_UTIL_TWO_KEY_AVL_TREE_H
+#endif	// TWO_KEY_AVL_TREE_H