Index: src/SymTab/Autogen.h
===================================================================
--- src/SymTab/Autogen.h	(revision fb4dc2836f4baf232dfe867576343c1133659525)
+++ src/SymTab/Autogen.h	(revision e6c9115d8c8d4848a7323b6242ee271e7945b9b6)
@@ -20,10 +20,4 @@
 #include <string>                 // for string
 
-#include "AST/Decl.hpp"
-#include "AST/Expr.hpp"
-#include "AST/Init.hpp"
-#include "AST/Node.hpp"
-#include "AST/Stmt.hpp"
-#include "AST/Type.hpp"
 #include "CodeGen/OperatorTable.h"
 #include "Common/UniqueName.h"    // for UniqueName
@@ -57,7 +51,4 @@
 	/// maybePolymorphic is true if the resulting FunctionType is allowed to be polymorphic
 	FunctionType * genCopyType( Type * paramType, bool maybePolymorphic = true );
-
-	/// Enum for loop direction
-	enum LoopDirection { LoopBackward, LoopForward };
 
 	/// inserts into out a generated call expression to function fname with arguments dstParam and srcParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
Index: src/SymTab/GenImplicitCall.cpp
===================================================================
--- src/SymTab/GenImplicitCall.cpp	(revision fb4dc2836f4baf232dfe867576343c1133659525)
+++ src/SymTab/GenImplicitCall.cpp	(revision e6c9115d8c8d4848a7323b6242ee271e7945b9b6)
@@ -16,9 +16,16 @@
 #include "GenImplicitCall.hpp"
 
+#include "AST/Decl.hpp"                  // for ObjectDecl
+#include "AST/Expr.hpp"                  // for ConstantExpr, UntypedExpr,...
+#include "AST/Init.hpp"                  // for SingleInit
 #include "AST/Inspect.hpp"               // for isUnnamedBitfield
+#include "AST/Stmt.hpp"                  // for ExprStmt
+#include "AST/Type.hpp"                  // for ArrayType, BasicType, ...
 #include "CodeGen/OperatorTable.h"       // for isCtorDtor
 #include "Common/UniqueName.h"           // for UniqueName
 
 namespace SymTab {
+
+namespace {
 
 template< typename OutIter >
@@ -173,4 +180,6 @@
 }
 
+} // namespace
+
 ast::ptr< ast::Stmt > genImplicitCall(
 	InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
Index: src/SymTab/GenImplicitCall.hpp
===================================================================
--- src/SymTab/GenImplicitCall.hpp	(revision fb4dc2836f4baf232dfe867576343c1133659525)
+++ src/SymTab/GenImplicitCall.hpp	(revision e6c9115d8c8d4848a7323b6242ee271e7945b9b6)
@@ -17,8 +17,12 @@
 
 #include "InitTweak/InitTweak.h"  // for InitExpander
-#include "SymTab/Autogen.h"       // for LoopDirection
 
 namespace SymTab {
 
+/// Enum for loop direction
+enum LoopDirection { LoopBackward, LoopForward };
+
+/// Returns a generated call expression to function fname with srcParam and
+/// dstParam. Intended to be used with generated ?=?, ?{}, and ^?{} calls.
 ast::ptr<ast::Stmt> genImplicitCall(
 	InitTweak::InitExpander_new & srcParam, const ast::Expr * dstParam,
@@ -34,3 +38,2 @@
 // compile-command: "make install" //
 // End: //
-