25 files changed, 7 insertions, 8 deletions
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;