Shortening the name of some precompiler macros.

color_names.hpp

-#define SASS_COLOR_NAMES_INCLUDED
+#define SASS_COLOR_NAMES
 
 namespace Sass {
 

context.hpp

-#define SASS_CONTEXT_INCLUDED
+#define SASS_CONTEXT
 
 
 #include <utility>

document.hpp

 #include <map>
 
-#ifndef SASS_PRELEXER_INCLUDED
+#ifndef SASS_PRELEXER
 #include "prelexer.hpp"
 #endif
 
-#ifndef SASS_NODE_INCLUDED
+#ifndef SASS_NODE
 #include "node.hpp"
 #endif
 
-#ifndef SASS_CONTEXT_INCLUDED
+#ifndef SASS_CONTEXT
 #include "context.hpp"
 #endif
 

eval_apply.hpp

 #include <map>
 
-#ifndef SASS_NODE_INCLUDED
+#ifndef SASS_NODE
 #include "node.hpp"
 #endif
 
-#ifndef SASS_CONTEXT_INCLUDED
+#ifndef SASS_CONTEXT
 #include "context.hpp"
 #endif
 

functions.cpp

-#ifndef SASS_PRELEXER_INCLUDED
+#ifndef SASS_PRELEXER
 #include "prelexer.hpp"
 #endif
 #include "node_factory.hpp"

functions.hpp

 #include <cstring>
 #include <map>
 
-#ifndef SASS_NODE_INCLUDED
+#ifndef SASS_NODE
 #include "node.hpp"
 #endif
 
@@ -11,6 +11,8 @@ namespace Sass {
   typedef Node (*Primitive)(const Node, map<Token, Node>&, Node_Factory& new_Node);
   typedef const char* str;
   typedef str Function_Descriptor[];
+
+  struct Environment;
   
   struct Function {
     
@@ -56,7 +58,7 @@ namespace Sass {
         parameters.push_back(new_Node(Node::variable, "[PRIMITIVE FUNCTIONS]", 0, Token::make(p, p + std::strlen(p))));
       }
     }
-    
+
     Node operator()(map<Token, Node>& bindings, Node_Factory& new_Node) const
     {
       if (primitive) return primitive(parameters, bindings, new_Node);

node.hpp

-#define SASS_NODE_INCLUDED
+#define SASS_NODE
 
 #include <cstring>
 #include <string>

node_factory.hpp

 #include <vector>
 
-#ifndef SASS_NODE_INCLUDED
+#ifndef SASS_NODE
 #include "node.hpp"
 #endif
 

prelexer.hpp

-#define SASS_PRELEXER_INCLUDED
+#define SASS_PRELEXER
 
 namespace Sass {
   namespace Prelexer {

test_node_factory.cpp

@@ -4,7 +4,7 @@
 #include <map>
 #include <algorithm>
 
-#ifndef SASS_NODE_INCLUDED
+#ifndef SASS_NODE
 #include "node.hpp"
 #endif