Index: src/InitTweak/FixInit.cc
===================================================================
--- src/InitTweak/FixInit.cc	(revision 9a1e509e6ded571c2f6355253b2c7bfa0b4a2340)
+++ src/InitTweak/FixInit.cc	(revision 9191a8e9707eadbd087b3ee1091decf80659e7b0)
@@ -26,4 +26,5 @@
 #include "FixGlobalInit.h"
 #include "CodeGen/GenType.h"  // for warning/error messages
+#include "CodeGen/OperatorTable.h"
 #include "Common/PassVisitor.h"
 #include "GenPoly/DeclMutator.h"
@@ -363,5 +364,5 @@
 					FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
 					assert( ftype );
-					if ( isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
+					if ( CodeGen::isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
 						Type * t1 = getPointerBase( ftype->get_parameters().front()->get_type() );
 						Type * t2 = ftype->get_parameters().back()->get_type();
@@ -372,5 +373,5 @@
 							return appExpr;
 						} // if
-					} else if ( isDestructor( funcDecl->get_name() ) ) {
+					} else if ( CodeGen::isDestructor( funcDecl->get_name() ) ) {
 						// correctness: never copy construct arguments to a destructor
 						return appExpr;
@@ -975,5 +976,5 @@
 			if ( ! funcDecl ) return false;
 			if ( ! funcDecl->get_statements() ) return false;
-			return isCtorDtor( funcDecl->get_name() ) && ! LinkageSpec::isOverridable( funcDecl->get_linkage() );
+			return CodeGen::isCtorDtor( funcDecl->get_name() ) && ! LinkageSpec::isOverridable( funcDecl->get_linkage() );
 		}
 
@@ -992,5 +993,5 @@
 
 			function = funcDecl;
-			isCtor = isConstructor( function->get_name() );
+			isCtor = CodeGen::isConstructor( function->get_name() );
 			if ( checkWarnings( function ) ) {
 				FunctionType * type = function->get_functionType();
Index: src/InitTweak/GenInit.cc
===================================================================
--- src/InitTweak/GenInit.cc	(revision 9a1e509e6ded571c2f6355253b2c7bfa0b4a2340)
+++ src/InitTweak/GenInit.cc	(revision 9191a8e9707eadbd087b3ee1091decf80659e7b0)
@@ -21,4 +21,5 @@
 
 #include "Common/PassVisitor.h"
+#include "CodeGen/OperatorTable.h"
 
 #include "GenPoly/DeclMutator.h"
@@ -235,5 +236,5 @@
 	void CtorDtor::handleDWT( DeclarationWithType * dwt ) {
 		// if this function is a user-defined constructor or destructor, mark down the type as "managed"
-		if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && isCtorDtor( dwt->get_name() ) ) {
+		if ( ! LinkageSpec::isOverridable( dwt->get_linkage() ) && CodeGen::isCtorDtor( dwt->get_name() ) ) {
 			std::list< DeclarationWithType * > & params = GenPoly::getFunctionType( dwt->get_type() )->get_parameters();
 			assert( ! params.empty() );
Index: src/InitTweak/InitTweak.h
===================================================================
--- src/InitTweak/InitTweak.h	(revision 9a1e509e6ded571c2f6355253b2c7bfa0b4a2340)
+++ src/InitTweak/InitTweak.h	(revision 9191a8e9707eadbd087b3ee1091decf80659e7b0)
@@ -26,10 +26,4 @@
 // helper functions for initialization
 namespace InitTweak {
-	bool isConstructor( const std::string & );
-	bool isDestructor( const std::string & );
-	bool isAssignment( const std::string & );
-	bool isCtorDtor( const std::string & );
-	bool isCtorDtorAssign( const std::string & );
-
 	FunctionDecl * isAssignment( Declaration * decl );
 	FunctionDecl * isDestructor( Declaration * decl );