diff --git a/src/include/66/graph.h b/src/include/66/graph.h
index f4bb17192251fdba25efbb99d5d03c7fb1f4d256..3081e10adb982937a2e3d525ff897815e730ebc7 100644
--- a/src/include/66/graph.h
+++ b/src/include/66/graph.h
@@ -19,8 +19,13 @@
 
 #include <oblibs/graph.h>
 
-extern int graph_add_deps(graph_t *g, char const *vertex, char const *edge, uint8_t requiredby) ;
-extern int graph_build(graph_t *g,char const *base, char const *treename, uint8_t what) ;
+#define DATA_SERVICE 0
+#define DATA_TREE 1
+#define DATA_TREE_MASTER 2
+
+extern int graph_build_g(graph_t *g, char const *base, char const *treename, uint8_t data_type) ;
+extern int graph_build_tree(graph_t *g,char const *base) ;
 extern int graph_build_service_bytree(graph_t *g, char const *tree, uint8_t what) ;
+extern int graph_add_deps(graph_t *g, char const *vertex, char const *edge, uint8_t requiredby) ;
 
 #endif
diff --git a/src/include/66/resolve.h b/src/include/66/resolve.h
index 79523650fd5a80aa98a1e327260735852959fe0f..d34dbb82d93d201f41db931696878eb868aec710 100644
--- a/src/include/66/resolve.h
+++ b/src/include/66/resolve.h
@@ -20,14 +20,10 @@
 
 #include <skalibs/genalloc.h>
 #include <skalibs/stralloc.h>
-#include <skalibs/types.h>
 #include <skalibs/cdb.h>
 #include <skalibs/cdbmake.h>
-#include <skalibs/gccattributes.h>
-
-#include <66/ssexec.h>
-#include <66/parser.h>
 
+#include <66/graph.h>
 
 #define SS_RESOLVE "/.resolve"
 #define SS_RESOLVE_LEN (sizeof SS_RESOLVE - 1)
@@ -39,10 +35,6 @@
 #define SS_SIMPLE 0
 #define SS_DOUBLE 1
 
-#define DATA_SERVICE 0
-#define DATA_TREE 1
-#define DATA_TREE_MASTER 2
-
 typedef struct resolve_wrapper_s resolve_wrapper_t, *resolve_wrapper_t_ref ;
 struct resolve_wrapper_s
 {