From c6805c44611ea54022d74aee52c3f3d20bf8c655 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 16 Dec 2015 13:11:44 +0200
Subject: Don't include cli-generated headers into odb-compiled ones

Life is already complicated enough...
---
 bpkg/utility     | 3 ++-
 bpkg/utility.cxx | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bpkg/utility b/bpkg/utility
index b29d066..e1eeb61 100644
--- a/bpkg/utility
+++ b/bpkg/utility
@@ -13,7 +13,6 @@
 #include <butl/filesystem>
 
 #include <bpkg/types>
-#include <bpkg/common-options>
 
 namespace bpkg
 {
@@ -69,6 +68,8 @@ namespace bpkg
   // Run build2, mapping verbosity levels. If quiet is true, then
   // run build2 quiet if our verbosity level is 1.
   //
+  class common_options;
+
   void
   run_b (const common_options&,
          const string& buildspec,
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index 099b56d..e88d31e 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -12,6 +12,8 @@
 #include <bpkg/types>
 #include <bpkg/diagnostics>
 
+#include <bpkg/common-options>
+
 using namespace std;
 using namespace butl;
 
-- 
cgit v1.1