Index: src/ResolvExpr/AdjustExprType.cc
===================================================================
--- src/ResolvExpr/AdjustExprType.cc	(revision 3b0c8cb586be8d0301bb5c39e69256689eab55d9)
+++ src/ResolvExpr/AdjustExprType.cc	(revision 51493a40bf5cb6d9a0eacd5514b1f7618acccfbe)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 23:41:42 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:34:53 2016
-// Update Count     : 4
+// Last Modified On : Wed Dec 11 21:43:56 2019
+// Update Count     : 6
 //
 
@@ -133,10 +133,10 @@
 			// replace known function-type-variables with pointer-to-function
 			if ( const ast::EqvClass * eqvClass = tenv.lookup( inst->name ) ) {
-				if ( eqvClass->data.kind == ast::TypeVar::Ftype ) {
+				if ( eqvClass->data.kind == ast::TypeDecl::Ftype ) {
 					return new ast::PointerType{ inst };
 				}
 			} else if ( const ast::NamedTypeDecl * ntDecl = symtab.lookupType( inst->name ) ) {
 				if ( auto tyDecl = dynamic_cast< const ast::TypeDecl * >( ntDecl ) ) {
-					if ( tyDecl->kind == ast::TypeVar::Ftype ) {
+					if ( tyDecl->kind == ast::TypeDecl::Ftype ) {
 						return new ast::PointerType{ inst };
 					}
Index: src/ResolvExpr/PtrsCastable.cc
===================================================================
--- src/ResolvExpr/PtrsCastable.cc	(revision 3b0c8cb586be8d0301bb5c39e69256689eab55d9)
+++ src/ResolvExpr/PtrsCastable.cc	(revision 51493a40bf5cb6d9a0eacd5514b1f7618acccfbe)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 11:48:00 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:18 2016
-// Update Count     : 8
+// Last Modified On : Wed Dec 11 21:48:33 2019
+// Update Count     : 9
 //
 
@@ -176,10 +176,10 @@
 			if ( const ast::NamedTypeDecl * named = symtab.lookupType( inst->name ) ) {
 				if ( auto tyDecl = dynamic_cast< const ast::TypeDecl * >( named ) ) {
-					if ( tyDecl->kind == ast::TypeVar::Ftype ) {
+					if ( tyDecl->kind == ast::TypeDecl::Ftype ) {
 						return -1;
 					}
 				}
 			} else if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
-				if ( eqvClass->data.kind == ast::TypeVar::Ftype ) {
+				if ( eqvClass->data.kind == ast::TypeDecl::Ftype ) {
 					return -1;
 				}
Index: src/ResolvExpr/Unify.cc
===================================================================
--- src/ResolvExpr/Unify.cc	(revision 3b0c8cb586be8d0301bb5c39e69256689eab55d9)
+++ src/ResolvExpr/Unify.cc	(revision 51493a40bf5cb6d9a0eacd5514b1f7618acccfbe)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:27:10 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Sep  4 10:00:00 2019
-// Update Count     : 44
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:43:05 2019
+// Update Count     : 46
 //
 
@@ -32,5 +32,5 @@
 #include "Common/PassVisitor.h"     // for PassVisitor
 #include "FindOpenVars.h"           // for findOpenVars
-#include "Parser/LinkageSpec.h"     // for C
+#include "SynTree/LinkageSpec.h"    // for C
 #include "SynTree/Constant.h"       // for Constant
 #include "SynTree/Declaration.h"    // for TypeDecl, TypeDecl::Data, Declarati...
@@ -781,5 +781,5 @@
 				if ( const ast::EqvClass * clz = tenv.lookup( typeInst->name ) ) {
 					// expand ttype parameter into its actual type
-					if ( clz->data.kind == ast::TypeVar::Ttype && clz->bound ) {
+					if ( clz->data.kind == ast::TypeDecl::Ttype && clz->bound ) {
 						return clz->bound;
 					}