Index: src/SymTab/Autogen.cc
===================================================================
--- src/SymTab/Autogen.cc	(revision d180746e9c094bb8a0500bb2383c1d5d8616da38)
+++ src/SymTab/Autogen.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -15,6 +15,12 @@
 #include "Autogen.h"
 
-#include <cassert>                // for assert, assertf
-#include <cstddef>                // for NULL
+#include <cstddef>                 // for NULL
+#include <algorithm>               // for count_if
+#include <cassert>                 // for safe_dynamic_cast, assert, assertf
+#include <iterator>                // for back_insert_iterator, back_inserter
+#include <list>                    // for list, _List_iterator, list<>::iter...
+#include <set>                     // for set, _Rb_tree_const_iterator
+#include <utility>                 // for pair
+#include <vector>                  // for vector
 
 #include "AddVisit.h"             // for addVisit
@@ -23,4 +29,5 @@
 #include "GenPoly/ScopedSet.h"    // for ScopedSet
 #include "Parser/LinkageSpec.h"   // for AutoGen, Intrinsic, Spec
+#include "SymTab/Mangler.h"       // for mangleType
 #include "SynTree/Statement.h"    // for SwitchStmt (ptr only), CompoundStmt
 #include "SynTree/Type.h"         // for Type, ArrayType, Type::StorageClasses
Index: src/SymTab/Validate.cc
===================================================================
--- src/SymTab/Validate.cc	(revision d180746e9c094bb8a0500bb2383c1d5d8616da38)
+++ src/SymTab/Validate.cc	(revision be9288a525b285ac5a849a870863a162fd3d36c7)
@@ -46,8 +46,11 @@
 #include <utility>                     // for pair
 
+#include "CodeGen/CodeGenerator.h"     // for genName
 #include "Common/PassVisitor.h"        // for PassVisitor, WithDeclsToAdd
 #include "Common/ScopedMap.h"          // for ScopedMap
 #include "Common/SemanticError.h"      // for SemanticError
 #include "Common/UniqueName.h"         // for UniqueName
+#include "Common/utility.h"            // for operator+, cloneAll, deleteAll
+#include "Concurrency/Keywords.h"      // for applyKeywords
 #include "FixFunction.h"               // for FixFunction
 #include "Indexer.h"                   // for Indexer
@@ -55,4 +58,7 @@
 #include "Parser/LinkageSpec.h"        // for C
 #include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "SymTab/AddVisit.h"           // for addVisit
+#include "SymTab/Autogen.h"            // for SizeType
+#include "SynTree/Attribute.h"         // for noAttributes, Attribute
 #include "SynTree/Constant.h"          // for Constant
 #include "SynTree/Declaration.h"       // for ObjectDecl, DeclarationWithType
@@ -68,4 +74,5 @@
 class ReturnStmt;
 class SwitchStmt;
+
 
 #define debugPrint( x ) if ( doDebug ) { std::cout << x; }