use "forward" headers

diff --git a/src/expr/declaration_scope.h b/src/expr/declaration_scope.h
index a402a91397a9b6dcfbedb038dfe2a29f85c89698..76d85bcd7a7c86fb44656567f084a0a986a9287b 100644 (file)
--- a/src/expr/declaration_scope.h
+++ b/src/expr/declaration_scope.h
@@ -26,18 +26,15 @@
 #include "expr/expr.h"
 #include "util/hash.h"
 
+#include "context/cdset_forward.h"
+#include "context/cdmap_forward.h"
+
 namespace CVC4 {
 
 class Type;
 
 namespace context {
   class Context;
-
-  template <class Key, class Data, class HashFcn>
-  class CDMap;
-
-  template <class V, class HashFcn>
-  class CDSet;
 }/* CVC4::context namespace */
 
 class CVC4_PUBLIC ScopeException : public Exception {