Index: src/AST/Expr.cpp
===================================================================
--- src/AST/Expr.cpp	(revision e563edf0e794d4c67e735b589a1c95f7fce848f6)
+++ src/AST/Expr.cpp	(revision 7b5694da33510256b93c764421e1bea0be79d671)
@@ -30,5 +30,5 @@
 #include "Common/SemanticError.h"
 #include "GenPoly/Lvalue.h"        // for referencesPermissable
-#include "ResolvExpr/typeops.h"    // for extractResultType
+#include "ResolvExpr/Unify.h"      // for extractResultType
 #include "Tuples/Tuples.h"         // for makeTupleType
 
Index: src/GenPoly/GenPoly.cc
===================================================================
--- src/GenPoly/GenPoly.cc	(revision e563edf0e794d4c67e735b589a1c95f7fce848f6)
+++ src/GenPoly/GenPoly.cc	(revision 7b5694da33510256b93c764421e1bea0be79d671)
@@ -490,4 +490,6 @@
 		}
 
+		/// Flattens a list of types.
+		// There is another flattenList in Unify.
 		void flattenList( vector<ast::ptr<ast::Type>> const & src,
 				vector<ast::ptr<ast::Type>> & out ) {
Index: src/ResolvExpr/Unify.h
===================================================================
--- src/ResolvExpr/Unify.h	(revision e563edf0e794d4c67e735b589a1c95f7fce848f6)
+++ src/ResolvExpr/Unify.h	(revision 7b5694da33510256b93c764421e1bea0be79d671)
@@ -85,4 +85,14 @@
 	const ast::TypeEnvironment & env = {} );
 
+/// Creates the type represented by the list of returnVals in a FunctionType.
+/// The caller owns the return value.
+Type * extractResultType( FunctionType * functionType );
+/// Creates or extracts the type represented by returns in a `FunctionType`.
+ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func );
+
+std::vector<ast::ptr<ast::Type>> flattenList(
+	const std::vector<ast::ptr<ast::Type>> & src, ast::TypeEnvironment & env
+);
+
 } // namespace ResolvExpr
 
Index: src/ResolvExpr/typeops.h
===================================================================
--- src/ResolvExpr/typeops.h	(revision e563edf0e794d4c67e735b589a1c95f7fce848f6)
+++ src/ResolvExpr/typeops.h	(revision 7b5694da33510256b93c764421e1bea0be79d671)
@@ -108,9 +108,4 @@
 		const ast::TypeEnvironment & env );
 
-	/// creates the type represented by the list of returnVals in a FunctionType. The caller owns the return value.
-	Type * extractResultType( FunctionType * functionType );
-	/// Creates or extracts the type represented by the list of returns in a `FunctionType`.
-	ast::ptr<ast::Type> extractResultType( const ast::FunctionType * func );
-
 	// in CommonType.cc
 	Type * commonType( Type * type1, Type * type2, bool widenFirst, bool widenSecond, const SymTab::Indexer & indexer, TypeEnvironment & env, const OpenVarSet & openVars );
@@ -119,8 +114,4 @@
 			ast::TypeEnvironment & env, ast::AssertionSet & need, ast::AssertionSet & have,
 			const ast::OpenVarSet & open, WidenMode widen, const ast::SymbolTable & symtab
-	);
-	// in Unify.cc
-	std::vector< ast::ptr< ast::Type > > flattenList(
-		const std::vector< ast::ptr< ast::Type > > & src, ast::TypeEnvironment & env
 	);
 
@@ -206,6 +197,4 @@
 	}
 
-	
-
 	// in TypeEnvironment.cc
 	bool isFtype( const Type * type );
Index: src/SynTree/ApplicationExpr.cc
===================================================================
--- src/SynTree/ApplicationExpr.cc	(revision e563edf0e794d4c67e735b589a1c95f7fce848f6)
+++ src/SynTree/ApplicationExpr.cc	(revision 7b5694da33510256b93c764421e1bea0be79d671)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ApplicationExpr.cc.cc --
+// ApplicationExpr.cc --
 //
 // Author           : Richard C. Bilson
@@ -26,5 +26,5 @@
 #include "Expression.h"          // for ParamEntry, ApplicationExpr, Expression
 #include "InitTweak/InitTweak.h" // for getFunction
-#include "ResolvExpr/typeops.h"  // for extractResultType
+#include "ResolvExpr/Unify.h"    // for extractResultType
 #include "Type.h"                // for Type, PointerType, FunctionType
 
Index: src/Validate/FixReturnTypes.cpp
===================================================================
--- src/Validate/FixReturnTypes.cpp	(revision e563edf0e794d4c67e735b589a1c95f7fce848f6)
+++ src/Validate/FixReturnTypes.cpp	(revision 7b5694da33510256b93c764421e1bea0be79d671)
@@ -20,5 +20,5 @@
 #include "AST/Type.hpp"
 #include "CodeGen/CodeGenerator.h"
-#include "ResolvExpr/typeops.h"
+#include "ResolvExpr/Unify.h"
 
 namespace ast {