7 files changed, 8 insertions, 8 deletions
diff --git a/chill/src/ir_rose.cc b/chill/src/ir_rose.cc
index 5acb175..dc11b4c 100644
--- a/chill/src/ir_rose.cc
+++ b/chill/src/ir_rose.cc
@@ -927,7 +927,7 @@ IR_ScalarSymbol *IR_roseCode::CreateScalarSymbol(const IR_Symbol *sym, int) {
   if (typeid(*sym) == typeid(IR_roseScalarSymbol)) {
     SgType *tn =
       static_cast<const IR_roseScalarSymbol *>(sym)->vs_->get_type();
-    sprintf(str1, "newVariable%i\0", i_);
+    sprintf(str1, "newVariable%i", i_);
     SgVariableDeclaration* defn = buildVariableDeclaration(str1, tn);
     i_++;
     
@@ -958,7 +958,7 @@ IR_ScalarSymbol *IR_roseCode::CreateScalarSymbol(const IR_Symbol *sym, int) {
           "in CreateScalarSymbol: symbol not an array nor a pointer!");
     }
     
-    sprintf(str1, "newVariable%i\0", i_);
+    sprintf(str1, "newVariable%i", i_);
     i_++;
     
     SgVariableDeclaration* defn1 = buildVariableDeclaration(str1, tn1);
diff --git a/chill/src/loop.cc b/chill/src/loop.cc
index 0a82f7a..f4cd844 100644
--- a/chill/src/loop.cc
+++ b/chill/src/loop.cc
@@ -24,7 +24,7 @@
 
 #include <limits.h>
 #include <math.h>
-#include <codegen.h>
+#include <code_gen/codegen.h>
 #include <code_gen/CG_utils.h>
 #include <iostream>
 #include <algorithm>
diff --git a/chill/src/loop_datacopy.cc b/chill/src/loop_datacopy.cc
index 36acb01..8d11b0a 100644
--- a/chill/src/loop_datacopy.cc
+++ b/chill/src/loop_datacopy.cc
@@ -12,7 +12,7 @@
    02/20/09 Created by Chun Chen by splitting original datacopy from loop.cc
 *****************************************************************************/
 
-#include <codegen.h>
+#include <code_gen/codegen.h>
 #include <code_gen/CG_utils.h>
 #include "loop.hh"
 #include "omegatools.hh"
diff --git a/chill/src/loop_extra.cc b/chill/src/loop_extra.cc
index 2412403..dac05bf 100644
--- a/chill/src/loop_extra.cc
+++ b/chill/src/loop_extra.cc
@@ -11,7 +11,7 @@
    07/31/10 Created by Chun Chen
 *****************************************************************************/
 
-#include <codegen.h>
+#include <code_gen/codegen.h>
 #include <code_gen/CG_utils.h>
 #include "loop.hh"
 #include "omegatools.hh"
diff --git a/chill/src/loop_tile.cc b/chill/src/loop_tile.cc
index ad1d3b7..aae8dd8 100644
--- a/chill/src/loop_tile.cc
+++ b/chill/src/loop_tile.cc
@@ -5,7 +5,7 @@
  *      Author: anand
  */
 
-#include <codegen.h>
+#include <code_gen/codegen.h>
 #include "loop.hh"
 #include "omegatools.hh"
 #include "ir_code.hh"
diff --git a/chill/src/loop_unroll.cc b/chill/src/loop_unroll.cc
index b75b738..9bc6acf 100644
--- a/chill/src/loop_unroll.cc
+++ b/chill/src/loop_unroll.cc
@@ -5,7 +5,7 @@
  *      Author: anand
  */
 
-#include <codegen.h>
+#include <code_gen/codegen.h>
 #include <code_gen/CG_utils.h>
 #include "loop.hh"
 #include "omegatools.hh"
diff --git a/chill/src/omegatools.cc b/chill/src/omegatools.cc
index d88fd2a..cab66d4 100644
--- a/chill/src/omegatools.cc
+++ b/chill/src/omegatools.cc
@@ -13,7 +13,7 @@
    03/2009 Upgrade Omega's interaction with compiler to IR_Code, by Chun Chen.
 *****************************************************************************/
 
-#include <codegen.h>
+#include <code_gen/codegen.h>
 // #include <code_gen/output_repr.h>
 #include "omegatools.hh"
 #include "ir_code.hh"