diff --git a/Classes/x-saherelm.x-guard.class.mq5 b/Classes/x-saherelm.x-guard.class.mq5
index ea21fc6d..0213aa60 100644
--- a/Classes/x-saherelm.x-guard.class.mq5
+++ b/Classes/x-saherelm.x-guard.class.mq5
@@ -22,8 +22,8 @@
 
 //
 // Imports ...
-#include "../Classes/x-saherelm.x-alert.class.mq5";
-#include "../Classes/x-saherelm.x-trade.class.mq5";
+#include "../Classes/x-saherelm.x-alert.class.mq5"
+#include "../Classes/x-saherelm.x-trade.class.mq5"
 
 //
 // Enumeration ...
diff --git a/Documents/BKP/Tests/xcaea.cond2.script.mq5 b/Documents/BKP/Tests/xcaea.cond2.script.mq5
index d2a626f0..09cdfeb8 100644
--- a/Documents/BKP/Tests/xcaea.cond2.script.mq5
+++ b/Documents/BKP/Tests/xcaea.cond2.script.mq5
@@ -32,7 +32,7 @@
 
 //
 // Helpers ...
-#include "../Helpers/xcaea.helper.mq5";
+#include "../Helpers/xcaea.helper.mq5"
 
 //
 // Definitions ...
diff --git a/Documents/BKP/XCAEA_BKP/x-saherelm.x121.xcatb.lib.mq5 b/Documents/BKP/XCAEA_BKP/x-saherelm.x121.xcatb.lib.mq5
index 6c79b664..06070b0d 100644
--- a/Documents/BKP/XCAEA_BKP/x-saherelm.x121.xcatb.lib.mq5
+++ b/Documents/BKP/XCAEA_BKP/x-saherelm.x121.xcatb.lib.mq5
@@ -24,7 +24,7 @@
 #include "../Classes/x-saherelm.x-bar.analyser.class.mq5"
 #include "../Classes/x-saherelm.x-poi.drawer.class.mq5"
 #include "../Helpers/x-saherelm.x121.xcatb.helper.mq5"
-#include "../Libraries/x-saherelm.common.lib.mq5";
+#include "../Libraries/x-saherelm.common.lib.mq5"
 #include "../Libraries/x-saherelm.x-poi.lib.mq5"
 
 //
diff --git a/Experts/x-saherelm.x121.xcatb.ea.mq5 b/Experts/x-saherelm.x121.xcatb.ea.mq5
index 9b296ea1..8eb45aac 100644
--- a/Experts/x-saherelm.x121.xcatb.ea.mq5
+++ b/Experts/x-saherelm.x121.xcatb.ea.mq5
@@ -23,7 +23,7 @@
 
 //
 // Importts ...
-#include "../XCATBEA/Classes/xcatbea.expert.class.mq5";
+#include "../XCATBEA/Classes/xcatbea.expert.class.mq5"
 
 //
 // Inputs ...
diff --git a/XCATBEA/Classes/xcatbea.signaller.class.mq5 b/XCATBEA/Classes/xcatbea.signaller.class.mq5
index 7e0a6e7e..c722a278 100644
--- a/XCATBEA/Classes/xcatbea.signaller.class.mq5
+++ b/XCATBEA/Classes/xcatbea.signaller.class.mq5
@@ -24,12 +24,12 @@
 // Imports ...
 #include "../../Classes/x-saherelm.x-bar.analyser.class.mq5"
 #include "../../Classes/x-saherelm.x-guard.class.mq5"
-#include "../../Helpers/x-saherelm.x121.xcatb.helper.mq5";
-#include "../Classes/xcatbea.x-poi.detector.class.mq5";
-#include "../Classes/xcatbea.x-poi.drawer.class.mq5";
-#include "../Libraries/xcatbea.lib.mq5";
-#include "../Libraries/xcatbea.signaller.lib.mq5";
-#include "../Libraries/xcatbea.x-poi.extensions.lib.mq5";
+#include "../../Helpers/x-saherelm.x121.xcatb.helper.mq5"
+#include "../Classes/xcatbea.x-poi.detector.class.mq5"
+#include "../Classes/xcatbea.x-poi.drawer.class.mq5"
+#include "../Libraries/xcatbea.lib.mq5"
+#include "../Libraries/xcatbea.signaller.lib.mq5"
+#include "../Libraries/xcatbea.x-poi.extensions.lib.mq5"
 
 //
 // Definitions ...
diff --git a/XCATBEA/Classes/xcatbea.x-poi.detector.class.mq5 b/XCATBEA/Classes/xcatbea.x-poi.detector.class.mq5
index 7e632612..b9aac72f 100644
--- a/XCATBEA/Classes/xcatbea.x-poi.detector.class.mq5
+++ b/XCATBEA/Classes/xcatbea.x-poi.detector.class.mq5
@@ -24,6 +24,7 @@
 // Imports ...
 #include "../../Classes/x-saherelm.x-bar.analyser.class.mq5"
 #include "../../Helpers/x-saherelm.x121.xcatb.helper.mq5"
+#include "../../Libraries/x-saherelm.x-poi.extensions.lib.mq5"
 
 //
 // Definitions ...
diff --git a/XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5 b/XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5
index bfabdf16..5541c148 100644
--- a/XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5
+++ b/XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5
@@ -27,6 +27,7 @@
 #include "../../Libraries/x-saherelm.x-poi.lib.mq5"
 #include "../Classes/xcatbea.x-data.collector.class.mq5"
 #include "../Libraries/xcatbea.lib.mq5"
+#include "../Libraries/xcatbea.signaller.lib.mq5"
 
 //
 // Definitions ...
diff --git a/XCATBEA/Libraries/xcatbea.lib.mq5 b/XCATBEA/Libraries/xcatbea.lib.mq5
index 1b734402..65f6a96e 100644
--- a/XCATBEA/Libraries/xcatbea.lib.mq5
+++ b/XCATBEA/Libraries/xcatbea.lib.mq5
@@ -24,6 +24,7 @@
 // Imports ...
 #include "../../Classes/x-saherelm.x-bar.analyser.class.mq5"
 #include "../../Classes/x-saherelm.x-poi.drawer.class.mq5"
+#include "../../Helpers/x-saherelm.x121.xcatb.helper.mq5"
 
 //
 // Definiions ...
diff --git a/XCATBEA/Libraries/xcatbea.x-poi.extensions.lib.mq5 b/XCATBEA/Libraries/xcatbea.x-poi.extensions.lib.mq5
index 4e63cbfe..9e828f07 100644
--- a/XCATBEA/Libraries/xcatbea.x-poi.extensions.lib.mq5
+++ b/XCATBEA/Libraries/xcatbea.x-poi.extensions.lib.mq5
@@ -23,7 +23,7 @@
 
 //
 // Imports ...
-#include "../Classes/xcatbea.x-poi.detector.class.mq5";
+#include "../Classes/xcatbea.x-poi.detector.class.mq5"
 
 //
 // Extensions ...
diff --git a/XCATBEA/Test/xcatb.test.ea.mq5 b/XCATBEA/Test/xcatb.test.ea.mq5
index 0e0e1efb..7dec2081 100644
--- a/XCATBEA/Test/xcatb.test.ea.mq5
+++ b/XCATBEA/Test/xcatb.test.ea.mq5
@@ -20,8 +20,8 @@
 
 //
 // Include Common Library ...
-#include "../Classes/x-saherelm.x-guard.class.mq5"
-#include "../Classes/x-saherelm.x-volume.class.mq5"
+#include "../../Classes/x-saherelm.x-guard.class.mq5"
+#include "../../Classes/x-saherelm.x-volume.class.mq5"
 #include "../XCATBEA/Classes/xcatbea.signaller.class.mq5"
 #include "../XCATBEA/Classes/xcatbea.x-trade.manager.class.mq5"