diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f2f7683e..0373ac2e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,8 +3,6 @@ cmake_minimum_required(VERSION 3.22)
 set(PROJECT_NAME faker-cxx)
 project(${PROJECT_NAME} CXX)
 
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
 option(USE_SYSTEM_DEPENDENCIES "Use fmt and GTest from system" OFF)
 
 if (NOT USE_SYSTEM_DEPENDENCIES)
diff --git a/CMakePresets.json b/CMakePresets.json
index 4c391361c..45c3a7f37 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -102,7 +102,8 @@
             "cacheVariables": {
                 "CMAKE_C_COMPILER": "clang",
                 "CMAKE_CXX_COMPILER": "clang++",
-                "CMAKE_BUILD_TYPE": "Debug"
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
             }
         },
         {
@@ -113,7 +114,8 @@
             "cacheVariables": {
                 "CMAKE_C_COMPILER": "clang",
                 "CMAKE_CXX_COMPILER": "clang++",
-                "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+                "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
             }
         }
     ],
diff --git a/src/common/FormatHelper.cpp b/src/common/FormatHelper.cpp
index cd6fe2f49..8711f823c 100644
--- a/src/common/FormatHelper.cpp
+++ b/src/common/FormatHelper.cpp
@@ -1,6 +1,9 @@
 #include "FormatHelper.h"
 
+#include <functional>
 #include <stdexcept>
+#include <string>
+#include <unordered_map>
 
 namespace faker
 {
diff --git a/src/common/LuhnCheck.cpp b/src/common/LuhnCheck.cpp
index a3c36ca89..7bf6063ec 100644
--- a/src/common/LuhnCheck.cpp
+++ b/src/common/LuhnCheck.cpp
@@ -1,5 +1,9 @@
 #include "LuhnCheck.h"
 
+#include <algorithm>
+#include <cctype>
+#include <string>
+
 namespace faker
 {
 int LuhnCheck::luhnCheckSum(const std::string& inputString)
diff --git a/src/common/PrecisionMapper.cpp b/src/common/PrecisionMapper.cpp
index 5de25c333..c9e2e33d3 100644
--- a/src/common/PrecisionMapper.cpp
+++ b/src/common/PrecisionMapper.cpp
@@ -1,5 +1,9 @@
 #include "PrecisionMapper.h"
 
+#include <unordered_map>
+
+#include "faker-cxx/types/Precision.h"
+
 namespace faker
 {
 const std::unordered_map<Precision, unsigned> PrecisionMapper::precisionToDecimalPlacesMapping{
diff --git a/src/common/StringHelper.cpp b/src/common/StringHelper.cpp
index 6a7abd33d..33ce203ef 100644
--- a/src/common/StringHelper.cpp
+++ b/src/common/StringHelper.cpp
@@ -2,7 +2,10 @@
 
 #include <algorithm>
 #include <cctype>
+#include <cstddef>
 #include <sstream>
+#include <string>
+#include <vector>
 
 namespace faker
 {
diff --git a/src/modules/airline/Airline.cpp b/src/modules/airline/Airline.cpp
index e2de0ac66..f212c6151 100644
--- a/src/modules/airline/Airline.cpp
+++ b/src/modules/airline/Airline.cpp
@@ -1,5 +1,8 @@
 #include "faker-cxx/Airline.h"
 
+#include <string>
+#include <string_view>
+
 #include "AirlineData.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Number.h"
diff --git a/src/modules/airline/AirlineData.cpp b/src/modules/airline/AirlineData.cpp
index 964f4c531..4c341e694 100644
--- a/src/modules/airline/AirlineData.cpp
+++ b/src/modules/airline/AirlineData.cpp
@@ -1,5 +1,11 @@
 #include "AirlineData.h"
 
+#include <array>
+#include <string_view>
+#include <unordered_map>
+
+#include "faker-cxx/Airline.h"
+
 namespace faker
 {
 const std::array<std::string_view, 3> aircraftTypes = {"regional", "narrowbody", "widebody"};
diff --git a/src/modules/animal/Animal.cpp b/src/modules/animal/Animal.cpp
index c18fac19d..3038f47bc 100644
--- a/src/modules/animal/Animal.cpp
+++ b/src/modules/animal/Animal.cpp
@@ -1,5 +1,7 @@
 #include "faker-cxx/Animal.h"
 
+#include <string_view>
+
 #include "AnimalData.h"
 #include "faker-cxx/Helper.h"
 
diff --git a/src/modules/animal/AnimalData.cpp b/src/modules/animal/AnimalData.cpp
index a97229091..47d5f6be6 100644
--- a/src/modules/animal/AnimalData.cpp
+++ b/src/modules/animal/AnimalData.cpp
@@ -1,5 +1,8 @@
 #include "AnimalData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 8> bears = {"Giant panda",         "Spectacled bear",  "Sun bear",   "Sloth bear",
diff --git a/src/modules/book/Book.cpp b/src/modules/book/Book.cpp
index d9a22abeb..decd7b75a 100644
--- a/src/modules/book/Book.cpp
+++ b/src/modules/book/Book.cpp
@@ -1,9 +1,11 @@
 #include "faker-cxx/Book.h"
 
+#include <string>
+#include <string_view>
+
 #include "../../common/FormatHelper.h"
 #include "BookData.h"
 #include "faker-cxx/Helper.h"
-#include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
 
 namespace faker
diff --git a/src/modules/book/BookData.cpp b/src/modules/book/BookData.cpp
index 7137cd775..f00b7ac46 100644
--- a/src/modules/book/BookData.cpp
+++ b/src/modules/book/BookData.cpp
@@ -1,5 +1,8 @@
 #include "BookData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 100> authors = {"Shakespeare, William",
diff --git a/src/modules/color/Color.cpp b/src/modules/color/Color.cpp
index 686b2c015..faf5204da 100644
--- a/src/modules/color/Color.cpp
+++ b/src/modules/color/Color.cpp
@@ -1,10 +1,14 @@
 #include "faker-cxx/Color.h"
 
+#include <string>
+#include <string_view>
+
 #include "../../common/FormatHelper.h"
 #include "ColorData.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
+#include "faker-cxx/types/Hex.h"
 
 namespace faker
 {
diff --git a/src/modules/color/ColorData.cpp b/src/modules/color/ColorData.cpp
index 683b9066a..6db823242 100644
--- a/src/modules/color/ColorData.cpp
+++ b/src/modules/color/ColorData.cpp
@@ -1,5 +1,8 @@
 #include "ColorData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 31> colors = {
diff --git a/src/modules/commerce/Commerce.cpp b/src/modules/commerce/Commerce.cpp
index d73169079..c650e856d 100644
--- a/src/modules/commerce/Commerce.cpp
+++ b/src/modules/commerce/Commerce.cpp
@@ -1,9 +1,15 @@
 #include "faker-cxx/Commerce.h"
 
+#include <cmath>
+#include <cstddef>
+#include <string>
+#include <string_view>
+
 #include "../../common/FormatHelper.h"
 #include "CommerceData.h"
 #include "faker-cxx/Finance.h"
 #include "faker-cxx/Helper.h"
+#include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
 
 namespace faker
diff --git a/src/modules/commerce/CommerceData.cpp b/src/modules/commerce/CommerceData.cpp
index c3cb7f9de..bcf7eb2ec 100644
--- a/src/modules/commerce/CommerceData.cpp
+++ b/src/modules/commerce/CommerceData.cpp
@@ -1,5 +1,8 @@
 #include "CommerceData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 22> departments = {
diff --git a/src/modules/company/Company.cpp b/src/modules/company/Company.cpp
index 7479b624b..f227f1e0f 100644
--- a/src/modules/company/Company.cpp
+++ b/src/modules/company/Company.cpp
@@ -1,8 +1,12 @@
 #include "faker-cxx/Company.h"
 
+#include <string>
+#include <string_view>
+
 #include "../../common/FormatHelper.h"
 #include "CompanyData.h"
 #include "faker-cxx/Helper.h"
+#include "faker-cxx/Number.h"
 #include "faker-cxx/Person.h"
 
 namespace faker
diff --git a/src/modules/company/CompanyData.cpp b/src/modules/company/CompanyData.cpp
index 24dc7b0d0..8fae11e69 100644
--- a/src/modules/company/CompanyData.cpp
+++ b/src/modules/company/CompanyData.cpp
@@ -1,5 +1,8 @@
 #include "CompanyData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 65> buzzAdjectives = {"clicks-and-mortar",
diff --git a/src/modules/computer/Computer.cpp b/src/modules/computer/Computer.cpp
index 859991796..a052ca560 100644
--- a/src/modules/computer/Computer.cpp
+++ b/src/modules/computer/Computer.cpp
@@ -1,5 +1,7 @@
 #include "faker-cxx/Computer.h"
 
+#include <string_view>
+
 #include "ComputerData.h"
 #include "faker-cxx/Helper.h"
 
diff --git a/src/modules/computer/ComputerData.cpp b/src/modules/computer/ComputerData.cpp
index 9f361069b..a336039d8 100644
--- a/src/modules/computer/ComputerData.cpp
+++ b/src/modules/computer/ComputerData.cpp
@@ -1,5 +1,8 @@
 #include "ComputerData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 4> computerTypes = {"Desktop", "Laptop", "Mainframe", "Supercomputer"};
diff --git a/src/modules/crypto/Crypto.cpp b/src/modules/crypto/Crypto.cpp
index ca8aee521..ccc05b68f 100644
--- a/src/modules/crypto/Crypto.cpp
+++ b/src/modules/crypto/Crypto.cpp
@@ -4,7 +4,10 @@
 #include <cstdint>
 #include <cstring>
 #include <iomanip>
+#include <ios>
+#include <optional>
 #include <sstream>
+#include <string>
 
 #include "faker-cxx/Word.h"
 
diff --git a/src/modules/database/Database.cpp b/src/modules/database/Database.cpp
index 3d44acc59..25b1fa67f 100644
--- a/src/modules/database/Database.cpp
+++ b/src/modules/database/Database.cpp
@@ -1,8 +1,12 @@
 #include "faker-cxx/Database.h"
 
+#include <string>
+#include <string_view>
+
 #include "DatabaseData.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/String.h"
+#include "faker-cxx/types/Hex.h"
 
 namespace faker
 {
diff --git a/src/modules/database/DatabaseData.cpp b/src/modules/database/DatabaseData.cpp
index e164b6e2d..f2eee6de1 100644
--- a/src/modules/database/DatabaseData.cpp
+++ b/src/modules/database/DatabaseData.cpp
@@ -1,5 +1,8 @@
 #include "DatabaseData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 7> collations = {"utf8_unicode_ci",  "utf8_general_ci",  "utf8_bin",
diff --git a/src/modules/datatype/Datatype.cpp b/src/modules/datatype/Datatype.cpp
index 5b0088329..d5c027d56 100644
--- a/src/modules/datatype/Datatype.cpp
+++ b/src/modules/datatype/Datatype.cpp
@@ -1,5 +1,7 @@
 #include "faker-cxx/Datatype.h"
 
+#include <cmath>
+
 #include "faker-cxx/Number.h"
 
 namespace faker
diff --git a/src/modules/date/Date.cpp b/src/modules/date/Date.cpp
index 7e847658a..579fb058e 100644
--- a/src/modules/date/Date.cpp
+++ b/src/modules/date/Date.cpp
@@ -4,6 +4,9 @@
 #include <ctime>
 #include <iomanip>
 #include <sstream>
+#include <stdexcept>
+#include <string>
+#include <string_view>
 
 #include "../../common/FormatHelper.h"
 #include "DateData.h"
diff --git a/src/modules/date/DateData.cpp b/src/modules/date/DateData.cpp
index 0917b42fb..5ab8f6f6d 100644
--- a/src/modules/date/DateData.cpp
+++ b/src/modules/date/DateData.cpp
@@ -1,5 +1,8 @@
 #include "DateData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 12> monthNames = {
diff --git a/src/modules/finance/Finance.cpp b/src/modules/finance/Finance.cpp
index 514e2e9fd..ea6583e46 100644
--- a/src/modules/finance/Finance.cpp
+++ b/src/modules/finance/Finance.cpp
@@ -1,11 +1,21 @@
 #include "faker-cxx/Finance.h"
 
+#include <cstddef>
+#include <ios>
+#include <optional>
+#include <sstream>
+#include <string>
+#include <string_view>
+#include <vector>
+
 #include "../../common/FormatHelper.h"
 #include "../../common/PrecisionMapper.h"
 #include "faker-cxx/Date.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
+#include "faker-cxx/types/Hex.h"
+#include "faker-cxx/types/Precision.h"
 #include "FinanceData.h"
 
 namespace faker
diff --git a/src/modules/finance/FinanceData.cpp b/src/modules/finance/FinanceData.cpp
index 64196f27c..9f9bdf0b1 100644
--- a/src/modules/finance/FinanceData.cpp
+++ b/src/modules/finance/FinanceData.cpp
@@ -1,5 +1,12 @@
 #include "FinanceData.h"
 
+#include <array>
+#include <string_view>
+#include <unordered_map>
+#include <vector>
+
+#include "faker-cxx/Finance.h"
+
 namespace faker
 {
 const std::array<Finance::BicCountry, 10> bicCountries{
diff --git a/src/modules/food/Food.cpp b/src/modules/food/Food.cpp
index 7bc544ccd..ae2133ec3 100644
--- a/src/modules/food/Food.cpp
+++ b/src/modules/food/Food.cpp
@@ -1,5 +1,7 @@
 #include "faker-cxx/Food.h"
 
+#include <string_view>
+
 #include "faker-cxx/Helper.h"
 #include "FoodData.h"
 
diff --git a/src/modules/food/FoodData.cpp b/src/modules/food/FoodData.cpp
index 6a12c4c67..e9f7ce1dd 100644
--- a/src/modules/food/FoodData.cpp
+++ b/src/modules/food/FoodData.cpp
@@ -1,5 +1,8 @@
 #include "FoodData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 47> alcoholicBeverages{
diff --git a/src/modules/git/Git.cpp b/src/modules/git/Git.cpp
index 7e12d9a80..068778d02 100644
--- a/src/modules/git/Git.cpp
+++ b/src/modules/git/Git.cpp
@@ -1,5 +1,9 @@
 #include "faker-cxx/Git.h"
 
+#include <cstddef>
+#include <optional>
+#include <string>
+
 #include "../../common/FormatHelper.h"
 #include "../../common/StringHelper.h"
 #include "../date/DateData.h"
@@ -8,6 +12,8 @@
 #include "faker-cxx/Number.h"
 #include "faker-cxx/Person.h"
 #include "faker-cxx/String.h"
+#include "faker-cxx/types/Country.h"
+#include "faker-cxx/types/Hex.h"
 #include "faker-cxx/Word.h"
 
 namespace faker
diff --git a/src/modules/hacker/Hacker.cpp b/src/modules/hacker/Hacker.cpp
index c469840ed..783f5b0ee 100644
--- a/src/modules/hacker/Hacker.cpp
+++ b/src/modules/hacker/Hacker.cpp
@@ -1,5 +1,8 @@
 #include "faker-cxx/Hacker.h"
 
+#include <string>
+#include <string_view>
+
 #include "../../common/StringHelper.h"
 #include "faker-cxx/Helper.h"
 #include "HackerData.h"
diff --git a/src/modules/hacker/HackerData.cpp b/src/modules/hacker/HackerData.cpp
index 5a09eb9be..bc57f03c3 100644
--- a/src/modules/hacker/HackerData.cpp
+++ b/src/modules/hacker/HackerData.cpp
@@ -1,5 +1,8 @@
 #include "HackerData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 16> abbreviations = {
diff --git a/src/modules/helper/Helper.cpp b/src/modules/helper/Helper.cpp
index ae5b6f1e1..38d660cf7 100644
--- a/src/modules/helper/Helper.cpp
+++ b/src/modules/helper/Helper.cpp
@@ -1,12 +1,14 @@
 #include "faker-cxx/Helper.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <random>
 #include <regex>
 #include <string>
 
 #include "../../common/LuhnCheck.h"
 #include "../../common/StringHelper.h"
+#include "faker-cxx/Number.h"
 
 namespace faker
 {
diff --git a/src/modules/image/Image.cpp b/src/modules/image/Image.cpp
index 669994fcc..2c5a9f193 100644
--- a/src/modules/image/Image.cpp
+++ b/src/modules/image/Image.cpp
@@ -1,6 +1,9 @@
 #include "faker-cxx/Image.h"
 
 #include <array>
+#include <optional>
+#include <string>
+#include <string_view>
 #include <unordered_map>
 
 #include "../../common/FormatHelper.h"
diff --git a/src/modules/internet/Internet.cpp b/src/modules/internet/Internet.cpp
index c2c0a5f2a..a31b354d2 100644
--- a/src/modules/internet/Internet.cpp
+++ b/src/modules/internet/Internet.cpp
@@ -1,20 +1,28 @@
 #include "faker-cxx/Internet.h"
 
+#include <algorithm>
 #include <array>
-#include <vector>
+#include <cstddef>
 #include <initializer_list>
-#include <unordered_map>
 #include <map>
+#include <optional>
+#include <sstream>
+#include <string>
+#include <string_view>
+#include <utility>
+#include <vector>
 
 #include "common/FormatHelper.h"
 #include "common/StringHelper.h"
-#include "modules/string/StringData.h"
-#include "InternetData.h"
 #include "faker-cxx/Helper.h"
+#include "faker-cxx/Number.h"
 #include "faker-cxx/Person.h"
 #include "faker-cxx/String.h"
 #include "faker-cxx/types/Country.h"
+#include "faker-cxx/types/Hex.h"
 #include "faker-cxx/Word.h"
+#include "InternetData.h"
+#include "modules/string/StringData.h"
 
 namespace faker
 {
diff --git a/src/modules/internet/InternetData.cpp b/src/modules/internet/InternetData.cpp
index a2a28aeb0..d4bbe9160 100644
--- a/src/modules/internet/InternetData.cpp
+++ b/src/modules/internet/InternetData.cpp
@@ -1,5 +1,8 @@
 #include "InternetData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker::internet
 {
 const std::array<std::string_view, 6> domainSuffixes = {
diff --git a/src/modules/location/Location.cpp b/src/modules/location/Location.cpp
index 1639ec513..2efaae7c9 100644
--- a/src/modules/location/Location.cpp
+++ b/src/modules/location/Location.cpp
@@ -1,12 +1,19 @@
 #include "faker-cxx/Location.h"
 
+#include <functional>
+#include <ios>
 #include <sstream>
+#include <string>
+#include <string_view>
 #include <unordered_map>
 
 #include "../../common/FormatHelper.h"
 #include "../../common/PrecisionMapper.h"
 #include "faker-cxx/Helper.h"
+#include "faker-cxx/Number.h"
 #include "faker-cxx/Person.h"
+#include "faker-cxx/types/Country.h"
+#include "faker-cxx/types/Precision.h"
 #include "LocationData.h"
 
 namespace faker
diff --git a/src/modules/location/LocationData.cpp b/src/modules/location/LocationData.cpp
index c848c435f..98fdb9294 100644
--- a/src/modules/location/LocationData.cpp
+++ b/src/modules/location/LocationData.cpp
@@ -1,5 +1,8 @@
 #include "LocationData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 246> allCountries = {
diff --git a/src/modules/lorem/Lorem.cpp b/src/modules/lorem/Lorem.cpp
index 9daa2e809..07e64c998 100644
--- a/src/modules/lorem/Lorem.cpp
+++ b/src/modules/lorem/Lorem.cpp
@@ -1,9 +1,15 @@
 #include "faker-cxx/Lorem.h"
 
+#include <cctype>
+#include <string>
+#include <string_view>
+#include <vector>
+
 #include "../../common/FormatHelper.h"
 #include "../../common/StringHelper.h"
-#include "LoremData.h"
 #include "faker-cxx/Helper.h"
+#include "faker-cxx/Number.h"
+#include "LoremData.h"
 
 namespace faker
 {
diff --git a/src/modules/lorem/LoremData.cpp b/src/modules/lorem/LoremData.cpp
index 3e8ac33a2..ebd232026 100644
--- a/src/modules/lorem/LoremData.cpp
+++ b/src/modules/lorem/LoremData.cpp
@@ -1,5 +1,8 @@
 #include "LoremData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 
diff --git a/src/modules/medicine/Medicine.cpp b/src/modules/medicine/Medicine.cpp
index d00892a4c..6497a9375 100644
--- a/src/modules/medicine/Medicine.cpp
+++ b/src/modules/medicine/Medicine.cpp
@@ -1,7 +1,9 @@
 #include "faker-cxx/Medicine.h"
 
-#include "MedicineData.h"
+#include <string_view>
+
 #include "faker-cxx/Helper.h"
+#include "MedicineData.h"
 
 namespace faker
 {
diff --git a/src/modules/medicine/MedicineData.cpp b/src/modules/medicine/MedicineData.cpp
index aebe926c4..fb3029f7a 100644
--- a/src/modules/medicine/MedicineData.cpp
+++ b/src/modules/medicine/MedicineData.cpp
@@ -1,5 +1,8 @@
 #include "MedicineData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker::medicine {
 const std::array<std::string_view, 59> medicalConditions = {
     "AIDS",
diff --git a/src/modules/movie/Movie.cpp b/src/modules/movie/Movie.cpp
index a4d72b128..6b70641cb 100644
--- a/src/modules/movie/Movie.cpp
+++ b/src/modules/movie/Movie.cpp
@@ -1,7 +1,9 @@
 #include "faker-cxx/Movie.h"
 
-#include "MovieData.h"
+#include <string_view>
+
 #include "faker-cxx/Helper.h"
+#include "MovieData.h"
 
 namespace faker
 {
diff --git a/src/modules/movie/MovieData.cpp b/src/modules/movie/MovieData.cpp
index f9e59c3cb..88aa981ee 100644
--- a/src/modules/movie/MovieData.cpp
+++ b/src/modules/movie/MovieData.cpp
@@ -1,5 +1,8 @@
 #include "MovieData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 const std::array<std::string_view, 299> actors = {
diff --git a/src/modules/music/Music.cpp b/src/modules/music/Music.cpp
index fb89416e5..2c0ce584c 100644
--- a/src/modules/music/Music.cpp
+++ b/src/modules/music/Music.cpp
@@ -1,7 +1,9 @@
 #include "faker-cxx/Music.h"
 
-#include "MusicData.h"
+#include <string_view>
+
 #include "faker-cxx/Helper.h"
+#include "MusicData.h"
 
 namespace faker
 {
diff --git a/src/modules/music/MusicData.cpp b/src/modules/music/MusicData.cpp
index 429671ecd..fda496844 100644
--- a/src/modules/music/MusicData.cpp
+++ b/src/modules/music/MusicData.cpp
@@ -1,5 +1,8 @@
 #include "MusicData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker::music
 {
 const std::array<std::string_view, 298> artists = {
diff --git a/src/modules/number/Number.cpp b/src/modules/number/Number.cpp
index a5df1d729..470d47bb1 100644
--- a/src/modules/number/Number.cpp
+++ b/src/modules/number/Number.cpp
@@ -1,5 +1,7 @@
 #include "faker-cxx/Number.h"
 
+#include <random>
+
 namespace faker
 {
 std::random_device Number::randomDevice;
diff --git a/src/modules/person/Person.cpp b/src/modules/person/Person.cpp
index 3d6d69cd6..e6a26e198 100644
--- a/src/modules/person/Person.cpp
+++ b/src/modules/person/Person.cpp
@@ -1,10 +1,11 @@
 #include "faker-cxx/Person.h"
 
-#include <regex>
+#include <functional>
+#include <optional>
 #include <set>
-#include <unordered_map>
 #include <string>
-#include <string_view>
+#include <unordered_map>
+#include <vector>
 
 #include "common/FormatHelper.h"
 #include "data/albania/AlbanianPeopleNames.h"
@@ -79,8 +80,11 @@
 #include "data/ZodiacSigns.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Internet.h"
+#include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
+#include "faker-cxx/types/Country.h"
 #include "faker-cxx/Word.h"
+#include "modules/person/data/PeopleNames.h"
 
 namespace faker
 {
diff --git a/src/modules/phone/Phone.cpp b/src/modules/phone/Phone.cpp
index 0f408d301..07aef8a1b 100644
--- a/src/modules/phone/Phone.cpp
+++ b/src/modules/phone/Phone.cpp
@@ -1,7 +1,12 @@
 #include "faker-cxx/Phone.h"
 
-#include "PhoneData.h"
+#include <optional>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+
 #include "faker-cxx/Helper.h"
+#include "PhoneData.h"
 
 namespace faker
 {
diff --git a/src/modules/phone/PhoneData.cpp b/src/modules/phone/PhoneData.cpp
index d3b8d30be..c94b5705c 100644
--- a/src/modules/phone/PhoneData.cpp
+++ b/src/modules/phone/PhoneData.cpp
@@ -1,5 +1,8 @@
 #include "PhoneData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker::phone
 {
 const std::array<std::string_view, 217> areaCodes = {
diff --git a/src/modules/sport/SportData.cpp b/src/modules/sport/SportData.cpp
index 3b77c98d9..01fdaf3b1 100644
--- a/src/modules/sport/SportData.cpp
+++ b/src/modules/sport/SportData.cpp
@@ -1,5 +1,8 @@
 #include "SportData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker::sport
 {
 const std::array<std::string_view, 10> femaleAthletes = {
diff --git a/src/modules/string/String.cpp b/src/modules/string/String.cpp
index e275dac66..932f3a8ba 100644
--- a/src/modules/string/String.cpp
+++ b/src/modules/string/String.cpp
@@ -1,15 +1,19 @@
 #include "faker-cxx/String.h"
 
+#include <algorithm>
 #include <cassert>
+#include <ios>
+#include <map>
+#include <optional>
+#include <set>
+#include <sstream>
 #include <stdexcept>
 #include <string>
-#include <unordered_map>
-#include <map>
-#include <algorithm>
 
-#include "StringData.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Number.h"
+#include "faker-cxx/types/Hex.h"
+#include "StringData.h"
 
 namespace faker
 {
diff --git a/src/modules/system/System.cpp b/src/modules/system/System.cpp
index f728a7b30..347f0b620 100644
--- a/src/modules/system/System.cpp
+++ b/src/modules/system/System.cpp
@@ -1,8 +1,12 @@
 #include "faker-cxx/System.h"
 
-#include <algorithm>
+#include <cstddef>
+#include <cstdlib>
+#include <optional>
 #include <set>
+#include <sstream>
 #include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "../src/common/StringHelper.h"
@@ -10,8 +14,10 @@
 #include "data/CronDayOfWeek.h"
 #include "data/DirectoryPath.h"
 #include "data/MimeTypes.h"
+#include "faker-cxx/Datatype.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Internet.h"
+#include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
 #include "faker-cxx/Word.h"
 
diff --git a/src/modules/vehicle/Vehicle.cpp b/src/modules/vehicle/Vehicle.cpp
index 8ecb40f79..e7c27950d 100644
--- a/src/modules/vehicle/Vehicle.cpp
+++ b/src/modules/vehicle/Vehicle.cpp
@@ -1,10 +1,13 @@
 #include "faker-cxx/Vehicle.h"
 
+#include <string>
+#include <string_view>
+
 #include "common/FormatHelper.h"
-#include "VehicleData.h"
 #include "faker-cxx/Helper.h"
 #include "faker-cxx/Number.h"
 #include "faker-cxx/String.h"
+#include "VehicleData.h"
 
 namespace faker
 {
diff --git a/src/modules/vehicle/VehicleData.cpp b/src/modules/vehicle/VehicleData.cpp
index 1206df23a..7ccc294cf 100644
--- a/src/modules/vehicle/VehicleData.cpp
+++ b/src/modules/vehicle/VehicleData.cpp
@@ -1,5 +1,8 @@
 #include "VehicleData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 namespace vehicle
diff --git a/src/modules/videoGame/VideoGame.cpp b/src/modules/videoGame/VideoGame.cpp
index 015ac6deb..8485d4e9a 100644
--- a/src/modules/videoGame/VideoGame.cpp
+++ b/src/modules/videoGame/VideoGame.cpp
@@ -1,7 +1,9 @@
 #include "faker-cxx/VideoGame.h"
 
-#include "VideoGameData.h"
+#include <string_view>
+
 #include "faker-cxx/Helper.h"
+#include "VideoGameData.h"
 
 
 namespace faker
diff --git a/src/modules/videoGame/VideoGameData.cpp b/src/modules/videoGame/VideoGameData.cpp
index 44007a6a0..966b7467a 100644
--- a/src/modules/videoGame/VideoGameData.cpp
+++ b/src/modules/videoGame/VideoGameData.cpp
@@ -1,5 +1,8 @@
 #include "VideoGameData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 namespace videoGame
diff --git a/src/modules/weather/WeatherData.cpp b/src/modules/weather/WeatherData.cpp
index 485275c89..f8f71be59 100644
--- a/src/modules/weather/WeatherData.cpp
+++ b/src/modules/weather/WeatherData.cpp
@@ -1,5 +1,8 @@
 #include "WeatherData.h"
 
+#include <array>
+#include <string_view>
+
 namespace faker
 {
 
diff --git a/src/modules/word/Word.cpp b/src/modules/word/Word.cpp
index e3c9588c3..50950c3a0 100644
--- a/src/modules/word/Word.cpp
+++ b/src/modules/word/Word.cpp
@@ -1,5 +1,9 @@
 #include "faker-cxx/Word.h"
 
+#include <optional>
+#include <string>
+#include <vector>
+
 #include "../../common/StringHelper.h"
 #include "data/Adjectives.h"
 #include "data/Adverbs.h"
diff --git a/tests/common/FormatHelperTest.cpp b/tests/common/FormatHelperTest.cpp
index 67a3c5c22..7100dcc04 100644
--- a/tests/common/FormatHelperTest.cpp
+++ b/tests/common/FormatHelperTest.cpp
@@ -1,5 +1,10 @@
 #include "FormatHelper.h"
 
+#include <functional>
+#include <stdexcept>
+#include <string>
+#include <unordered_map>
+
 #include "gtest/gtest.h"
 
 using namespace ::testing;
diff --git a/tests/common/LuhnCheckTest.cpp b/tests/common/LuhnCheckTest.cpp
index ccc00ef3b..3a2351209 100644
--- a/tests/common/LuhnCheckTest.cpp
+++ b/tests/common/LuhnCheckTest.cpp
@@ -1,6 +1,5 @@
 #include "LuhnCheck.h"
 
-#include <algorithm>
 #include <gtest/gtest.h>
 #include <string>
 
diff --git a/tests/common/PrecisionMapperTest.cpp b/tests/common/PrecisionMapperTest.cpp
index 1100379f2..66f854fc8 100644
--- a/tests/common/PrecisionMapperTest.cpp
+++ b/tests/common/PrecisionMapperTest.cpp
@@ -2,6 +2,8 @@
 
 #include "gtest/gtest.h"
 
+#include "faker-cxx/types/Precision.h"
+
 using namespace ::testing;
 using namespace faker;
 
diff --git a/tests/common/StringHelperTest.cpp b/tests/common/StringHelperTest.cpp
index 7102edaf2..b45311bfe 100644
--- a/tests/common/StringHelperTest.cpp
+++ b/tests/common/StringHelperTest.cpp
@@ -1,6 +1,6 @@
 #include "StringHelper.h"
 
-#include <algorithm>
+#include <vector>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/airline/AirlineTest.cpp b/tests/modules/airline/AirlineTest.cpp
index 32c7586d9..4d8b161af 100644
--- a/tests/modules/airline/AirlineTest.cpp
+++ b/tests/modules/airline/AirlineTest.cpp
@@ -1,6 +1,9 @@
 #include "faker-cxx/Airline.h"
 
 #include <algorithm>
+#include <cctype>
+#include <string>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/animal/AnimalTest.cpp b/tests/modules/animal/AnimalTest.cpp
index 7ef6e729b..b9de9c660 100644
--- a/tests/modules/animal/AnimalTest.cpp
+++ b/tests/modules/animal/AnimalTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Animal.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/book/BookTest.cpp b/tests/modules/book/BookTest.cpp
index 8e36092bd..ac8f3fba9 100644
--- a/tests/modules/book/BookTest.cpp
+++ b/tests/modules/book/BookTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Book.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/color/ColorTest.cpp b/tests/modules/color/ColorTest.cpp
index ee38ab69c..566b739cb 100644
--- a/tests/modules/color/ColorTest.cpp
+++ b/tests/modules/color/ColorTest.cpp
@@ -2,11 +2,14 @@
 
 #include <algorithm>
 #include <charconv>
+#include <string>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
 #include "color/ColorData.h"
 #include "common/StringHelper.h"
+#include "faker-cxx/types/Hex.h"
 #include "string/StringData.h"
 
 using namespace ::testing;
diff --git a/tests/modules/commerce/CommerceTest.cpp b/tests/modules/commerce/CommerceTest.cpp
index 364411252..a4aa1bc81 100644
--- a/tests/modules/commerce/CommerceTest.cpp
+++ b/tests/modules/commerce/CommerceTest.cpp
@@ -1,6 +1,10 @@
 #include "faker-cxx/Commerce.h"
 
 #include <algorithm>
+#include <cctype>
+#include <cstddef>
+#include <string>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/company/CompanyTest.cpp b/tests/modules/company/CompanyTest.cpp
index bbfea63f3..edcb00bda 100644
--- a/tests/modules/company/CompanyTest.cpp
+++ b/tests/modules/company/CompanyTest.cpp
@@ -1,6 +1,8 @@
 #include "faker-cxx/Company.h"
 
 #include <algorithm>
+#include <string_view>
+#include <vector>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/computer/ComputerTest.cpp b/tests/modules/computer/ComputerTest.cpp
index 710586ad2..8da31e815 100644
--- a/tests/modules/computer/ComputerTest.cpp
+++ b/tests/modules/computer/ComputerTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Computer.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/crypto/CryptoTest.cpp b/tests/modules/crypto/CryptoTest.cpp
index b8bc6aeb2..ab72c070d 100644
--- a/tests/modules/crypto/CryptoTest.cpp
+++ b/tests/modules/crypto/CryptoTest.cpp
@@ -1,7 +1,7 @@
 #include "faker-cxx/Crypto.h"
 
-#include <algorithm>
 #include <regex>
+#include <string>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/database/DatabaseTest.cpp b/tests/modules/database/DatabaseTest.cpp
index 4bf40462c..d2a7ac448 100644
--- a/tests/modules/database/DatabaseTest.cpp
+++ b/tests/modules/database/DatabaseTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Database.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/datatype/DatatypeTest.cpp b/tests/modules/datatype/DatatypeTest.cpp
index 1030a982c..8ab80c003 100644
--- a/tests/modules/datatype/DatatypeTest.cpp
+++ b/tests/modules/datatype/DatatypeTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Datatype.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/date/DateTest.cpp b/tests/modules/date/DateTest.cpp
index 1346ca76e..43bd8bcf3 100644
--- a/tests/modules/date/DateTest.cpp
+++ b/tests/modules/date/DateTest.cpp
@@ -2,6 +2,15 @@
 
 #include <algorithm>
 #include <chrono>
+#include <cstdint>
+#include <cstdlib>
+#include <ctime>
+#include <iomanip>
+#include <ratio>
+#include <sstream>
+#include <string>
+#include <string_view>
+#include <time.h>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/finance/FinanceTest.cpp b/tests/modules/finance/FinanceTest.cpp
index 74514802f..c111a83aa 100644
--- a/tests/modules/finance/FinanceTest.cpp
+++ b/tests/modules/finance/FinanceTest.cpp
@@ -1,14 +1,17 @@
 #include "faker-cxx/Finance.h"
 
 #include <algorithm>
-#include <charconv>
 #include <ranges>
 #include <regex>
+#include <string>
+#include <string_view>
+#include <unordered_map>
 
 #include "gtest/gtest.h"
 
 #include "common/LuhnCheck.h"
 #include "common/StringHelper.h"
+#include "faker-cxx/types/Precision.h"
 #include "finance/FinanceData.h"
 #include "gmock/gmock.h"
 #include "string/StringData.h"
diff --git a/tests/modules/food/FoodTest.cpp b/tests/modules/food/FoodTest.cpp
index affef4387..705ee6e18 100644
--- a/tests/modules/food/FoodTest.cpp
+++ b/tests/modules/food/FoodTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Food.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/git/GitTest.cpp b/tests/modules/git/GitTest.cpp
index 3bc74a690..50cf765fa 100644
--- a/tests/modules/git/GitTest.cpp
+++ b/tests/modules/git/GitTest.cpp
@@ -1,8 +1,8 @@
 #include "faker-cxx/Git.h"
 
-#include <algorithm>
 #include <regex>
 #include <string>
+#include <vector>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/hacker/HackerTest.cpp b/tests/modules/hacker/HackerTest.cpp
index 136e76066..881d70d5a 100644
--- a/tests/modules/hacker/HackerTest.cpp
+++ b/tests/modules/hacker/HackerTest.cpp
@@ -1,6 +1,8 @@
 #include "faker-cxx/Hacker.h"
 
 #include <algorithm>
+#include <string>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/helper/HelperTest.cpp b/tests/modules/helper/HelperTest.cpp
index c043154c1..e37f2a387 100644
--- a/tests/modules/helper/HelperTest.cpp
+++ b/tests/modules/helper/HelperTest.cpp
@@ -1,8 +1,13 @@
 #include "faker-cxx/Helper.h"
 
 #include <algorithm>
+#include <cctype>
 #include <regex>
+#include <set>
+#include <span>
 #include <stdexcept>
+#include <string>
+#include <unordered_map>
 #include <vector>
 
 #include "gtest/gtest.h"
diff --git a/tests/modules/image/ImageTest.cpp b/tests/modules/image/ImageTest.cpp
index 2c9354a77..87b61d2bc 100644
--- a/tests/modules/image/ImageTest.cpp
+++ b/tests/modules/image/ImageTest.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <array>
+#include <string>
 #include <string_view>
 
 #include "gtest/gtest.h"
diff --git a/tests/modules/internet/InternetTest.cpp b/tests/modules/internet/InternetTest.cpp
index cbed96904..5c4f4cfb5 100644
--- a/tests/modules/internet/InternetTest.cpp
+++ b/tests/modules/internet/InternetTest.cpp
@@ -1,13 +1,23 @@
 #include "faker-cxx/Internet.h"
 
 #include <algorithm>
-#include <string_view>
+#include <array>
+#include <cctype>
 #include <charconv>
+#include <cstddef>
 #include <initializer_list>
+#include <optional>
+#include <sstream>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "gtest/gtest.h"
 
 #include "common/StringHelper.h"
+#include "faker-cxx/Number.h"
+#include "faker-cxx/types/Country.h"
+#include "internet/InternetData.h"
 #include "person/data/england/EnglishFirstNames.h"
 #include "person/data/england/EnglishLastNames.h"
 #include "person/data/romania/RomanianFirstNames.h"
@@ -15,8 +25,6 @@
 #include "string/StringData.h"
 #include "word/data/Adjectives.h"
 #include "word/data/Nouns.h"
-#include "internet/InternetData.h"
-#include "faker-cxx/Number.h"
 
 using namespace ::testing;
 using namespace faker;
diff --git a/tests/modules/location/LocationTest.cpp b/tests/modules/location/LocationTest.cpp
index 97a8edc38..737129672 100644
--- a/tests/modules/location/LocationTest.cpp
+++ b/tests/modules/location/LocationTest.cpp
@@ -1,10 +1,16 @@
 #include "faker-cxx/Location.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <string>
+#include <string_view>
+#include <unordered_map>
+#include <vector>
 
 #include "gtest/gtest.h"
 
 #include "common/StringHelper.h"
+#include "faker-cxx/types/Precision.h"
 #include "location/LocationData.h"
 #include "person/data/australia/AustralianFirstNames.h"
 #include "person/data/australia/AustralianLastNames.h"
diff --git a/tests/modules/lorem/LoremTest.cpp b/tests/modules/lorem/LoremTest.cpp
index f31f37dca..59ce5b15e 100644
--- a/tests/modules/lorem/LoremTest.cpp
+++ b/tests/modules/lorem/LoremTest.cpp
@@ -1,6 +1,8 @@
 #include "faker-cxx/Lorem.h"
 
 #include <algorithm>
+#include <cctype>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/movie/MovieTest.cpp b/tests/modules/movie/MovieTest.cpp
index 060cd7fc4..eec0823a2 100644
--- a/tests/modules/movie/MovieTest.cpp
+++ b/tests/modules/movie/MovieTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Movie.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/number/NumberTest.cpp b/tests/modules/number/NumberTest.cpp
index 36f2068ec..2606a423d 100644
--- a/tests/modules/number/NumberTest.cpp
+++ b/tests/modules/number/NumberTest.cpp
@@ -1,5 +1,7 @@
 #include "faker-cxx/Number.h"
 
+#include <stdexcept>
+
 #include "gtest/gtest.h"
 
 using namespace ::testing;
diff --git a/tests/modules/person/PersonTest.cpp b/tests/modules/person/PersonTest.cpp
index 905530fad..ebe6ef97d 100644
--- a/tests/modules/person/PersonTest.cpp
+++ b/tests/modules/person/PersonTest.cpp
@@ -1,11 +1,17 @@
 #include "faker-cxx/Person.h"
 
 #include <algorithm>
+#include <cctype>
 #include <regex>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
 
 #include "gtest/gtest.h"
 
 #include "faker-cxx/Internet.h"
+#include "faker-cxx/types/Country.h"
 #include "person/data/albania/AlbanianPeopleNames.h"
 #include "person/data/argentina/ArgentinianPeopleNames.h"
 #include "person/data/australia/AustralianPeopleNames.h"
@@ -76,6 +82,7 @@
 #include "person/data/usa/UsaPeopleNames.h"
 #include "person/data/vietnam/VietnamesePeopleNames.h"
 #include "person/data/ZodiacSigns.h"
+#include "StringHelper.h"
 #include "word/data/Nouns.h"
 
 using namespace ::testing;
diff --git a/tests/modules/phone/PhoneTest.cpp b/tests/modules/phone/PhoneTest.cpp
index 23f376b23..b2288d4c5 100644
--- a/tests/modules/phone/PhoneTest.cpp
+++ b/tests/modules/phone/PhoneTest.cpp
@@ -1,7 +1,7 @@
 #include "faker-cxx/Phone.h"
 
 #include <algorithm>
-#include <vector>
+#include <cctype>
 #include <string>
 #include <string_view>
 
diff --git a/tests/modules/science/ScienceTest.cpp b/tests/modules/science/ScienceTest.cpp
index 2c28a87c4..58cc723d1 100644
--- a/tests/modules/science/ScienceTest.cpp
+++ b/tests/modules/science/ScienceTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/Science.h"
 
 #include <algorithm>
+#include <vector>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/string/StringTest.cpp b/tests/modules/string/StringTest.cpp
index e4ac0c7f3..dbca4e895 100644
--- a/tests/modules/string/StringTest.cpp
+++ b/tests/modules/string/StringTest.cpp
@@ -1,13 +1,17 @@
 #include "faker-cxx/String.h"
 
 #include <algorithm>
+#include <cctype>
 #include <random>
 #include <stdexcept>
+#include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 
-#include "string/StringData.h"
 #include "faker-cxx/RandomGenerator.h"
+#include "faker-cxx/types/Hex.h"
+#include "string/StringData.h"
 
 using namespace ::testing;
 using namespace faker;
diff --git a/tests/modules/system/SystemTest.cpp b/tests/modules/system/SystemTest.cpp
index d9dd361b1..bfa2e836e 100644
--- a/tests/modules/system/SystemTest.cpp
+++ b/tests/modules/system/SystemTest.cpp
@@ -1,7 +1,13 @@
 #include "faker-cxx/System.h"
 
 #include <algorithm>
+#include <cstddef>
+#include <optional>
 #include <regex>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <vector>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/videoGame/VideoGameTest.cpp b/tests/modules/videoGame/VideoGameTest.cpp
index 6475e0072..9bfe3afd8 100644
--- a/tests/modules/videoGame/VideoGameTest.cpp
+++ b/tests/modules/videoGame/VideoGameTest.cpp
@@ -1,6 +1,7 @@
 #include "faker-cxx/VideoGame.h"
 
 #include <algorithm>
+#include <string_view>
 
 #include "gtest/gtest.h"
 
diff --git a/tests/modules/word/WordTest.cpp b/tests/modules/word/WordTest.cpp
index 471e405bc..c7a17c81c 100644
--- a/tests/modules/word/WordTest.cpp
+++ b/tests/modules/word/WordTest.cpp
@@ -1,6 +1,8 @@
 #include "faker-cxx/Word.h"
 
 #include <algorithm>
+#include <string>
+#include <vector>
 
 #include "gtest/gtest.h"