Index: src/CodeGen/FixMain.cc
===================================================================
--- src/CodeGen/FixMain.cc	(revision 43e0949c5f8c1f5a4cfb68e9506dd718e55a6b07)
+++ src/CodeGen/FixMain.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -49,5 +49,5 @@
 
 			os << main_signature->get_scopedMangleName() << "(";
-			const auto& params = main_signature->get_functionType()->get_parameters();
+			const auto& params = main_signature->get_functionType()->parameters;
 			switch(params.size()) {
 				case 3: os << "(" << genTypeAt(params, 0) << ")argc, (" << genTypeAt(params, 1) << ")argv, (" << genTypeAt(params, 2) << ")envp"; break;
Index: src/CodeGen/FixNames.cc
===================================================================
--- src/CodeGen/FixNames.cc	(revision 43e0949c5f8c1f5a4cfb68e9506dd718e55a6b07)
+++ src/CodeGen/FixNames.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -50,5 +50,5 @@
 																   main_type = new FunctionType( Type::Qualifiers(), true ), nullptr )
 				};
-		main_type->get_returnVals().push_back(
+		main_type->returnVals.push_back(
 			new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
 		);
@@ -63,13 +63,13 @@
 																   main_type = new FunctionType( Type::Qualifiers(), false ), nullptr )
 				};
-		main_type->get_returnVals().push_back(
+		main_type->returnVals.push_back(
 			new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
 		);
 
-		main_type->get_parameters().push_back(
+		main_type->parameters.push_back(
 			new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr )
 		);
 
-		main_type->get_parameters().push_back(
+		main_type->parameters.push_back(
 			new ObjectDecl( "", Type::StorageClasses(), LinkageSpec::Cforall, 0,
 			new PointerType( Type::Qualifiers(), new PointerType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Char ) ) ),
@@ -116,5 +116,5 @@
 
 		if(is_main( SymTab::Mangler::mangle(functionDecl, true, true) )) {
-			int nargs = functionDecl->get_functionType()->get_parameters().size();
+			int nargs = functionDecl->get_functionType()->parameters.size();
 			if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
 				SemanticError(functionDecl, "Main expected to have 0, 2 or 3 arguments\n");
Index: src/CodeGen/GenType.cc
===================================================================
--- src/CodeGen/GenType.cc	(revision 43e0949c5f8c1f5a4cfb68e9506dd718e55a6b07)
+++ src/CodeGen/GenType.cc	(revision 2f42718dd1dafad85f808eaefd91c3a4c1871b20)
@@ -186,5 +186,5 @@
 		/************* parameters ***************/
 
-		const std::list<DeclarationWithType *> &pars = funcType->parameters;
+		const auto & pars = funcType->parameters;
 
 		if ( pars.empty() ) {