17 files changed, 19 insertions, 20 deletions
diff --git a/src/nodes/base/cstnode.h b/src/nodes/base/cst.h
index e05981f..e05981f 100644
--- a/src/nodes/base/cstnode.h
+++ b/src/nodes/base/cst.h
diff --git a/src/nodes/base/declnode.h b/src/nodes/base/decl.h
index f7c7f8c..f7c7f8c 100644
--- a/src/nodes/base/declnode.h
+++ b/src/nodes/base/decl.h
diff --git a/src/nodes/base/exprnode.h b/src/nodes/base/expr.h
index 79193fd..79193fd 100644
--- a/src/nodes/base/exprnode.h
+++ b/src/nodes/base/expr.h
diff --git a/src/nodes/base/typenode.h b/src/nodes/base/type.h
index 265407b..9e8263e 100644
--- a/src/nodes/base/typenode.h
+++ b/src/nodes/base/type.h
@@ -20,8 +20,7 @@
 #ifndef NODES_BASE_TYPENODE_H
 #define NODES_BASE_TYPENODE_H
 
-#include "nodes/base/declnode.h"
-#include "nodes/base/node.h"
+#include "nodes/base/decl.h"
 
 #include <string>
 
diff --git a/src/nodes/functiondeclnode.h b/src/nodes/functiondecl.h
index 0800e1f..20106aa 100644
--- a/src/nodes/functiondeclnode.h
+++ b/src/nodes/functiondecl.h
@@ -20,11 +20,11 @@
 #ifndef NODES_FUNCTIONDECLNODE_H
 #define NODES_FUNCTIONDECLNODE_H
 
-#include "nodes/functiontypenode.h"
-#include "nodes/parmdeclnode.h"
-#include "nodes/resultdeclnode.h"
+#include "nodes/functiontype.h"
+#include "nodes/parmdecl.h"
+#include "nodes/resultdecl.h"
 
-#include "nodes/base/declnode.h"
+#include "nodes/base/decl.h"
 
 #include <string>
 #include <vector>
diff --git a/src/nodes/functiontypenode.h b/src/nodes/functiontype.h
index 48886bb..1f85a08 100644
--- a/src/nodes/functiontypenode.h
+++ b/src/nodes/functiontype.h
@@ -20,9 +20,9 @@
 #ifndef NODES_FUNCTIONTYPENODE_H
 #define NODES_FUNCTIONTYPENODE_H
 
-#include "nodes/treelistnode.h"
+#include "nodes/treelist.h"
 
-#include "nodes/base/typenode.h"
+#include "nodes/base/type.h"
 
 #include <string>
 
diff --git a/src/nodes/identifiernode.h b/src/nodes/identifier.h
index 7d11951..7d11951 100644
--- a/src/nodes/identifiernode.h
+++ b/src/nodes/identifier.h
diff --git a/src/nodes/integercstnode.h b/src/nodes/integercst.h
index ca5d71c..2cf0018 100644
--- a/src/nodes/integercstnode.h
+++ b/src/nodes/integercst.h
@@ -20,7 +20,7 @@
 #ifndef NODES_BASE_INTEGERCSTNODE_H
 #define NODES_BASE_INTEGERCSTNODE_H
 
-#include "nodes/base/cstnode.h"
+#include "nodes/base/cst.h"
 
 struct IntegerCstNode : public CstNode
 {
diff --git a/src/nodes/integertypenode.h b/src/nodes/integertype.h
index 088f2a7..ebd71f4 100644
--- a/src/nodes/integertypenode.h
+++ b/src/nodes/integertype.h
@@ -20,9 +20,9 @@
 #ifndef NODES_INTEGERTYPENODE_H
 #define NODES_INTEGERTYPENODE_H
 
-#include "nodes/integercstnode.h"
+#include "nodes/integercst.h"
 
-#include "nodes/base/typenode.h"
+#include "nodes/base/type.h"
 
 #include <string>
 
diff --git a/src/nodes/parmdeclnode.h b/src/nodes/parmdecl.h
index 98b986c..91f1536 100644
--- a/src/nodes/parmdeclnode.h
+++ b/src/nodes/parmdecl.h
@@ -20,10 +20,10 @@
 #ifndef NODES_PARMDECLNODE_H
 #define NODES_PARMDECLNODE_H
 
-#include "nodes/integercstnode.h"
+#include "nodes/integercst.h"
 
-#include "nodes/base/declnode.h"
-#include "nodes/base/typenode.h"
+#include "nodes/base/decl.h"
+#include "nodes/base/type.h"
 
 struct ParmDeclNode : public DeclNode
 {
diff --git a/src/nodes/pointertypenode.h b/src/nodes/pointertype.h
index ef3ae20..f93bfd3 100644
--- a/src/nodes/pointertypenode.h
+++ b/src/nodes/pointertype.h
@@ -20,7 +20,7 @@
 #ifndef NODES_POINTERTYPENODE_H
 #define NODES_POINTERTYPENODE_H
 
-#include "nodes/base/typenode.h"
+#include "nodes/base/type.h"
 
 #include <string>
 
diff --git a/src/nodes/resultdeclnode.h b/src/nodes/resultdecl.h
index b30de96..e3e0944 100644
--- a/src/nodes/resultdeclnode.h
+++ b/src/nodes/resultdecl.h
@@ -20,7 +20,7 @@
 #ifndef NODES_RESULTDECLNODE_H
 #define NODES_RESULTDECLNODE_H
 
-#include "nodes/base/declnode.h"
+#include "nodes/base/decl.h"
 
 #include <string>
 
diff --git a/src/nodes/returnexprnode.h b/src/nodes/returnexpr.h
index 2a8ead1..efdcc83 100644
--- a/src/nodes/returnexprnode.h
+++ b/src/nodes/returnexpr.h
@@ -20,7 +20,7 @@
 #ifndef NODES_RETURNEXPRNODE_H
 #define NODES_RETURNEXPRNODE_H
 
-#include "nodes/base/exprnode.h"
+#include "nodes/base/expr.h"
 
 #include <string>
 
diff --git a/src/nodes/statementlistnode.h b/src/nodes/statementlist.h
index da65979..db79463 100644
--- a/src/nodes/statementlistnode.h
+++ b/src/nodes/statementlist.h
@@ -20,7 +20,7 @@
 #ifndef NODES_STATEMENTLISTNODE_H
 #define NODES_STATEMENTLISTNODE_H
 
-#include "nodes/base/typenode.h"
+#include "nodes/base/type.h"
 
 #include <vector>
 #include <string>
diff --git a/src/nodes/treelistnode.h b/src/nodes/treelist.h
index ffe374c..ffe374c 100644
--- a/src/nodes/treelistnode.h
+++ b/src/nodes/treelist.h
diff --git a/src/nodes/typedeclnode.h b/src/nodes/typedecl.h
index 3d8999b..8308806 100644
--- a/src/nodes/typedeclnode.h
+++ b/src/nodes/typedecl.h
@@ -20,7 +20,7 @@
 #ifndef NODES_TYPEDECLNODE_H
 #define NODES_TYPEDECLNODE_H
 
-#include "nodes/base/declnode.h"
+#include "nodes/base/decl.h"
 
 #include <string>
 
diff --git a/src/nodes/voidtypenode.h b/src/nodes/voidtype.h
index 20ba48d..c6292d1 100644
--- a/src/nodes/voidtypenode.h
+++ b/src/nodes/voidtype.h
@@ -20,7 +20,7 @@
 #ifndef NODES_VOIDTYPENODE_H
 #define NODES_VOIDTYPENODE_H
 
-#include "nodes/base/typenode.h"
+#include "nodes/base/type.h"
 
 #include <string>