diff --git a/scripts/kiwix-compile-i18n b/scripts/kiwix-compile-i18n
index 90b01ed13..1519bb6ba 100755
--- a/scripts/kiwix-compile-i18n
+++ b/scripts/kiwix-compile-i18n
@@ -61,7 +61,7 @@ lang_table_entry_cxx_template = '''
 
 cxxfile_template = '''// This file is automatically generated. Do not modify it.
 
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 
 namespace kiwix {
 namespace i18n {
diff --git a/src/html_dumper.cpp b/src/html_dumper.cpp
index 4896821bf..e0b7cdd70 100644
--- a/src/html_dumper.cpp
+++ b/src/html_dumper.cpp
@@ -3,7 +3,7 @@
 #include "tools/otherTools.h"
 #include "tools.h"
 #include "tools/regexTools.h"
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 
 namespace kiwix
 {
@@ -77,7 +77,7 @@ std::string HTMLDumper::dumpPlainHTML(kiwix::Filter filter) const
     const auto tags = bookObj.getTags();
     const auto downloadAvailable = (bookObj.getUrl() != "");
     std::string faviconAttr = "style=background-image:url(" + bookIconUrl + ")";
-    
+
     booksData.push_back(kainjow::mustache::object{
       {"id", contentId},
       {"title", bookTitle},
diff --git a/src/search_renderer.cpp b/src/search_renderer.cpp
index e64eb5611..9a24e51e9 100644
--- a/src/search_renderer.cpp
+++ b/src/search_renderer.cpp
@@ -32,7 +32,7 @@
 #include "libkiwix-resources.h"
 #include "tools/stringTools.h"
 
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 
 namespace kiwix
 {
diff --git a/src/server/i18n.cpp b/src/server/i18n.cpp
index 5b948f26e..11e0641b8 100644
--- a/src/server/i18n.cpp
+++ b/src/server/i18n.cpp
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-#include "i18n.h"
+#include "i18n_utils.h"
 
 #include "tools/otherTools.h"
 
diff --git a/src/server/i18n.h b/src/server/i18n_utils.h
similarity index 97%
rename from src/server/i18n.h
rename to src/server/i18n_utils.h
index 1e42cac68..5d20d489c 100644
--- a/src/server/i18n.h
+++ b/src/server/i18n_utils.h
@@ -17,8 +17,8 @@
  * MA 02110-1301, USA.
  */
 
-#ifndef KIWIX_SERVER_I18N
-#define KIWIX_SERVER_I18N
+#ifndef KIWIX_SERVER_I18N_UTILS
+#define KIWIX_SERVER_I18N_UTILS
 
 #include <map>
 #include <string>
@@ -135,4 +135,4 @@ std::string selectMostSuitableLanguage(const UserLangPreferences& prefs);
 
 } // namespace kiwix
 
-#endif // KIWIX_SERVER_I18N
+#endif // KIWIX_SERVER_I18N_UTILS
diff --git a/src/server/internalServer.cpp b/src/server/internalServer.cpp
index ccc94a49b..d908a24e4 100644
--- a/src/server/internalServer.cpp
+++ b/src/server/internalServer.cpp
@@ -54,7 +54,7 @@ extern "C" {
 #include "search_renderer.h"
 #include "opds_dumper.h"
 #include "html_dumper.h"
-#include "i18n.h"
+#include "i18n_utils.h"
 
 #include <zim/uuid.h>
 #include <zim/error.h>
diff --git a/src/server/request_context.cpp b/src/server/request_context.cpp
index d879240cd..ff3ebbeba 100644
--- a/src/server/request_context.cpp
+++ b/src/server/request_context.cpp
@@ -28,7 +28,7 @@
 #include <cctype>
 
 #include "tools/stringTools.h"
-#include "i18n.h"
+#include "i18n_utils.h"
 
 namespace kiwix {
 
diff --git a/src/server/response.h b/src/server/response.h
index 11808f0da..b4c9925f7 100644
--- a/src/server/response.h
+++ b/src/server/response.h
@@ -27,7 +27,7 @@
 #include <mustache.hpp>
 #include "byte_range.h"
 #include "etag.h"
-#include "i18n.h"
+#include "i18n_utils.h"
 
 #include <zim/item.h>
 
diff --git a/src/tools/otherTools.cpp b/src/tools/otherTools.cpp
index 0c6eb36ca..e125c2df1 100644
--- a/src/tools/otherTools.cpp
+++ b/src/tools/otherTools.cpp
@@ -32,7 +32,7 @@
 #endif
 
 #include "tools/stringTools.h"
-#include "server/i18n.h"
+#include "server/i18n_utils.h"
 #include "libkiwix-resources.h"
 
 #include <map>
diff --git a/test/i18n.cpp b/test/i18n.cpp
index 4e891d6e9..0cfca7576 100644
--- a/test/i18n.cpp
+++ b/test/i18n.cpp
@@ -1,4 +1,4 @@
-#include "../src/server/i18n.h"
+#include "../src/server/i18n_utils.h"
 #include "gtest/gtest.h"
 
 using namespace kiwix;
diff --git a/test/otherTools.cpp b/test/otherTools.cpp
index 1e38bbb1e..3ffca0456 100644
--- a/test/otherTools.cpp
+++ b/test/otherTools.cpp
@@ -20,7 +20,7 @@
 #include "gtest/gtest.h"
 #include "../src/tools/otherTools.h"
 #include "zim/suggestion_iterator.h"
-#include "../src/server/i18n.h"
+#include "../src/server/i18n_utils.h"
 
 #include <regex>