Index: src/AST/Convert.cpp
===================================================================
--- src/AST/Convert.cpp	(revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8)
+++ src/AST/Convert.cpp	(revision f7496c5362d3e0bece314ecbca847bc8974b9a8a)
@@ -9,7 +9,7 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 13:19:22 2022
-// Update Count     : 41
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Mar 16 15:01:00 2022
+// Update Count     : 42
 //
 
@@ -49,14 +49,11 @@
 //================================================================================================
 namespace ast {
-
-// This is to preserve the FindSpecialDecls hack. It does not (and perhaps should not)
-// allow us to use the same stratagy in the new ast.
-// xxx - since convert back pass works, this concern seems to be unnecessary.
-
-// these need to be accessed in new FixInit now
-ast::ptr<ast::Type> sizeType = nullptr;
-const ast::FunctionDecl * dereferenceOperator = nullptr;
-const ast::StructDecl   * dtorStruct = nullptr;
-const ast::FunctionDecl * dtorStructDestroy = nullptr;
+// These are the shared local information used by ConverterNewToOld and
+// ConverterOldToNew to update the global information in the two versions.
+
+static ast::ptr<ast::Type> sizeType = nullptr;
+static const ast::FunctionDecl * dereferenceOperator = nullptr;
+static const ast::StructDecl   * dtorStruct = nullptr;
+static const ast::FunctionDecl * dtorStructDestroy = nullptr;
 
 }
Index: src/AST/Fwd.hpp
===================================================================
--- src/AST/Fwd.hpp	(revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8)
+++ src/AST/Fwd.hpp	(revision f7496c5362d3e0bece314ecbca847bc8974b9a8a)
@@ -141,9 +141,5 @@
 
 class TranslationUnit;
-// TODO: Get from the TranslationUnit:
-extern ptr<Type> sizeType;
-extern const FunctionDecl * dereferenceOperator;
-extern const StructDecl   * dtorStruct;
-extern const FunctionDecl * dtorStructDestroy;
+class TranslationGlobal;
 
 }
Index: src/AST/TranslationUnit.hpp
===================================================================
--- src/AST/TranslationUnit.hpp	(revision 33b7d490d37c1f84e96a85cdf1c8baad2b08aeb8)
+++ src/AST/TranslationUnit.hpp	(revision f7496c5362d3e0bece314ecbca847bc8974b9a8a)
@@ -10,6 +10,6 @@
 // Created On       : Tue Jun 11 15:30:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Jun 11 15:42:00 2019
-// Update Count     : 0
+// Last Modified On : Tue Mar 11 11:19:00 2022
+// Update Count     : 1
 //
 
@@ -23,16 +23,18 @@
 namespace ast {
 
+class TranslationGlobal {
+public:
+	std::map< UniqueId, Decl * > idMap;
+
+	ptr<Type> sizeType;
+	const FunctionDecl * dereference;
+	const StructDecl * dtorStruct;
+	const FunctionDecl * dtorDestroy;
+};
+
 class TranslationUnit {
 public:
 	std::list< ptr< Decl > > decls;
-
-	struct Global {
-		std::map< UniqueId, Decl * > idMap;
-
-		ptr<Type> sizeType;
-		const FunctionDecl * dereference;
-		const StructDecl * dtorStruct;
-		const FunctionDecl * dtorDestroy;
-	} global;
+	TranslationGlobal global;
 };