Remove TwoKeyAVLTree from kernel utils again

It's not ready for shared use yet.

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"
 
 

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"
 
 

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"
 
 

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