1 files changed, 8 insertions, 12 deletions
diff --git a/xsd/xsd/cxx/parser/validator.hxx b/xsd/xsd/cxx/parser/validator.hxx
index f519b05..c67cced 100644
--- a/xsd/xsd/cxx/parser/validator.hxx
+++ b/xsd/xsd/cxx/parser/validator.hxx
@@ -1,32 +1,28 @@
 // file      : xsd/cxx/parser/validator.hxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
-// copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC
+// copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC
 // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
 
 #ifndef CXX_PARSER_VALIDATOR_HXX
 #define CXX_PARSER_VALIDATOR_HXX
 
-#include <cxx/parser/elements.hxx>
-#include <cxx/parser/cli.hxx>
-
 #include <xsd.hxx>
+#include <types.hxx>
+
+#include <cxx/parser/elements.hxx>
+#include <cxx/parser/options.hxx>
 
 namespace CXX
 {
   namespace Parser
   {
-    using namespace Cult::Types;
-
     class Validator
     {
     public:
-      Validator (); // Dummy ctor, helps with long symbols on HP-UX.
-
-      Boolean
-      validate (CLI::Options const& options,
+      bool
+      validate (options const&,
                 SemanticGraph::Schema&,
                 SemanticGraph::Path const& tu,
-                Boolean gen_driver,
+                bool gen_driver,
                 const WarningSet& disabled_warnings);
     };
   }