diff --git a/Convert.mqh b/Convert.mqh
index 072f8b6b2..c2ce4c3e3 100644
--- a/Convert.mqh
+++ b/Convert.mqh
@@ -29,7 +29,7 @@
 #include "Array.mqh"
 #include "Order.enum.h"
 #include "SymbolInfo.enum.h"
-#include "SymbolInfo.static.h"
+#include "SymbolInfo.struct.static.h"
 
 /**
  * Class to provide conversion methods.
diff --git a/Order.struct.h b/Order.struct.h
index 0fbda897c..d2bda532e 100644
--- a/Order.struct.h
+++ b/Order.struct.h
@@ -34,7 +34,7 @@
 #include "Data.struct.h"
 #include "Order.enum.h"
 #include "Serializer.mqh"
-#include "SymbolInfo.static.h"
+#include "SymbolInfo.struct.static.h"
 #include "Terminal.mqh"
 
 #ifndef __MQL5__
diff --git a/SymbolInfo.mqh b/SymbolInfo.mqh
index d4f1957ec..a277b0c8c 100644
--- a/SymbolInfo.mqh
+++ b/SymbolInfo.mqh
@@ -31,8 +31,8 @@ class SymbolInfo;
 #include "SymbolInfo.define.h"
 #include "SymbolInfo.enum.h"
 #include "SymbolInfo.enum.symbols.h"
-#include "SymbolInfo.static.h"
 #include "SymbolInfo.struct.h"
+#include "SymbolInfo.struct.static.h"
 
 // Includes.
 #include "Log.mqh"
diff --git a/SymbolInfo.struct.h b/SymbolInfo.struct.h
index 04ea0e0b5..ba2dc565d 100644
--- a/SymbolInfo.struct.h
+++ b/SymbolInfo.struct.h
@@ -33,7 +33,7 @@
 // Includes.
 #include "ISerializable.h"
 #include "MqlTick.h"
-#include "SymbolInfo.static.h"
+#include "SymbolInfo.struct.static.h"
 
 // Defines struct to store symbol data.
 struct SymbolInfoEntry
diff --git a/SymbolInfo.static.h b/SymbolInfo.struct.static.h
similarity index 99%
rename from SymbolInfo.static.h
rename to SymbolInfo.struct.static.h
index 3ce588682..7133cc0a3 100644
--- a/SymbolInfo.static.h
+++ b/SymbolInfo.struct.static.h
@@ -30,9 +30,9 @@
 #include "Std.h"
 
 /**
- * Class to provide symbol information.
+ * Struct to provide symbol information.
  */
-class SymbolInfoStatic {
+struct SymbolInfoStatic {
  public:
   /**
    * Get the current symbol pair from the current chart.