diff --git a/src/DirectiveProcessing/shadow.cpp b/src/DirectiveProcessing/shadow.cpp
index ce190ab..94c64b5 100644
--- a/src/DirectiveProcessing/shadow.cpp
+++ b/src/DirectiveProcessing/shadow.cpp
@@ -15,7 +15,7 @@
 #include "SgUtils.h"
 #include "expr_transform.h"
 
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 
 #include "shadow.h"
 #include "dvm.h"
diff --git a/src/GraphCall/graph_calls.cpp b/src/GraphCall/graph_calls.cpp
index 51c8b6a..1e44544 100644
--- a/src/GraphCall/graph_calls.cpp
+++ b/src/GraphCall/graph_calls.cpp
@@ -14,7 +14,7 @@
 #include "dvm.h"
 #include "graph_calls_func.h"
 
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 #include "graph_loops_func.h"
 #include "../DirectiveProcessing/directive_parser.h"
 #include "SgUtils.h"
diff --git a/src/Predictor/PredictScheme.cpp b/src/Predictor/PredictScheme.cpp
index 4e09007..11fb9a9 100644
--- a/src/Predictor/PredictScheme.cpp
+++ b/src/Predictor/PredictScheme.cpp
@@ -22,7 +22,7 @@
 #include "graph_loops_func.h"
 #include "expr_transform.h"
 #include "../LoopAnalyzer/loop_analyzer.h"
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 
 #include "json.hpp"
 
diff --git a/src/PrivateAnalyzer/private_analyzer.cpp b/src/PrivateAnalyzer/private_analyzer.cpp
index 99b621e..0f046c9 100644
--- a/src/PrivateAnalyzer/private_analyzer.cpp
+++ b/src/PrivateAnalyzer/private_analyzer.cpp
@@ -12,7 +12,7 @@
 #include "graph_calls.h"
 #include "private_analyzer.h"
 #include "dvm.h"
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 
 using std::vector;
 
diff --git a/src/PrivateAnalyzer/private_arrays_search.cpp b/src/PrivateAnalyzer/private_arrays_search.cpp
index 36a6a18..4de5382 100644
--- a/src/PrivateAnalyzer/private_arrays_search.cpp
+++ b/src/PrivateAnalyzer/private_arrays_search.cpp
@@ -11,11 +11,11 @@
 #include "region.h"
 #include "SgUtils.h"
 #include "graph_loops.h"
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 
 using namespace std;
 
-void Collapse(Region* region)
+static void Collapse(Region* region)
 {
     if (region->getBasickBlocks().empty())
         return;
diff --git a/src/PrivateAnalyzer/private_arrays_search.h b/src/PrivateAnalyzer/private_arrays_search.h
index 504349d..abf8e28 100644
--- a/src/PrivateAnalyzer/private_arrays_search.h
+++ b/src/PrivateAnalyzer/private_arrays_search.h
@@ -5,10 +5,8 @@
 #include <unordered_set>
 
 #include "range_structures.h"
-#include "region.h"
 #include "graph_loops.h"
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 
-void Collapse(Region* region);
 std::map<LoopGraph*, ArrayAccessingIndexes> FindPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR);
 std::pair<SAPFOR::BasicBlock*, std::unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const std::vector<SAPFOR::BasicBlock*> blocks);
diff --git a/src/PrivateAnalyzer/region.h b/src/PrivateAnalyzer/region.h
index 4a474ca..935460f 100644
--- a/src/PrivateAnalyzer/region.h
+++ b/src/PrivateAnalyzer/region.h
@@ -6,7 +6,7 @@
 #include <string>
 
 #include "graph_loops.h"
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 
 class Region : public SAPFOR::BasicBlock {
 public:
diff --git a/src/Transformations/DeadCodeRemoving/dead_code.cpp b/src/Transformations/DeadCodeRemoving/dead_code.cpp
index 75e218c..aa89dbc 100644
--- a/src/Transformations/DeadCodeRemoving/dead_code.cpp
+++ b/src/Transformations/DeadCodeRemoving/dead_code.cpp
@@ -6,7 +6,7 @@
 #include <set>
 #include <algorithm>
 
-#include "../../CFGraph/CFGraph.h"
+#include "../CFGraph/CFGraph.h"
 
 using std::map;
 using std::string;
diff --git a/src/Transformations/DeadCodeRemoving/dead_code.h b/src/Transformations/DeadCodeRemoving/dead_code.h
index 8f7b1fa..e732d7e 100644
--- a/src/Transformations/DeadCodeRemoving/dead_code.h
+++ b/src/Transformations/DeadCodeRemoving/dead_code.h
@@ -4,10 +4,10 @@
 #include<vector>
 
 #include "SgUtils.h"
-#include "../CFGraph/CFGraph.h"
-#include "../CFGraph/live_variable_analysis.h"
-#include "../CFGraph/DataFlow/data_flow.h"
-#include "../CFGraph/DataFlow/backward_data_flow.h"
+#include "CFGraph/CFGraph.h"
+#include "CFGraph/live_variable_analysis.h"
+#include "CFGraph/DataFlow/data_flow.h"
+#include "CFGraph/DataFlow/backward_data_flow.h"
 
 int removeDeadCode(SgStatement* func, 
                    const std::map<std::string, std::vector<FuncInfo*>>&allFuncs,
diff --git a/src/Transformations/LoopSplitting/loops_splitter.cpp b/src/Transformations/LoopSplitting/loops_splitter.cpp
index e06ddf0..185296d 100644
--- a/src/Transformations/LoopSplitting/loops_splitter.cpp
+++ b/src/Transformations/LoopSplitting/loops_splitter.cpp
@@ -6,7 +6,7 @@
 #include "../LoopAnalyzer/loop_analyzer.h"
 #include "expr_transform.h"
 #include "errors.h"
-#include "../CFGraph/CFGraph.h"
+#include "CFGraph/CFGraph.h"
 #include "../SageAnalysisTool/OmegaForSage/include/lang-interf.h"
 #include "../DirectiveProcessing/directive_parser.h"
 #include "../DirectiveProcessing/directive_omp_parser.h"
diff --git a/src/Transformations/PrivateArrayRemoving/private_removing.h b/src/Transformations/PrivateArrayRemoving/private_removing.h
index 4196bc7..11167fa 100644
--- a/src/Transformations/PrivateArrayRemoving/private_removing.h
+++ b/src/Transformations/PrivateArrayRemoving/private_removing.h
@@ -2,8 +2,8 @@
 
 #include "dvm.h"
 #include "../DirectiveProcessing/directive_parser.h"
-#include "../CFGraph/CFGraph.h"
-#include "../CFGraph/RD_subst.h"
+#include "CFGraph/CFGraph.h"
+#include "CFGraph/RD_subst.h"
 
 // Regime defines the regime of private removing
 enum class Regime { DEFLT = 1, REGULAR_INDEXES };