Index: src/Tuples/AssignExpand.cc
===================================================================
--- src/Tuples/AssignExpand.cc	(revision 843054c23fcb725d2486e5e42e91b3741bc523b8)
+++ src/Tuples/AssignExpand.cc	(revision b5b09071113f2e9f4fb6ed95bf2a6b23f0f3c912)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 11:24:47 2015
-// Update Count     : 2
+// Last Modified On : Sat Jun 13 08:16:39 2015
+// Update Count     : 4
 //
 
@@ -23,8 +23,10 @@
 #include "AssignExpand.h"
 
+#include "Parser/ParseNode.h"
+
 #include "SynTree/Type.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
 #include "SynTree/Statement.h"
-#include "SynTree/Expression.h"
-#include "SynTree/Declaration.h"
 
 namespace Tuples {
@@ -100,8 +102,8 @@
 					assert( rhsT->get_results().size() == 1 );
 					// declare temporaries
-					ObjectDecl *lhs = new ObjectDecl( temporaryNamer.newName("_lhs_"), Declaration::NoStorageClass, LinkageSpec::Intrinsic, 0,
+					ObjectDecl *lhs = new ObjectDecl( temporaryNamer.newName("_lhs_"), DeclarationNode::NoStorageClass, LinkageSpec::Intrinsic, 0,
 													  lhsT->get_results().front(), 0 );
 					decls.push_back( new DeclStmt( std::list< Label >(), lhs ) );
-					ObjectDecl *rhs = new ObjectDecl( temporaryNamer.newName("_rhs_"), Declaration::NoStorageClass, LinkageSpec::Intrinsic, 0,
+					ObjectDecl *rhs = new ObjectDecl( temporaryNamer.newName("_rhs_"), DeclarationNode::NoStorageClass, LinkageSpec::Intrinsic, 0,
 													  rhsT->get_results().front(), 0);
 					decls.push_back( new DeclStmt( std::list< Label >(), rhs ));