Index: src/CodeGen/GenType.h
===================================================================
--- src/CodeGen/GenType.h	(revision c4b9fa97e347eb42780172529b967ce1034b3e2c)
+++ src/CodeGen/GenType.h	(revision 539a8c8078617974987dd88ab674a236635a0110)
@@ -20,5 +20,4 @@
 #include "CodeGen/Options.h" // for Options
 
-class Type;
 namespace ast {
 	class Type;
@@ -26,7 +25,4 @@
 
 namespace CodeGen {
-	std::string genType( Type *type, const std::string &baseString, const Options &options );
-	std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
-	std::string genPrettyType( Type * type, const std::string & baseString );
 
 std::string genType( ast::Type const * type, const std::string & base, const Options & options );
Index: src/ControlStruct/ExceptDecl.h
===================================================================
--- src/ControlStruct/ExceptDecl.h	(revision c4b9fa97e347eb42780172529b967ce1034b3e2c)
+++ src/ControlStruct/ExceptDecl.h	(revision 539a8c8078617974987dd88ab674a236635a0110)
@@ -16,8 +16,4 @@
 #pragma once
 
-#include <list>  // for list
-
-class Declaration;
-
 namespace ast {
 	class TranslationUnit;
@@ -25,7 +21,8 @@
 
 namespace ControlStruct {
+
 /// Unfold exception declarations into raw structure declarations.
 /// Also builds vtable declarations and converts vtable types.
-void translateExcept( std::list< Declaration *> & translationUnit );
 void translateExcept( ast::TranslationUnit & translationUnit );
+
 }
Index: src/ControlStruct/ExceptTranslate.cpp
===================================================================
--- src/ControlStruct/ExceptTranslate.cpp	(revision c4b9fa97e347eb42780172529b967ce1034b3e2c)
+++ src/ControlStruct/ExceptTranslate.cpp	(revision 539a8c8078617974987dd88ab674a236635a0110)
@@ -26,9 +26,9 @@
 namespace {
 
-	typedef std::list<ast::CatchClause*> CatchList;
-
-	void appendDeclStmt( ast::CompoundStmt * block, ast::DeclWithType * item ) {
-		block->push_back(new ast::DeclStmt(block->location, item));
-	}
+typedef std::list<ast::CatchClause*> CatchList;
+
+void appendDeclStmt( ast::CompoundStmt * block, ast::DeclWithType * item ) {
+	block->push_back( new ast::DeclStmt( block->location, item ) );
+}
 
 class TranslateThrowsCore final : public ast::WithGuards {
Index: src/ControlStruct/ExceptTranslate.h
===================================================================
--- src/ControlStruct/ExceptTranslate.h	(revision c4b9fa97e347eb42780172529b967ce1034b3e2c)
+++ src/ControlStruct/ExceptTranslate.h	(revision 539a8c8078617974987dd88ab674a236635a0110)
@@ -16,7 +16,4 @@
 #pragma once
 
-#include <list>  // for list
-
-class Declaration;
 namespace ast {
 	class TranslationUnit;
@@ -24,16 +21,16 @@
 
 namespace ControlStruct {
-	void translateThrows( std::list< Declaration *> & translationUnit );
-	void translateThrows( ast::TranslationUnit & transUnit );
-	/* Replaces all throw & throwResume statements with function calls.
-	 * These still need to be resolved, so call this before the reslover.
-	 */
 
-	void translateTries( std::list< Declaration *> & translationUnit );
-	void translateTries( ast::TranslationUnit & transUnit );
-	/* Replaces all try blocks (and their many clauses) with function definitions and calls.
-	 * This uses the exception built-ins to produce typed output and should take place after
-	 * the resolver. It also produces virtual casts and should happen before they are expanded.
-	 */
+void translateThrows( ast::TranslationUnit & transUnit );
+/* Replaces all throw & throwResume statements with function calls.
+ * These still need to be resolved, so call this before the reslover.
+ */
+
+void translateTries( ast::TranslationUnit & transUnit );
+/* Replaces all try blocks (and their many clauses) with function definitions and calls.
+ * This uses the exception built-ins to produce typed output and should take place after
+ * the resolver. It also produces virtual casts and should happen before they are expanded.
+ */
+
 }
 
Index: src/GenPoly/ScrubTypeVars.hpp
===================================================================
--- src/GenPoly/ScrubTypeVars.hpp	(revision c4b9fa97e347eb42780172529b967ce1034b3e2c)
+++ src/GenPoly/ScrubTypeVars.hpp	(revision 539a8c8078617974987dd88ab674a236635a0110)
@@ -16,8 +16,8 @@
 #pragma once
 
-#include <cassert>            // for assert
+#include <cassert>            // for strict_dynamic_cast
 
 #include "AST/Fwd.hpp"        // for Node
-#include "GenPoly.h"          // for TypeVarMap, isPolyType, isDynType
+#include "GenPoly.h"          // for TypeVarMap
 
 namespace GenPoly {