Index: src/Parser/parser.yy
===================================================================
--- src/Parser/parser.yy	(revision 3c714ad4146140c41cc876465879a4e6cb179592)
+++ src/Parser/parser.yy	(revision 36e6f1046d925b57eafde5cec34d7e4eeb37dcb9)
@@ -48,5 +48,4 @@
 using namespace std;
 
-#include "SynTree/Type.h"                               // for Type
 #include "DeclarationNode.h"                            // for DeclarationNode, ...
 #include "ExpressionNode.h"                             // for ExpressionNode, ...
@@ -2169,11 +2168,11 @@
 type_qualifier_name:
 	CONST
-		{ $$ = DeclarationNode::newTypeQualifier( Type::Const ); }
+		{ $$ = DeclarationNode::newTypeQualifier( ast::CV::Const ); }
 	| RESTRICT
-		{ $$ = DeclarationNode::newTypeQualifier( Type::Restrict ); }
+		{ $$ = DeclarationNode::newTypeQualifier( ast::CV::Restrict ); }
 	| VOLATILE
-		{ $$ = DeclarationNode::newTypeQualifier( Type::Volatile ); }
+		{ $$ = DeclarationNode::newTypeQualifier( ast::CV::Volatile ); }
 	| ATOMIC
-		{ $$ = DeclarationNode::newTypeQualifier( Type::Atomic ); }
+		{ $$ = DeclarationNode::newTypeQualifier( ast::CV::Atomic ); }
 	| forall
 		{ $$ = DeclarationNode::newForall( $1 ); }
@@ -2206,22 +2205,22 @@
 storage_class:
 	EXTERN
-		{ $$ = DeclarationNode::newStorageClass( Type::Extern ); }
+		{ $$ = DeclarationNode::newStorageClass( ast::Storage::Extern ); }
 	| STATIC
-		{ $$ = DeclarationNode::newStorageClass( Type::Static ); }
+		{ $$ = DeclarationNode::newStorageClass( ast::Storage::Static ); }
 	| AUTO
-		{ $$ = DeclarationNode::newStorageClass( Type::Auto ); }
+		{ $$ = DeclarationNode::newStorageClass( ast::Storage::Auto ); }
 	| REGISTER
-		{ $$ = DeclarationNode::newStorageClass( Type::Register ); }
+		{ $$ = DeclarationNode::newStorageClass( ast::Storage::Register ); }
 	| THREADLOCALGCC										// GCC
-		{ $$ = DeclarationNode::newStorageClass( Type::ThreadlocalGcc ); }
+		{ $$ = DeclarationNode::newStorageClass( ast::Storage::ThreadLocalGcc ); }
 	| THREADLOCALC11										// C11
-		{ $$ = DeclarationNode::newStorageClass( Type::ThreadlocalC11 ); }
+		{ $$ = DeclarationNode::newStorageClass( ast::Storage::ThreadLocalC11 ); }
 		// Put function specifiers here to simplify parsing rules, but separate them semantically.
 	| INLINE											// C99
-		{ $$ = DeclarationNode::newFuncSpecifier( Type::Inline ); }
+		{ $$ = DeclarationNode::newFuncSpecifier( ast::Function::Inline ); }
 	| FORTRAN											// C99
-		{ $$ = DeclarationNode::newFuncSpecifier( Type::Fortran ); }
+		{ $$ = DeclarationNode::newFuncSpecifier( ast::Function::Fortran ); }
 	| NORETURN											// C11
-		{ $$ = DeclarationNode::newFuncSpecifier( Type::Noreturn ); }
+		{ $$ = DeclarationNode::newFuncSpecifier( ast::Function::Noreturn ); }
 	;
 
@@ -3717,5 +3716,5 @@
 		{ $$ = $1->addQualifiers( $2 ); }
 	| '&' MUTEX paren_identifier attribute_list_opt
-		{ $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
+		{ $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( ast::CV::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
 	| identifier_parameter_ptr
 	| identifier_parameter_array attribute_list_opt
@@ -3767,5 +3766,5 @@
 		{ $$ = $1->addQualifiers( $2 ); }
 	| '&' MUTEX typedef_name attribute_list_opt
-		{ $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
+		{ $$ = $3->addPointer( DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( ast::CV::Mutex ), OperKinds::AddressOf ) )->addQualifiers( $4 ); }
 	| type_parameter_ptr
 	| type_parameter_array attribute_list_opt
@@ -3941,5 +3940,5 @@
 	abstract_parameter_ptr
 	| '&' MUTEX attribute_list_opt
-		{ $$ = DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( Type::Mutex ), OperKinds::AddressOf )->addQualifiers( $3 ); }
+		{ $$ = DeclarationNode::newPointer( DeclarationNode::newTypeQualifier( ast::CV::Mutex ), OperKinds::AddressOf )->addQualifiers( $3 ); }
 	| abstract_parameter_array attribute_list_opt
 		{ $$ = $1->addQualifiers( $2 ); }