115 files changed, 211 insertions, 212 deletions

diff --git a/compiler_and_linker/unsorted/CMachine.c b/compiler_and_linker/BackEnd/PowerPC/CMachine.c
index bfa7023..bfa7023 100644
--- a/compiler_and_linker/unsorted/CMachine.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CMachine.c
diff --git a/compiler_and_linker/unsorted/CodeGen.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/CodeGen.c
index 986bddc..d3bac77 100644
--- a/compiler_and_linker/unsorted/CodeGen.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/CodeGen.c
@@ -13,7 +13,7 @@
 #include "compiler/CPrepTokenizer.h"
 #include "compiler/Coloring.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/uDump.h"
+#include "compiler/DumpIR.h"
 #include "compiler/Exceptions.h"
 #include "compiler/InlineAsmPPC.h"
 #include "compiler/Intrinsics.h"
diff --git a/compiler_and_linker/unsorted/Exceptions.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Exceptions.c
index 14627cf..14627cf 100644
--- a/compiler_and_linker/unsorted/Exceptions.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Exceptions.c
diff --git a/compiler_and_linker/unsorted/FunctionCalls.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/FunctionCalls.c
index 67d7443..67d7443 100644
--- a/compiler_and_linker/unsorted/FunctionCalls.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/FunctionCalls.c
diff --git a/compiler_and_linker/unsorted/InstrSelection.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/InstrSelection.c
index 359c980..359c980 100644
--- a/compiler_and_linker/unsorted/InstrSelection.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/InstrSelection.c
diff --git a/compiler_and_linker/unsorted/Intrinsics.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Intrinsics.c
index 49334b8..49334b8 100644
--- a/compiler_and_linker/unsorted/Intrinsics.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Intrinsics.c
diff --git a/compiler_and_linker/unsorted/Operands.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Operands.c
index c5da285..c5da285 100644
--- a/compiler_and_linker/unsorted/Operands.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Operands.c
diff --git a/compiler_and_linker/unsorted/PCodeAssembly.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeAssembly.c
index 368f8c5..368f8c5 100644
--- a/compiler_and_linker/unsorted/PCodeAssembly.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeAssembly.c
diff --git a/compiler_and_linker/unsorted/PCodeListing.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeListing.c
index 7a9fa13..7a9fa13 100644
--- a/compiler_and_linker/unsorted/PCodeListing.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeListing.c
diff --git a/compiler_and_linker/unsorted/PCodeUtilities.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeUtilities.c
index b1f8ffb..b1f8ffb 100644
--- a/compiler_and_linker/unsorted/PCodeUtilities.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/PCodeUtilities.c
diff --git a/compiler_and_linker/unsorted/Peephole.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Peephole.c
index 151e448..151e448 100644
--- a/compiler_and_linker/unsorted/Peephole.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Peephole.c
diff --git a/compiler_and_linker/unsorted/StackFrame.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/StackFrame.c
index 6fa4524..6fa4524 100644
--- a/compiler_and_linker/unsorted/StackFrame.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/StackFrame.c
diff --git a/compiler_and_linker/unsorted/StructMoves.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/StructMoves.c
index 7c28b88..7c28b88 100644
--- a/compiler_and_linker/unsorted/StructMoves.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/StructMoves.c
diff --git a/compiler_and_linker/unsorted/Switch.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Switch.c
index 4bbd82e..4bbd82e 100644
--- a/compiler_and_linker/unsorted/Switch.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/Switch.c
diff --git a/compiler_and_linker/unsorted/TOC.c b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/TOC.c
index 7af09e3..7af09e3 100644
--- a/compiler_and_linker/unsorted/TOC.c
+++ b/compiler_and_linker/BackEnd/PowerPC/CodeGenerator/TOC.c
diff --git a/compiler_and_linker/unsorted/Alias.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/Alias.c
index 8223bf4..8223bf4 100644
--- a/compiler_and_linker/unsorted/Alias.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/Alias.c
diff --git a/compiler_and_linker/unsorted/CodeMotion.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/CodeMotion.c
index 8ce2962..8ce2962 100644
--- a/compiler_and_linker/unsorted/CodeMotion.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/CodeMotion.c
diff --git a/compiler_and_linker/unsorted/ConstantPropagation.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/ConstantPropagation.c
index 2b40453..2b40453 100644
--- a/compiler_and_linker/unsorted/ConstantPropagation.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/ConstantPropagation.c
diff --git a/compiler_and_linker/unsorted/LoopDetection.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/LoopDetection.c
index 6bb2d51..6bb2d51 100644
--- a/compiler_and_linker/unsorted/LoopDetection.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/LoopDetection.c
diff --git a/compiler_and_linker/unsorted/LoopOptimization.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/LoopOptimization.c
index b2aef1e..b2aef1e 100644
--- a/compiler_and_linker/unsorted/LoopOptimization.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/LoopOptimization.c
diff --git a/compiler_and_linker/unsorted/StrengthReduction.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/StrengthReduction.c
index 2b68dca..2b68dca 100644
--- a/compiler_and_linker/unsorted/StrengthReduction.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/StrengthReduction.c
diff --git a/compiler_and_linker/unsorted/ValueNumbering.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/ValueNumbering.c
index 0907fa1..0907fa1 100644
--- a/compiler_and_linker/unsorted/ValueNumbering.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/ValueNumbering.c
diff --git a/compiler_and_linker/unsorted/VectorArraysToRegs.c b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/VectorArraysToRegs.c
index fde27f1..fde27f1 100644
--- a/compiler_and_linker/unsorted/VectorArraysToRegs.c
+++ b/compiler_and_linker/BackEnd/PowerPC/GlobalOptimizer/VectorArraysToRegs.c
diff --git a/compiler_and_linker/unsorted/FuncLevelAsmPPC.c b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/FuncLevelAsmPPC.c
index 27528b8..340a54b 100644
--- a/compiler_and_linker/unsorted/FuncLevelAsmPPC.c
+++ b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/FuncLevelAsmPPC.c
@@ -8,7 +8,7 @@
 #include "compiler/CodeGen.h"
 #include "compiler/Coloring.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/uDump.h"
+#include "compiler/DumpIR.h"
 #include "compiler/InlineAsmPPC.h"
 #include "compiler/InlineAsmRegisters.h"
 #include "compiler/ObjGenMachO.h"
diff --git a/compiler_and_linker/unsorted/GCCInlineAsm.c b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/GCCInlineAsm.c
index 897df9b..897df9b 100644
--- a/compiler_and_linker/unsorted/GCCInlineAsm.c
+++ b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/GCCInlineAsm.c
diff --git a/compiler_and_linker/unsorted/InlineAsm.c b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/InlineAsm.c
index 46a95d2..46a95d2 100644
--- a/compiler_and_linker/unsorted/InlineAsm.c
+++ b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/InlineAsm.c
diff --git a/compiler_and_linker/unsorted/InlineAsmPPC.c b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/InlineAsmPPC.c
index 464f9f9..464f9f9 100644
--- a/compiler_and_linker/unsorted/InlineAsmPPC.c
+++ b/compiler_and_linker/BackEnd/PowerPC/InlineAssembler/InlineAsmPPC.c
diff --git a/compiler_and_linker/unsorted/PCodeInfo.c b/compiler_and_linker/BackEnd/PowerPC/PCode/PCodeInfo.c
index b2e2385..b2e2385 100644
--- a/compiler_and_linker/unsorted/PCodeInfo.c
+++ b/compiler_and_linker/BackEnd/PowerPC/PCode/PCodeInfo.c
diff --git a/compiler_and_linker/unsorted/PPCError.c b/compiler_and_linker/BackEnd/PowerPC/PPCError.c
index 2d4c469..2d4c469 100644
--- a/compiler_and_linker/unsorted/PPCError.c
+++ b/compiler_and_linker/BackEnd/PowerPC/PPCError.c
diff --git a/compiler_and_linker/unsorted/Coloring.c b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/Coloring.c
index 8036435..8036435 100644
--- a/compiler_and_linker/unsorted/Coloring.c
+++ b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/Coloring.c
diff --git a/compiler_and_linker/unsorted/InterferenceGraph.c b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/InterferenceGraph.c
index d589502..d589502 100644
--- a/compiler_and_linker/unsorted/InterferenceGraph.c
+++ b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/InterferenceGraph.c
diff --git a/compiler_and_linker/unsorted/RegisterInfo.c b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/RegisterInfo.c
index 177c2e0..177c2e0 100644
--- a/compiler_and_linker/unsorted/RegisterInfo.c
+++ b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/RegisterInfo.c
diff --git a/compiler_and_linker/unsorted/SpillCode.c b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/SpillCode.c
index 69e7e43..69e7e43 100644
--- a/compiler_and_linker/unsorted/SpillCode.c
+++ b/compiler_and_linker/BackEnd/PowerPC/RegisterAllocator/SpillCode.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation601.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation601.c
index 2d54678..2d54678 100644
--- a/compiler_and_linker/unsorted/MachineSimulation601.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation601.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation603.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation603.c
index 49d1ea0..49d1ea0 100644
--- a/compiler_and_linker/unsorted/MachineSimulation603.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation603.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation603e.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation603e.c
index d3e1e47..d3e1e47 100644
--- a/compiler_and_linker/unsorted/MachineSimulation603e.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation603e.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation604.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation604.c
index 9775c9e..9775c9e 100644
--- a/compiler_and_linker/unsorted/MachineSimulation604.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation604.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation7400.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation7400.c
index 56b375c..56b375c 100644
--- a/compiler_and_linker/unsorted/MachineSimulation7400.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation7400.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation750.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation750.c
index d412df3..d412df3 100644
--- a/compiler_and_linker/unsorted/MachineSimulation750.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation750.c
diff --git a/compiler_and_linker/unsorted/MachineSimulation821.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation821.c
index bbf0509..bbf0509 100644
--- a/compiler_and_linker/unsorted/MachineSimulation821.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulation821.c
diff --git a/compiler_and_linker/unsorted/MachineSimulationAltiVec.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulationAltiVec.c
index d261ee9..d261ee9 100644
--- a/compiler_and_linker/unsorted/MachineSimulationAltiVec.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/MachineSimulationAltiVec.c
diff --git a/compiler_and_linker/unsorted/Scheduler.c b/compiler_and_linker/BackEnd/PowerPC/Scheduler/Scheduler.c
index 23b580f..23b580f 100644
--- a/compiler_and_linker/unsorted/Scheduler.c
+++ b/compiler_and_linker/BackEnd/PowerPC/Scheduler/Scheduler.c
diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c
index ba38b17..1a2cdb1 100644
--- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c
+++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-cc.c
@@ -1,22 +1,22 @@
 #include "cmdline.h"
 #include "parser.h"
 
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/ParserGlue-mach-ppc-common.h"
+#include "ParserGlue-mach-ppc-common.h"
 
 static Boolean useDefaultIncludes = 1;
 static Boolean useDefaultLibraries = 1;
 
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsCmdLine.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsCmdLineCompiler.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsCmdLineLinker.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsFrontEndC.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsDebugging.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsOptimizer.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsWarningC.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsBackEnd.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsProject.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsLinker.opt"
-#include "compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Lib/mac-ppc-cc/OptsDumper.opt"
+#include "../../../Lib/mac-ppc-cc/OptsCmdLine.opt"
+#include "../../../Lib/mac-ppc-cc/OptsCmdLineCompiler.opt"
+#include "../../../Lib/mac-ppc-cc/OptsCmdLineLinker.opt"
+#include "../../../Lib/mac-ppc-cc/OptsFrontEndC.opt"
+#include "../../../Lib/mac-ppc-cc/OptsDebugging.opt"
+#include "../../../Lib/mac-ppc-cc/OptsOptimizer.opt"
+#include "../../../Lib/mac-ppc-cc/OptsWarningC.opt"
+#include "../../../Lib/mac-ppc-cc/OptsBackEnd.opt"
+#include "../../../Lib/mac-ppc-cc/OptsProject.opt"
+#include "../../../Lib/mac-ppc-cc/OptsLinker.opt"
+#include "../../../Lib/mac-ppc-cc/OptsDumper.opt"
 
 char *prefs[] = {
         "PPC CodeGen Mach-O",
diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
index 4eb55d5..fab0f00 100644
--- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
+++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
@@ -139,7 +139,7 @@ int RegisterStaticLibImporterPlugin(void) {
     return RegisterStaticCompilerLinkerPlugin(&machlibimport_cb, &machlibimport_cl_cb);
 }
 
-#include "compiler_and_linker/Plugin_Tools/MacOS_PPC/Lib_Importer_Mach/Resources/Errors.r"
+#include "../../../../../Plugin_Tools/MacOS_PPC/Lib_Importer_Mach/Resources/Errors.r"
 
 int RegisterLibImporterResources(void) {
     return RegisterResource("Mach-O Lib Importer Errors", 911, STR911);
diff --git a/compiler_and_linker/unsorted/CABI.c b/compiler_and_linker/FrontEnd/C/CABI.c
index 2a88de1..2a88de1 100644
--- a/compiler_and_linker/unsorted/CABI.c
+++ b/compiler_and_linker/FrontEnd/C/CABI.c
diff --git a/compiler_and_linker/unsorted/CBrowse.c b/compiler_and_linker/FrontEnd/C/CBrowse.c
index 12ea4c8..12ea4c8 100644
--- a/compiler_and_linker/unsorted/CBrowse.c
+++ b/compiler_and_linker/FrontEnd/C/CBrowse.c
diff --git a/compiler_and_linker/unsorted/CClass.c b/compiler_and_linker/FrontEnd/C/CClass.c
index fad276e..fad276e 100644
--- a/compiler_and_linker/unsorted/CClass.c
+++ b/compiler_and_linker/FrontEnd/C/CClass.c
diff --git a/compiler_and_linker/unsorted/CDecl.c b/compiler_and_linker/FrontEnd/C/CDecl.c
index 43ca92e..43ca92e 100644
--- a/compiler_and_linker/unsorted/CDecl.c
+++ b/compiler_and_linker/FrontEnd/C/CDecl.c
diff --git a/compiler_and_linker/unsorted/CError.c b/compiler_and_linker/FrontEnd/C/CError.c
index 02265c3..02265c3 100644
--- a/compiler_and_linker/unsorted/CError.c
+++ b/compiler_and_linker/FrontEnd/C/CError.c
diff --git a/compiler_and_linker/unsorted/CException.c b/compiler_and_linker/FrontEnd/C/CException.c
index d68ce13..d68ce13 100644
--- a/compiler_and_linker/unsorted/CException.c
+++ b/compiler_and_linker/FrontEnd/C/CException.c
diff --git a/compiler_and_linker/unsorted/CExpr.c b/compiler_and_linker/FrontEnd/C/CExpr.c
index 484f56d..484f56d 100644
--- a/compiler_and_linker/unsorted/CExpr.c
+++ b/compiler_and_linker/FrontEnd/C/CExpr.c
diff --git a/compiler_and_linker/unsorted/CExpr2.c b/compiler_and_linker/FrontEnd/C/CExpr2.c
index e5c662a..fc26c7e 100644
--- a/compiler_and_linker/unsorted/CExpr2.c
+++ b/compiler_and_linker/FrontEnd/C/CExpr2.c
@@ -46,9 +46,9 @@ static CExprReplaceCB cexpr_rsearch_callback;
 static Type *cexpr_left_conversion_type;
 static Type *cexpr_right_conversion_type;
 
-static FuncArg mon_arg = {NULL, NULL, NULL, NULL, 0, 0, 0, 0};
-static FuncArg diadic_arg2 = {NULL, NULL, NULL, NULL, 0, 0, 0, 0};
-static FuncArg diadic_arg1 = {&diadic_arg1, NULL, NULL, NULL, 0, 0, 0, 0};
+static FuncArg mon_arg = {NULL, NULL, NULL, NULL, 0, 0, 0};
+static FuncArg diadic_arg2 = {NULL, NULL, NULL, NULL, 0, 0, 0};
+static FuncArg diadic_arg1 = {&diadic_arg1, NULL, NULL, NULL, 0, 0, 0};
 
 static void CExpr_RecSearchExprTree(ENode *expr) {
     ENodeList *list;
diff --git a/compiler_and_linker/unsorted/CExprConvMatch.c b/compiler_and_linker/FrontEnd/C/CExprConvMatch.c
index 5cc145f..5cc145f 100644
--- a/compiler_and_linker/unsorted/CExprConvMatch.c
+++ b/compiler_and_linker/FrontEnd/C/CExprConvMatch.c
diff --git a/compiler_and_linker/unsorted/CFunc.c b/compiler_and_linker/FrontEnd/C/CFunc.c
index 38cfab3..38cfab3 100644
--- a/compiler_and_linker/unsorted/CFunc.c
+++ b/compiler_and_linker/FrontEnd/C/CFunc.c
diff --git a/compiler_and_linker/unsorted/CInit.c b/compiler_and_linker/FrontEnd/C/CInit.c
index c2d2299..c2d2299 100644
--- a/compiler_and_linker/unsorted/CInit.c
+++ b/compiler_and_linker/FrontEnd/C/CInit.c
diff --git a/compiler_and_linker/unsorted/CInline.c b/compiler_and_linker/FrontEnd/C/CInline.c
index de51ab7..de51ab7 100644
--- a/compiler_and_linker/unsorted/CInline.c
+++ b/compiler_and_linker/FrontEnd/C/CInline.c
diff --git a/compiler_and_linker/unsorted/CMangler.c b/compiler_and_linker/FrontEnd/C/CMangler.c
index 615abf5..615abf5 100644
--- a/compiler_and_linker/unsorted/CMangler.c
+++ b/compiler_and_linker/FrontEnd/C/CMangler.c
diff --git a/compiler_and_linker/unsorted/CParser.c b/compiler_and_linker/FrontEnd/C/CParser.c
index e53b0bf..b089e47 100644
--- a/compiler_and_linker/unsorted/CParser.c
+++ b/compiler_and_linker/FrontEnd/C/CParser.c
@@ -20,8 +20,8 @@
 #include "compiler/CTemplateTools.h"
 #include "compiler/CodeGen.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/IrOptimizer.h"
-#include "compiler/IroPointerAnalysis.h"
+#include "../Optimizer/IrOptimizer.h"
+#include "../Optimizer/IroPointerAnalysis.h"
 #include "compiler/ObjGenMachO.h"
 #include "compiler/objects.h"
 #include "compiler/scopes.h"
diff --git a/compiler_and_linker/unsorted/CPrec.c b/compiler_and_linker/FrontEnd/C/CPrec.c
index e61b96e..e61b96e 100644
--- a/compiler_and_linker/unsorted/CPrec.c
+++ b/compiler_and_linker/FrontEnd/C/CPrec.c
diff --git a/compiler_and_linker/FrontEnd/C/CPrep.c b/compiler_and_linker/FrontEnd/C/CPrep.c
index a2ac9e2..904e72a 100644
--- a/compiler_and_linker/FrontEnd/C/CPrep.c
+++ b/compiler_and_linker/FrontEnd/C/CPrep.c
@@ -14,7 +14,7 @@
 #include "compiler/CodeGen.h"
 #include "compiler/CompilerTools.h"
 #include "compiler/FuncLevelAsmPPC.h"
-#include "compiler/IroPointerAnalysis.h"
+#include "../Optimizer/IroPointerAnalysis.h"
 #include "compiler/ObjGenMachO.h"
 #include "compiler/objects.h"
 #include "compiler/scopes.h"
diff --git a/compiler_and_linker/unsorted/CPreprocess.c b/compiler_and_linker/FrontEnd/C/CPreprocess.c
index 4e6b3c0..4e6b3c0 100644
--- a/compiler_and_linker/unsorted/CPreprocess.c
+++ b/compiler_and_linker/FrontEnd/C/CPreprocess.c
diff --git a/compiler_and_linker/unsorted/CRTTI.c b/compiler_and_linker/FrontEnd/C/CRTTI.c
index 3881153..3881153 100644
--- a/compiler_and_linker/unsorted/CRTTI.c
+++ b/compiler_and_linker/FrontEnd/C/CRTTI.c
diff --git a/compiler_and_linker/unsorted/CSOM.c b/compiler_and_linker/FrontEnd/C/CSOM.c
index afd68a3..7e80e32 100644
--- a/compiler_and_linker/unsorted/CSOM.c
+++ b/compiler_and_linker/FrontEnd/C/CSOM.c
@@ -138,7 +138,6 @@ static FuncArg SOMIDT_arg1 = {
     TYPE(&void_ptr),
     0,
     0,
-    0,
     0
 };
 
diff --git a/compiler_and_linker/unsorted/CTemplateClass.c b/compiler_and_linker/FrontEnd/C/CTemplateClass.c
index 8b3b889..8b3b889 100644
--- a/compiler_and_linker/unsorted/CTemplateClass.c
+++ b/compiler_and_linker/FrontEnd/C/CTemplateClass.c
diff --git a/compiler_and_linker/unsorted/CTemplateFunc.c b/compiler_and_linker/FrontEnd/C/CTemplateFunc.c
index 3c5de98..3c5de98 100644
--- a/compiler_and_linker/unsorted/CTemplateFunc.c
+++ b/compiler_and_linker/FrontEnd/C/CTemplateFunc.c
diff --git a/compiler_and_linker/unsorted/CTemplateNew.c b/compiler_and_linker/FrontEnd/C/CTemplateNew.c
index c33534a..c33534a 100644
--- a/compiler_and_linker/unsorted/CTemplateNew.c
+++ b/compiler_and_linker/FrontEnd/C/CTemplateNew.c
diff --git a/compiler_and_linker/unsorted/CTemplateTools.c b/compiler_and_linker/FrontEnd/C/CTemplateTools.c
index 0e77e74..0e77e74 100644
--- a/compiler_and_linker/unsorted/CTemplateTools.c
+++ b/compiler_and_linker/FrontEnd/C/CTemplateTools.c
diff --git a/compiler_and_linker/unsorted/CIRTransform.c b/compiler_and_linker/FrontEnd/Common/CIRTransform.c
index b91f6af..b91f6af 100644
--- a/compiler_and_linker/unsorted/CIRTransform.c
+++ b/compiler_and_linker/FrontEnd/Common/CIRTransform.c
diff --git a/compiler_and_linker/unsorted/COptimizer.c b/compiler_and_linker/FrontEnd/Common/COptimizer.c
index 9833a2b..3c83ae6 100644
--- a/compiler_and_linker/unsorted/COptimizer.c
+++ b/compiler_and_linker/FrontEnd/Common/COptimizer.c
@@ -14,7 +14,7 @@
 #include "compiler/CodeGen.h"
 #include "compiler/Switch.h"
 #include "compiler/Exceptions.h"
-#include "compiler/IrOptimizer.h"
+#include "../Optimizer/IrOptimizer.h"
 #include "cos.h"
 
 COptBlock *basicblocks;
diff --git a/includes/compiler/BitVector.h b/compiler_and_linker/FrontEnd/Optimizer/BitVector.h
index a6830d6..a6830d6 100644
--- a/includes/compiler/BitVector.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/BitVector.h
diff --git a/compiler_and_linker/unsorted/IROUseDef.c b/compiler_and_linker/FrontEnd/Optimizer/IROUseDef.c
index 19d39ff..ba3f817 100644
--- a/compiler_and_linker/unsorted/IROUseDef.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IROUseDef.c
@@ -1,12 +1,12 @@
-#include "compiler/IROUseDef.h"
-#include "compiler/IRODump.h"
-#include "compiler/IROVars.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroTransform.h"
-#include "compiler/IroUtil.h"
+#include "IROUseDef.h"
+#include "IroDump.h"
+#include "IroVars.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroTransform.h"
+#include "IroUtil.h"
 #include "compiler/CompilerTools.h"
 #include "compiler/CError.h"
 #include "compiler/CFunc.h"
diff --git a/includes/compiler/IROUseDef.h b/compiler_and_linker/FrontEnd/Optimizer/IROUseDef.h
index 829a396..03d3f9b 100644
--- a/includes/compiler/IROUseDef.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IROUseDef.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROUSEDEF_H
 #define COMPILER_IROUSEDEF_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 #include "compiler/enode.h"
 
 #ifdef __MWERKS__
diff --git a/compiler_and_linker/unsorted/IrOptimizer.c b/compiler_and_linker/FrontEnd/Optimizer/IrOptimizer.c
index c9544a2..59bb368 100644
--- a/compiler_and_linker/unsorted/IrOptimizer.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IrOptimizer.c
@@ -1,26 +1,26 @@
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 #include "compiler/CError.h"
 #include "compiler/CParser.h"
 #include "compiler/InlineAsmPPC.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroEval.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IroTransform.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroEval.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroSubable.h"
+#include "IroTransform.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/objects.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroJump.h"
-#include "compiler/IroRangePropagation.h"
-#include "compiler/IroEmptyLoop.h"
-#include "compiler/IroUnrollLoop.h"
-#include "compiler/IroLoop.h"
-#include "compiler/IroExprRegeneration.h"
+#include "IroPropagate.h"
+#include "IroPointerAnalysis.h"
+#include "IroJump.h"
+#include "IroRangePropagation.h"
+#include "IroEmptyLoop.h"
+#include "IroUnrollLoop.h"
+#include "IroLoop.h"
+#include "IroExprRegeneration.h"
 
 Boolean DoScalarize;
 Boolean DoLinearize;
diff --git a/includes/compiler/IrOptimizer.h b/compiler_and_linker/FrontEnd/Optimizer/IrOptimizer.h
index 287e279..287e279 100644
--- a/includes/compiler/IrOptimizer.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IrOptimizer.h
diff --git a/compiler_and_linker/unsorted/IroBitVect.c b/compiler_and_linker/FrontEnd/Optimizer/IroBitVect.c
index 29bc28a..873b1ca 100644
--- a/compiler_and_linker/unsorted/IroBitVect.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroBitVect.c
@@ -1,4 +1,4 @@
-#include "compiler/BitVector.h"
+#include "BitVector.h"
 #include "compiler/CompilerTools.h"
 
 void Bv_AllocVector(BitVector **bv, UInt32 size) {
diff --git a/compiler_and_linker/unsorted/IroCSE.c b/compiler_and_linker/FrontEnd/Optimizer/IroCSE.c
index 5fa9849..7bc4866 100644
--- a/compiler_and_linker/unsorted/IroCSE.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroCSE.c
@@ -1,13 +1,13 @@
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroSubable.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CError.h"
 #include "compiler/CExpr.h"
 #include "compiler/CInt64.h"
diff --git a/includes/compiler/IroCSE.h b/compiler_and_linker/FrontEnd/Optimizer/IroCSE.h
index 4bf127c..c1e166c 100644
--- a/includes/compiler/IroCSE.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroCSE.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROCSE_H
 #define COMPILER_IROCSE_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 
 #ifdef __MWERKS__
 #pragma options align=mac68k
diff --git a/compiler_and_linker/unsorted/IroDump.c b/compiler_and_linker/FrontEnd/Optimizer/IroDump.c
index e7ca940..d21496f 100644
--- a/compiler_and_linker/unsorted/IroDump.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroDump.c
@@ -1,14 +1,14 @@
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroUtil.h"
+#include "IroDump.h"
+#include "IroCSE.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CFunc.h"
 #include "compiler/CInt64.h"
 #include "compiler/CParser.h"
 #include "compiler/objects.h"
-#include "compiler/IroVars.h"
-#include "compiler/IroCSE.h"
 
 static FILE *DumpFile;
 static char *nodenames[MAXEXPR];
diff --git a/includes/compiler/IroDump.h b/compiler_and_linker/FrontEnd/Optimizer/IroDump.h
index 5445280..ad8c039 100644
--- a/includes/compiler/IroDump.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroDump.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IRODUMP_H
 #define COMPILER_IRODUMP_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 #include "compiler/enode.h"
 
 extern char *IRO_NodeName(ENodeType nodetype);
diff --git a/compiler_and_linker/unsorted/IroEmptyLoop.c b/compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.c
index 1e319ab..23d5d4a 100644
--- a/compiler_and_linker/unsorted/IroEmptyLoop.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.c
@@ -1,10 +1,10 @@
-#include "compiler/IroEmptyLoop.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroLoop.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroEmptyLoop.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroLoop.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CInt64.h"
 
 // forward decls
diff --git a/includes/compiler/IroEmptyLoop.h b/compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.h
index 5268f18..c5597e6 100644
--- a/includes/compiler/IroEmptyLoop.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroEmptyLoop.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROEMPTYLOOP_H
 #define COMPILER_IROEMPTYLOOP_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_FindEmptyLoops(void);
 
diff --git a/compiler_and_linker/unsorted/IroEval.c b/compiler_and_linker/FrontEnd/Optimizer/IroEval.c
index adf74b8..aba64e1 100644
--- a/compiler_and_linker/unsorted/IroEval.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroEval.c
@@ -1,13 +1,13 @@
-#include "compiler/IroEval.h"
+#include "IroEval.h"
 #include "compiler/CInt64.h"
 #include "compiler/CMachine.h"
 #include "compiler/CParser.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/enode.h"
 #include "compiler/objects.h"
 #include "compiler/types.h"
diff --git a/includes/compiler/IroEval.h b/compiler_and_linker/FrontEnd/Optimizer/IroEval.h
index a011a47..3b91f21 100644
--- a/includes/compiler/IroEval.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroEval.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROEVAL_H
 #define COMPILER_IROEVAL_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_InitializeIsAssociativeENodeTypeArray(void);
 extern void IRO_TruncateValueToType(CInt64 *val, Type *type);
diff --git a/compiler_and_linker/unsorted/IroExprRegeneration.c b/compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.c
index f63622a..c56beae 100644
--- a/compiler_and_linker/unsorted/IroExprRegeneration.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.c
@@ -1,13 +1,13 @@
-#include "compiler/IroExprRegeneration.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IroTransform.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroExprRegeneration.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroSubable.h"
+#include "IroTransform.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CDecl.h"
 #include "compiler/CExpr.h"
 #include "compiler/CFunc.h"
diff --git a/includes/compiler/IroExprRegeneration.h b/compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.h
index aa43501..c74f95f 100644
--- a/includes/compiler/IroExprRegeneration.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroExprRegeneration.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROEXPRREGENERATION_H
 #define COMPILER_IROEXPRREGENERATION_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_RegenerateExpressions(void);
 
diff --git a/compiler_and_linker/unsorted/IroFlowgraph.c b/compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.c
index 5c9c840..2fa9875 100644
--- a/compiler_and_linker/unsorted/IroFlowgraph.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.c
@@ -1,9 +1,9 @@
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
+#include "IroFlowgraph.h"
+#include "IroCSE.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
 #include "compiler/CError.h"
 #include "compiler/CFunc.h"
 #include "compiler/CompilerTools.h"
diff --git a/includes/compiler/IroFlowgraph.h b/compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.h
index 90e696c..13ddce9 100644
--- a/includes/compiler/IroFlowgraph.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroFlowgraph.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROFLOWGRAPH_H
 #define COMPILER_IROFLOWGRAPH_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 #include "compiler/CError.h"
 #include "compiler/CompilerTools.h"
 
diff --git a/compiler_and_linker/unsorted/IroJump.c b/compiler_and_linker/FrontEnd/Optimizer/IroJump.c
index e39e3f0..9af248e 100644
--- a/compiler_and_linker/unsorted/IroJump.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroJump.c
@@ -1,8 +1,8 @@
-#include "compiler/IroJump.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroUtil.h"
+#include "IroJump.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroUtil.h"
 #include "compiler/CFunc.h"
 #include "compiler/Exceptions.h"
 
diff --git a/includes/compiler/IroJump.h b/compiler_and_linker/FrontEnd/Optimizer/IroJump.h
index bbb5594..62b7be6 100644
--- a/includes/compiler/IroJump.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroJump.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROJUMP_H
 #define COMPILER_IROJUMP_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern Boolean IRO_DoJumpChaining(void);
 extern void IRO_MakeReachable(IRONode *node);
diff --git a/compiler_and_linker/unsorted/IroLinearForm.c b/compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.c
index 4941587..8c5b0d8 100644
--- a/compiler_and_linker/unsorted/IroLinearForm.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.c
@@ -1,8 +1,8 @@
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroLinearForm.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CError.h"
 #include "compiler/CExpr.h"
 #include "compiler/CFunc.h"
diff --git a/includes/compiler/IroLinearForm.h b/compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.h
index 1e7df4f..c0b2d17 100644
--- a/includes/compiler/IroLinearForm.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroLinearForm.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROLINEARFORM_H
 #define COMPILER_IROLINEARFORM_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 #include "compiler/Switch.h"
 #include "compiler/enode.h"
 
diff --git a/compiler_and_linker/unsorted/IroLoop.c b/compiler_and_linker/FrontEnd/Optimizer/IroLoop.c
index d6ec5f0..850146d 100644
--- a/compiler_and_linker/unsorted/IroLoop.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroLoop.c
@@ -1,12 +1,12 @@
-#include "compiler/IroLoop.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroSubable.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroLoop.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IroSubable.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CFunc.h"
 #include "compiler/CInt64.h"
 #include "compiler/CMachine.h"
diff --git a/includes/compiler/IroLoop.h b/compiler_and_linker/FrontEnd/Optimizer/IroLoop.h
index 0c60589..2d968ad 100644
--- a/includes/compiler/IroLoop.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroLoop.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROLOOP_H
 #define COMPILER_IROLOOP_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 
 typedef enum IROLoopIndFlags {
     LoopInd_HasMod = 1,
diff --git a/compiler_and_linker/unsorted/IroMalloc.c b/compiler_and_linker/FrontEnd/Optimizer/IroMalloc.c
index 8928ba9..1f15cad 100644
--- a/compiler_and_linker/unsorted/IroMalloc.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroMalloc.c
@@ -1,4 +1,4 @@
-#include "compiler/IroMalloc.h"
+#include "IroMalloc.h"
 #include "compiler/CompilerTools.h"
 
 #define FLAGMASK 0xF
diff --git a/includes/compiler/IroMalloc.h b/compiler_and_linker/FrontEnd/Optimizer/IroMalloc.h
index f203a3d..7700280 100644
--- a/includes/compiler/IroMalloc.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroMalloc.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROMALLOC_H
 #define COMPILER_IROMALLOC_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern size_t IRO_msize(void *buf);
 extern void *IRO_malloc(size_t size);
diff --git a/compiler_and_linker/unsorted/IroPointerAnalysis.c b/compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.c
index 4fcb8d3..3f8989f 100644
--- a/compiler_and_linker/unsorted/IroPointerAnalysis.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.c
@@ -1,10 +1,10 @@
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroEval.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroPointerAnalysis.h"
+#include "IroEval.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CDecl.h"
 #include "compiler/CExpr.h"
 #include "compiler/CFunc.h"
@@ -17,7 +17,7 @@
 #include "compiler/CompilerTools.h"
 #include "compiler/objects.h"
 #include "compiler/scopes.h"
-#include "compiler_and_linker/unsorted/IroPointerAnalysisADTs.c"
+#include "IroPointerAnalysisADTs.c"
 
 // forward decls
 static Object *GetLocalObject(PALocalVar *local, Object *proc, Boolean flag);
diff --git a/includes/compiler/IroPointerAnalysis.h b/compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.h
index a6ed2c2..ec50eba 100644
--- a/includes/compiler/IroPointerAnalysis.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysis.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROPOINTERANALYSIS_H
 #define COMPILER_IROPOINTERANALYSIS_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void PointerAnalysis_Setup(void);
 extern void PointerAnalysis_Cleanup(void);
diff --git a/compiler_and_linker/unsorted/IroPointerAnalysisADTs.c b/compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysisADTs.c
index 6e24e6f..dad9501 100644
--- a/compiler_and_linker/unsorted/IroPointerAnalysisADTs.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroPointerAnalysisADTs.c
@@ -1,5 +1,5 @@
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroMalloc.h"
 #include "compiler/CError.h"
 #include "compiler/CInt64.h"
 #include "compiler/CParser.h"
diff --git a/compiler_and_linker/unsorted/IroPropagate.c b/compiler_and_linker/FrontEnd/Optimizer/IroPropagate.c
index 401250c..c5ad708 100644
--- a/compiler_and_linker/unsorted/IroPropagate.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroPropagate.c
@@ -1,12 +1,12 @@
-#include "compiler/IroPropagate.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroEval.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroPropagate.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroEval.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/objects.h"
 #include "compiler/CExpr.h"
 #include "compiler/CompilerTools.h"
diff --git a/includes/compiler/IroPropagate.h b/compiler_and_linker/FrontEnd/Optimizer/IroPropagate.h
index a61e526..ff9fadb 100644
--- a/includes/compiler/IroPropagate.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroPropagate.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROPROPAGATE_H
 #define COMPILER_IROPROPAGATE_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/BitVector.h"
+#include "IrOptimizer.h"
+#include "BitVector.h"
 
 #ifdef __MWERKS__
 #pragma options align=mac68k
diff --git a/compiler_and_linker/unsorted/IroRangePropagation.c b/compiler_and_linker/FrontEnd/Optimizer/IroRangePropagation.c
index d15ef86..737035f 100644
--- a/compiler_and_linker/unsorted/IroRangePropagation.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroRangePropagation.c
@@ -1,11 +1,11 @@
-#include "compiler/IroRangePropagation.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroRangePropagation.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/CInt64.h"
 #include "compiler/objects.h"
 #include "compiler/types.h"
diff --git a/includes/compiler/IroRangePropagation.h b/compiler_and_linker/FrontEnd/Optimizer/IroRangePropagation.h
index fea6542..96888ac 100644
--- a/includes/compiler/IroRangePropagation.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroRangePropagation.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IRORANGEPROPAGATION_H
 #define COMPILER_IRORANGEPROPAGATION_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern Boolean IRO_RangePropagateInFNode(void);
 
diff --git a/compiler_and_linker/unsorted/IroSubable.c b/compiler_and_linker/FrontEnd/Optimizer/IroSubable.c
index 6b8daf0..513ac6c 100644
--- a/compiler_and_linker/unsorted/IroSubable.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroSubable.c
@@ -1,7 +1,7 @@
-#include "compiler/IroSubable.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroPropagate.h"
-#include "compiler/IroUtil.h"
+#include "IroSubable.h"
+#include "IroLinearForm.h"
+#include "IroPropagate.h"
+#include "IroUtil.h"
 #include "compiler/enode.h"
 #include "compiler/objects.h"
 #include "compiler/types.h"
diff --git a/includes/compiler/IroSubable.h b/compiler_and_linker/FrontEnd/Optimizer/IroSubable.h
index 7a3c344..db5f860 100644
--- a/includes/compiler/IroSubable.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroSubable.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROSUBABLE_H
 #define COMPILER_IROSUBABLE_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_InitializeIsSubableOpArray(void);
 extern Boolean IRO_IsSubableExpression(IROLinear *nd);
diff --git a/compiler_and_linker/unsorted/IroTransform.c b/compiler_and_linker/FrontEnd/Optimizer/IroTransform.c
index 54f3302..8a4af16 100644
--- a/compiler_and_linker/unsorted/IroTransform.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroTransform.c
@@ -1,4 +1,4 @@
-#include "compiler/IroTransform.h"
+#include "IroTransform.h"
 #include "compiler/CError.h"
 #include "compiler/CFunc.h"
 #include "compiler/CInt64.h"
@@ -6,13 +6,13 @@
 #include "compiler/CMachine.h"
 #include "compiler/CPrep.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IROUseDef.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IroVars.h"
+#include "IroDump.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IROUseDef.h"
+#include "IroUtil.h"
+#include "IroVars.h"
 #include "compiler/enode.h"
 #include "compiler/types.h"
 
diff --git a/includes/compiler/IroTransform.h b/compiler_and_linker/FrontEnd/Optimizer/IroTransform.h
index 90bcf30..104657f 100644
--- a/includes/compiler/IroTransform.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroTransform.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROTRANSFORM_H
 #define COMPILER_IROTRANSFORM_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 
 extern void IRO_InitializeAssignmentOpArray(void);
 extern void IRO_InitializeComplementaryOpArray(void);
diff --git a/compiler_and_linker/unsorted/IroUnrollLoop.c b/compiler_and_linker/FrontEnd/Optimizer/IroUnrollLoop.c
index 45b774e..cf3f1bf 100644
--- a/compiler_and_linker/unsorted/IroUnrollLoop.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroUnrollLoop.c
@@ -1,12 +1,12 @@
-#include "compiler/IroUnrollLoop.h"
+#include "IroUnrollLoop.h"
 #include "compiler/CError.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroUtil.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroUtil.h"
 #include "compiler/LoopDetection.h"
-#include "compiler/IroLoop.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroVars.h"
+#include "IroLoop.h"
+#include "IroDump.h"
+#include "IroVars.h"
 #include "compiler/CFunc.h"
 #include "compiler/CMachine.h"
 
diff --git a/includes/compiler/IroUnrollLoop.h b/compiler_and_linker/FrontEnd/Optimizer/IroUnrollLoop.h
index 8a51a9b..fd4972b 100644
--- a/includes/compiler/IroUnrollLoop.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroUnrollLoop.h
@@ -1,8 +1,8 @@
 #ifndef COMPILER_IROUNROLLLOOP_H
 #define COMPILER_IROUNROLLLOOP_H
 
-#include "compiler/IrOptimizer.h"
-#include "compiler/IroLinearForm.h"
+#include "IrOptimizer.h"
+#include "IroLinearForm.h"
 
 extern void IRO_LoopUnroller(void);
 extern void IRO_IterateForLoopBody(IRONode *start, IRONode *end, IROLoop *loop, IROLinear *destnode, SInt32 addConst, CInt64 *val, Boolean funkyFlag);
diff --git a/compiler_and_linker/unsorted/IroUtil.c b/compiler_and_linker/FrontEnd/Optimizer/IroUtil.c
index 4ade9b1..7e6321d 100644
--- a/compiler_and_linker/unsorted/IroUtil.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroUtil.c
@@ -1,10 +1,10 @@
-#include "compiler/IroUtil.h"
-#include "compiler/IroCSE.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroLoop.h"
-#include "compiler/IroVars.h"
+#include "IroUtil.h"
+#include "IroCSE.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroLinearForm.h"
+#include "IroLoop.h"
+#include "IroVars.h"
 #include "compiler/InlineAsmPPC.h"
 #include "compiler/CompilerTools.h"
 #include "compiler/CCompiler.h"
diff --git a/includes/compiler/IroUtil.h b/compiler_and_linker/FrontEnd/Optimizer/IroUtil.h
index a757025..2661985 100644
--- a/includes/compiler/IroUtil.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroUtil.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROUTIL_H
 #define COMPILER_IROUTIL_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 #include "compiler/CInt64.h"
 #include "compiler/CParser.h"
 
diff --git a/compiler_and_linker/unsorted/IroVars.c b/compiler_and_linker/FrontEnd/Optimizer/IroVars.c
index 6bb3d02..b72ba89 100644
--- a/compiler_and_linker/unsorted/IroVars.c
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroVars.c
@@ -1,12 +1,12 @@
-#include "compiler/IroVars.h"
-#include "compiler/IroDump.h"
-#include "compiler/IroFlowgraph.h"
-#include "compiler/IroJump.h"
-#include "compiler/IroLinearForm.h"
-#include "compiler/IroMalloc.h"
-#include "compiler/IroPointerAnalysis.h"
-#include "compiler/IroUtil.h"
-#include "compiler/IROUseDef.h"
+#include "IroVars.h"
+#include "IroDump.h"
+#include "IroFlowgraph.h"
+#include "IroJump.h"
+#include "IroLinearForm.h"
+#include "IroMalloc.h"
+#include "IroPointerAnalysis.h"
+#include "IroUtil.h"
+#include "IROUseDef.h"
 #include "compiler/CClass.h"
 #include "compiler/CError.h"
 #include "compiler/CExpr.h"
@@ -17,7 +17,7 @@
 #include "compiler/objects.h"
 #include "compiler/InlineAsm.h"
 #include "compiler/InlineAsmPPC.h"
-#include "compiler/BitVector.h"
+#include "BitVector.h"
 
 #ifdef __MWERKS__
 #pragma options align=mac68k
diff --git a/includes/compiler/IroVars.h b/compiler_and_linker/FrontEnd/Optimizer/IroVars.h
index 9df9ae5..2af5b4d 100644
--- a/includes/compiler/IroVars.h
+++ b/compiler_and_linker/FrontEnd/Optimizer/IroVars.h
@@ -1,7 +1,7 @@
 #ifndef COMPILER_IROVARS_H
 #define COMPILER_IROVARS_H
 
-#include "compiler/IrOptimizer.h"
+#include "IrOptimizer.h"
 #include "compiler/enode.h"
 
 #ifdef __MWERKS__
diff --git a/compiler_and_linker/unsorted/CCompiler.c b/compiler_and_linker/unsorted/CCompiler.c
index 1eb6cd0..ed57c25 100644
--- a/compiler_and_linker/unsorted/CCompiler.c
+++ b/compiler_and_linker/unsorted/CCompiler.c
@@ -4,7 +4,7 @@
 #include "compiler/CompilerTools.h"
 #include "compiler/CodeGen.h"
 #include "compiler/CodeGenOptPPC.h"
-#include "compiler/IrOptimizer.h"
+#include "../FrontEnd/Optimizer/IrOptimizer.h"
 #include "compiler/types.h"
 #include "pref_structs.h"
 
diff --git a/compiler_and_linker/unsorted/uDump.c b/compiler_and_linker/unsorted/DumpIR.c
index 89574a5..5f6eea4 100644
--- a/compiler_and_linker/unsorted/uDump.c
+++ b/compiler_and_linker/unsorted/DumpIR.c
@@ -1,4 +1,4 @@
-#include "compiler/uDump.h"
+#include "compiler/DumpIR.h"
 #include "compiler/CFunc.h"
 #include "compiler/CInt64.h"
 #include "compiler/CMachine.h"
diff --git a/compiler_and_linker/unsorted/ObjGenMachO.c b/compiler_and_linker/unsorted/ObjGenMachO.c
index 072824a..f6f6216 100644
--- a/compiler_and_linker/unsorted/ObjGenMachO.c
+++ b/compiler_and_linker/unsorted/ObjGenMachO.c
@@ -7,9 +7,9 @@
 #include "compiler/CParser.h"
 #include "compiler/CodeGen.h"
 #include "compiler/CompilerTools.h"
-#include "compiler/uDump.h"
+#include "compiler/DumpIR.h"
 #include "compiler/GenStabs.h"
-#include "compiler/IrOptimizer.h"
+#include "../FrontEnd/Optimizer/IrOptimizer.h"
 #include "compiler/MachO.h"
 #include "compiler/PCodeListing.h"
 #include "compiler/TOC.h"