#
#
# patch "work.cc"
#  from [9422397860fe3afc6da4d3dbb018033946b52b0d]
#    to [7855294ba0c0228c5c0c19c15dc974f03e6ecf05]
# 
# patch "work.hh"
#  from [9cb02439ccb622b7ec5001e0364d882e5f67a642]
#    to [17520ad35c3888799b82336286f832c535039261]
#
============================================================
--- work.cc	9422397860fe3afc6da4d3dbb018033946b52b0d
+++ work.cc	7855294ba0c0228c5c0c19c15dc974f03e6ecf05
@@ -8,14 +8,14 @@
 // PURPOSE.
 
 #include "base.hh"
+#include "work.hh"
+
 #include <sstream>
 #include <cstring>
 #include <cerrno>
 #include <queue>
 
 #include "lexical_cast.hh"
-
-#include "work.hh"
 #include "basic_io.hh"
 #include "cset.hh"
 #include "file_io.hh"
============================================================
--- work.hh	9cb02439ccb622b7ec5001e0364d882e5f67a642
+++ work.hh	17520ad35c3888799b82336286f832c535039261
@@ -11,13 +11,16 @@
 // PURPOSE.
 
 #include <set>
-#include <map>
-
+#include "vector.hh"
 #include "vocab.hh"
 #include "paths.hh"
-#include "roster.hh"
 #include "database.hh"
 
+class path_restriction;
+class node_restriction;
+struct content_merge_adaptor;
+class lua_hooks;
+
 //
 // this file defines structures to deal with the "workspace" of a tree
 //
@@ -61,12 +64,6 @@
 // conditions, but works in practice (it is, for instance, the same
 // expectation used by "make").  nonetheless, this mode is off by default.
 
-class path_restriction;
-class node_restriction;
-struct content_merge_adaptor;
-class lua_hooks;
-class database;
-
 struct workspace
 {
   void find_missing(roster_t const & new_roster_shape,