Merge branch 'master' into visitortests

Conflicts:
	src/polyset.h

1 files changed, 2 insertions, 4 deletions

diff --git a/src/PolySetEvaluator.h b/src/PolySetEvaluator.h
index 8d7d1a8..348cbba 100644
--- a/src/PolySetEvaluator.h
+++ b/src/PolySetEvaluator.h
@@ -1,19 +1,17 @@
 #ifndef POLYSETEVALUATOR_H_
 #define POLYSETEVALUATOR_H_
 
-#include "node.h"
-#include "Tree.h"
 #include "memory.h"
 
 class PolySetEvaluator
 {
 public:
-	PolySetEvaluator(const Tree &tree) : tree(tree) {}
+	PolySetEvaluator(const class Tree &tree) : tree(tree) {}
 	virtual ~PolySetEvaluator() {}
 
 	const Tree &getTree() const { return this->tree; }
 
-	virtual shared_ptr<PolySet> getPolySet(const class AbstractNode &, bool cache);
+	virtual shared_ptr<class PolySet> getPolySet(const class AbstractNode &, bool cache);
 
 	virtual PolySet *evaluatePolySet(const class ProjectionNode &) { return NULL; }
 	virtual PolySet *evaluatePolySet(const class LinearExtrudeNode &) { return NULL; }