diff --git a/Indicator/IndicatorBase.h b/Indicator/IndicatorBase.h
index e15aaff42..a2bfbe26c 100644
--- a/Indicator/IndicatorBase.h
+++ b/Indicator/IndicatorBase.h
@@ -31,7 +31,7 @@
 #endif
 
 // Includes.
-#include "../Bar.struct.h"
+#include "../Platform/Chart/Bar.struct.h"
 #include "../Log.mqh"
 #include "../Platform/Chart/Chart.struct.tf.h"
 #include "../Platform/Platform.extern.h"
diff --git a/Indicator/IndicatorCandle.h b/Indicator/IndicatorCandle.h
index c97d9a9d9..8e8319268 100644
--- a/Indicator/IndicatorCandle.h
+++ b/Indicator/IndicatorCandle.h
@@ -26,7 +26,7 @@
 #endif
 
 // Includes.
-#include "../Candle.struct.h"
+#include "../Platform/Chart/Candle.struct.h"
 #include "../Storage/ItemsHistory.h"
 #include "../Storage/ValueStorage.price_median.h"
 #include "../Storage/ValueStorage.price_typical.h"
diff --git a/Indicator/IndicatorCandle.provider.h b/Indicator/IndicatorCandle.provider.h
index 4eb894c06..d050a9ee0 100644
--- a/Indicator/IndicatorCandle.provider.h
+++ b/Indicator/IndicatorCandle.provider.h
@@ -30,7 +30,7 @@
 #endif
 
 // Includes.
-#include "../Candle.struct.h"
+#include "../Platform/Chart/Candle.struct.h"
 #include "../Storage/ItemsHistory.h"
 
 /**
diff --git a/Indicator/IndicatorData.h b/Indicator/IndicatorData.h
index 2c5f9073f..2561ee71e 100644
--- a/Indicator/IndicatorData.h
+++ b/Indicator/IndicatorData.h
@@ -35,7 +35,7 @@ struct ExternInstantiateIndicatorBufferValueStorageDouble {
 };
 
 // Includes.
-#include "../Bar.struct.h"
+#include "../Platform/Chart/Bar.struct.h"
 #include "../Exchange/SymbolInfo/SymbolInfo.struct.h"
 #include "../Platform/Chart/Chart.struct.tf.h"
 #include "../Storage/Cache/IndiBufferCache.h"
diff --git a/Indicators/Bitwise/Indi_Candle.mqh b/Indicators/Bitwise/Indi_Candle.mqh
index bd2bd31e0..1a286092d 100644
--- a/Indicators/Bitwise/Indi_Candle.mqh
+++ b/Indicators/Bitwise/Indi_Candle.mqh
@@ -26,9 +26,9 @@
 #endif
 
 // Includes.
-#include "../../Bar.struct.h"
+#include "../../Platform/Chart/Bar.struct.h"
 #include "../../Indicator/Indicator.h"
-#include "../../Pattern.struct.h"
+#include "../../Platform/Chart/Pattern.struct.h"
 #include "../../Serializer/Serializer.h"
 #include "../../Storage/Dict/Buffer/BufferStruct.h"
 #include "../Price/Indi_Price.h"
diff --git a/Indicators/Bitwise/Indi_Pattern.mqh b/Indicators/Bitwise/Indi_Pattern.mqh
index 6ad40f135..13f805124 100644
--- a/Indicators/Bitwise/Indi_Pattern.mqh
+++ b/Indicators/Bitwise/Indi_Pattern.mqh
@@ -26,10 +26,10 @@
 #endif
 
 // Includes.
-#include "../../Bar.struct.h"
+#include "../../Platform/Chart/Bar.struct.h"
 #include "../../Indicator/Indicator.define.h"
 #include "../../Indicator/Indicator.h"
-#include "../../Pattern.struct.h"
+#include "../../Platform/Chart/Pattern.struct.h"
 #include "../../Serializer/Serializer.h"
 #include "../../Storage/Dict/Buffer/BufferStruct.h"
 #include "../Price/Indi_Price.h"
diff --git a/Indicators/PriceRange/Indi_Pivot.h b/Indicators/PriceRange/Indi_Pivot.h
index 47d45cfe7..c27387015 100644
--- a/Indicators/PriceRange/Indi_Pivot.h
+++ b/Indicators/PriceRange/Indi_Pivot.h
@@ -26,7 +26,7 @@
 #endif
 
 // Includes.
-#include "../../Bar.struct.h"
+#include "../../Platform/Chart/Bar.struct.h"
 #include "../../Indicator/Indicator.struct.h"
 #include "../../Serializer/Serializer.h"
 #include "../Special/Indi_Math.mqh"
diff --git a/Bar.enum.h b/Platform/Chart/Bar.enum.h
similarity index 100%
rename from Bar.enum.h
rename to Platform/Chart/Bar.enum.h
diff --git a/Bar.struct.h b/Platform/Chart/Bar.struct.h
similarity index 98%
rename from Bar.struct.h
rename to Platform/Chart/Bar.struct.h
index f931af0a4..6b372d08f 100644
--- a/Bar.struct.h
+++ b/Platform/Chart/Bar.struct.h
@@ -35,12 +35,12 @@ class Serializer;
 
 // Includes.
 #include "Bar.enum.h"
-#include "Platform/Chart/Chart.enum.h"
-#include "Serializer/Serializable.h"
-#include "Serializer/Serializer.enum.h"
-#include "Serializer/Serializer.h"
-#include "Serializer/SerializerNode.enum.h"
-#include "Std.h"
+#include "Chart.enum.h"
+#include "../../Serializer/Serializable.h"
+#include "../../Serializer/Serializer.enum.h"
+#include "../../Serializer/Serializer.h"
+#include "../../Serializer/SerializerNode.enum.h"
+#include "../../Std.h"
 
 /* Struct for storing OHLC values. */
 struct BarOHLC
diff --git a/Candle.struct.h b/Platform/Chart/Candle.struct.h
similarity index 98%
rename from Candle.struct.h
rename to Platform/Chart/Candle.struct.h
index 4d01e0474..55d0da7aa 100644
--- a/Candle.struct.h
+++ b/Platform/Chart/Candle.struct.h
@@ -35,12 +35,12 @@ class Serializer;
 
 // Includes.
 #include "Bar.enum.h"
-#include "Platform/Chart/Chart.enum.h"
-#include "Serializer/Serializable.h"
-#include "Serializer/Serializer.enum.h"
-#include "Serializer/Serializer.h"
-#include "Serializer/SerializerNode.enum.h"
-#include "Std.h"
+#include "Chart.enum.h"
+#include "../../Serializer/Serializable.h"
+#include "../../Serializer/Serializer.enum.h"
+#include "../../Serializer/Serializer.h"
+#include "../../Serializer/SerializerNode.enum.h"
+#include "../../Std.h"
 
 /* Structure for storing OHLC values. */
 template <typename T>
diff --git a/Platform/Chart/Chart.struct.h b/Platform/Chart/Chart.struct.h
index ef0d2e3f0..d7a690c06 100644
--- a/Platform/Chart/Chart.struct.h
+++ b/Platform/Chart/Chart.struct.h
@@ -35,7 +35,7 @@ class Class;
 struct ChartTf;
 
 // Includes.
-#include "../../Bar.struct.h"
+#include "Bar.struct.h"
 #include "../../Serializer/Serializer.h"
 #include "../../Serializer/SerializerNode.enum.h"
 #include "../../Std.h"
diff --git a/Pattern.enum.h b/Platform/Chart/Pattern.enum.h
similarity index 100%
rename from Pattern.enum.h
rename to Platform/Chart/Pattern.enum.h
diff --git a/Pattern.mqh b/Platform/Chart/Pattern.h
similarity index 100%
rename from Pattern.mqh
rename to Platform/Chart/Pattern.h
diff --git a/Pattern.struct.h b/Platform/Chart/Pattern.struct.h
similarity index 99%
rename from Pattern.struct.h
rename to Platform/Chart/Pattern.struct.h
index f8aebe7d8..4a0377287 100644
--- a/Pattern.struct.h
+++ b/Platform/Chart/Pattern.struct.h
@@ -32,7 +32,7 @@
 
 // Includes.
 #include "Bar.struct.h"
-#include "Math/Math.define.h"
+#include "../../Math/Math.define.h"
 #include "Pattern.enum.h"
 
 // Defines structure for bitwise pattern values.
diff --git a/Platform/Chart/tests/Chart.test.mq5 b/Platform/Chart/tests/Chart.test.mq5
index f3b9f9779..10875e102 100644
--- a/Platform/Chart/tests/Chart.test.mq5
+++ b/Platform/Chart/tests/Chart.test.mq5
@@ -25,6 +25,8 @@
  */
 
 // Includes.
+#include "../Bar.struct.h"
+#include "../Candle.struct.h"
 #include "../Chart.h"
 #include "../../../Convert.mqh"
 #include "../../../Test.mqh"
diff --git a/Platform/Chart3D/Chart3D.h b/Platform/Chart3D/Chart3D.h
index 1535497a3..435eeedaf 100644
--- a/Platform/Chart3D/Chart3D.h
+++ b/Platform/Chart3D/Chart3D.h
@@ -30,7 +30,7 @@
 #pragma once
 #endif
 
-#include "../../Bar.struct.h"
+#include "../Chart/Bar.struct.h"
 #include "../../Indicator/IndicatorData.h"
 #include "../../Indicators/Price/Indi_MA.h"
 #include "../../Storage/Instances.h"
diff --git a/Storage/Dict/Buffer/BufferCandle.h b/Storage/Dict/Buffer/BufferCandle.h
index 1126963b8..eb0406f66 100644
--- a/Storage/Dict/Buffer/BufferCandle.h
+++ b/Storage/Dict/Buffer/BufferCandle.h
@@ -26,7 +26,7 @@
 #endif
 
 // Includes.
-#include "../../../Candle.struct.h"
+#include "../../../Platform/Chart/Candle.struct.h"
 #include "../../../Serializer/SerializerConverter.h"
 #include "../../../Serializer/SerializerJson.h"
 #include "BufferStruct.h"
diff --git a/tests/CompileTest.mq5 b/tests/CompileTest.mq5
index da6870b4a..bc7f1602a 100644
--- a/tests/CompileTest.mq5
+++ b/tests/CompileTest.mq5
@@ -74,7 +74,7 @@ struct IndicatorParams;
 #include "../Storage/Object.h"
 #include "../Platform/Order.h"
 #include "../Platform/Orders.h"
-#include "../Pattern.mqh"
+#include "../Platform/Chart/Pattern.h"
 // #include "../Profiler.mqh"
 #include "../Storage/Redis.h"
 #include "../Refs.mqh"