diff --git a/kite/src/TrackFixedSegment.cpp b/kite/src/TrackFixedSegment.cpp
index c5943d41..56080c6c 100644
--- a/kite/src/TrackFixedSegment.cpp
+++ b/kite/src/TrackFixedSegment.cpp
@@ -37,6 +37,7 @@
 #include  "hurricane/Horizontal.h"
 #include  "hurricane/Vertical.h"
 #include  "katabatic/AutoContact.h"
+#include  "katabatic/GCellGrid.h"
 #include  "crlcore/RoutingGauge.h"
 #include  "kite/DataNegociate.h"
 #include  "kite/TrackFixedSegment.h"
@@ -45,7 +46,6 @@
 #include  "kite/Session.h"
 #include  "kite/RoutingEvent.h"
 #include  "kite/NegociateWindow.h"
-#include  "kite/GCellGrid.h"
 #include  "kite/KiteEngine.h"
 
 
diff --git a/kite/src/TrackMarker.cpp b/kite/src/TrackMarker.cpp
index 92b58292..1dd421e9 100644
--- a/kite/src/TrackMarker.cpp
+++ b/kite/src/TrackMarker.cpp
@@ -34,7 +34,7 @@
 #include  "hurricane/Net.h"
 #include  "hurricane/Name.h"
 #include  "crlcore/RoutingGauge.h"
-#include  "kite/GCell.h"
+#include  "katabatic/GCell.h"
 #include  "kite/TrackMarker.h"
 #include  "kite/Track.h"
 #include  "kite/RoutingPlane.h"
diff --git a/kite/src/kite/TrackMarker.h b/kite/src/kite/TrackMarker.h
index 0e3ffea3..3dae45da 100644
--- a/kite/src/kite/TrackMarker.h
+++ b/kite/src/kite/TrackMarker.h
@@ -28,6 +28,7 @@
 #ifndef  __KITE_TRACK_MARKER__
 #define  __KITE_TRACK_MARKER__
 
+#include  "hurricane/DbU.h"
 namespace Hurricane {
   class RoutingPad;
   class Net;
@@ -36,6 +37,8 @@ namespace Hurricane {
 
 namespace Kite {
 
+  using Hurricane::Record;
+  using Hurricane::DbU;
   using Hurricane::RoutingPad;
   using Hurricane::Net;
 
@@ -59,8 +62,8 @@ namespace Kite {
       inline  unsigned int getWeight    ( const Track* ) const;
       inline  void         setTrack     ( Track* );
               Record*      _getRecord   () const;
-              string       _getString   () const;
-              string       _getTypeName () const;
+              std::string  _getString   () const;
+              std::string  _getTypeName () const;
     public:
       class Compare {
         public: