1 files changed, 5 insertions, 5 deletions
diff --git a/loader/buildfile b/loader/buildfile
index bb5684e..ffa8a9c 100644
--- a/loader/buildfile
+++ b/loader/buildfile
@@ -2,8 +2,6 @@
 # copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-using cli
-
 import libs += libbpkg%lib{bpkg}
 import libs += libbutl%lib{butl}
 import libs += libodb-pgsql%lib{odb-pgsql}
@@ -11,10 +9,12 @@ import libs += libodb%lib{odb}
 
 include ../brep/
 
-loader = cxx{loader} cli.cxx{options}
-exe{brep-loader}: $loader ../brep/libso{brep} $libs
+exe{brep-loader}:            \
+{            cxx}{ loader  } \
+{hxx ixx     cxx}{ options } \
+../brep/lib{brep} $libs
 
 cli.options += -I $src_root --include-with-brackets --include-prefix loader \
 --guard-prefix LOADER --cli-namespace brep::cli
 
-cli.cxx{options}: cli{options}
+{hxx ixx cxx}{options}: cli{options}