diff --git a/fastdds_python/test/types/CMakeLists.txt b/fastdds_python/test/types/CMakeLists.txt
index 50330045..b718edb0 100644
--- a/fastdds_python/test/types/CMakeLists.txt
+++ b/fastdds_python/test/types/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-cmake_minimum_required(VERSION 3.16.3)
+cmake_minimum_required(VERSION 3.22)
 
 # SWIG: use standard target name.
 if(POLICY CMP0078)
diff --git a/fastdds_python/test/types/test_completev1.h b/fastdds_python/test/types/test_completev1.h
index a53a7c1c..7258f061 100644
--- a/fastdds_python/test/types/test_completev1.h
+++ b/fastdds_python/test/types/test_completev1.h
@@ -30,12 +30,13 @@
 
 #include <fastrtps/utils/fixed_size_string.hpp>
 
-#include <stdint.h>
 #include <array>
+#include <bitset>
+#include <cstdint>
+#include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
-#include <map>
-#include <bitset>
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
diff --git a/fastdds_python/test/types/test_included_modulesv1.h b/fastdds_python/test/types/test_included_modulesv1.h
index a393d7f9..de5eb0f8 100644
--- a/fastdds_python/test/types/test_included_modulesv1.h
+++ b/fastdds_python/test/types/test_included_modulesv1.h
@@ -29,12 +29,13 @@
 
 #include <fastrtps/utils/fixed_size_string.hpp>
 
-#include <stdint.h>
 #include <array>
+#include <bitset>
+#include <cstdint>
+#include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
-#include <map>
-#include <bitset>
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
diff --git a/fastdds_python/test/types/test_modulesv1.h b/fastdds_python/test/types/test_modulesv1.h
index e3bf4e8e..4bee87f3 100644
--- a/fastdds_python/test/types/test_modulesv1.h
+++ b/fastdds_python/test/types/test_modulesv1.h
@@ -29,12 +29,13 @@
 
 #include <fastrtps/utils/fixed_size_string.hpp>
 
-#include <stdint.h>
 #include <array>
+#include <bitset>
+#include <cstdint>
+#include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
-#include <map>
-#include <bitset>
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
diff --git a/fastdds_python_examples/HelloWorldExample/HelloWorldv1.h b/fastdds_python_examples/HelloWorldExample/HelloWorldv1.h
index 7758cd79..9f6f726e 100644
--- a/fastdds_python_examples/HelloWorldExample/HelloWorldv1.h
+++ b/fastdds_python_examples/HelloWorldExample/HelloWorldv1.h
@@ -29,12 +29,13 @@
 
 #include <fastrtps/utils/fixed_size_string.hpp>
 
-#include <stdint.h>
 #include <array>
+#include <bitset>
+#include <cstdint>
+#include <map>
+#include <stdint.h>
 #include <string>
 #include <vector>
-#include <map>
-#include <bitset>
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)