diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b0bf03..5a9403b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRES ON)
 
 project(libGPULayers_UnitTests VERSION 1.0.0)
 
diff --git a/generator/vk_codegen/root_CMakeLists.txt b/generator/vk_codegen/root_CMakeLists.txt
index 3b9446b..edadf4d 100644
--- a/generator/vk_codegen/root_CMakeLists.txt
+++ b/generator/vk_codegen/root_CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRES ON)
 
 project({PROJECT_NAME} VERSION 1.0.0)
 
diff --git a/layer_example/CMakeLists.txt b/layer_example/CMakeLists.txt
index 96afa6d..4707970 100644
--- a/layer_example/CMakeLists.txt
+++ b/layer_example/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRES ON)
 
 project(VkLayerExample VERSION 1.0.0)
 
diff --git a/layer_gpu_support/CMakeLists.txt b/layer_gpu_support/CMakeLists.txt
index 0dc6766..9c21abe 100644
--- a/layer_gpu_support/CMakeLists.txt
+++ b/layer_gpu_support/CMakeLists.txt
@@ -24,6 +24,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRES ON)
 
 project(VkLayerGPUSupport VERSION 1.0.0)
 
diff --git a/layer_gpu_timeline/CMakeLists.txt b/layer_gpu_timeline/CMakeLists.txt
index 661718b..472c47d 100644
--- a/layer_gpu_timeline/CMakeLists.txt
+++ b/layer_gpu_timeline/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: MIT
 # -----------------------------------------------------------------------------
-# Copyright (c) 2024 Arm Limited
+# Copyright (c) 2024-2025 Arm Limited
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
@@ -24,6 +24,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRES ON)
 
 project(VkLayerGPUTimeline VERSION 1.0.0)
 
diff --git a/source_common/comms/test/comms_test_server.cpp b/source_common/comms/test/comms_test_server.cpp
index 56c11e9..e437478 100644
--- a/source_common/comms/test/comms_test_server.cpp
+++ b/source_common/comms/test/comms_test_server.cpp
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: MIT
  * ----------------------------------------------------------------------------
- * Copyright (c) 2024 Arm Limited
+ * Copyright (c) 2024-2025 Arm Limited
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -34,6 +34,7 @@
 #include <iostream>
 
 #include <arpa/inet.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/source_common/trackers/command_buffer.cpp b/source_common/trackers/command_buffer.cpp
index 1b99145..d9f3a03 100644
--- a/source_common/trackers/command_buffer.cpp
+++ b/source_common/trackers/command_buffer.cpp
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: MIT
  * ----------------------------------------------------------------------------
- * Copyright (c) 2022-2024 Arm Limited
+ * Copyright (c) 2022-2025 Arm Limited
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -35,8 +35,7 @@ namespace Tracker
 /* See header for documentation. */
 CommandBuffer::CommandBuffer(VkCommandBuffer _handle)
     : handle(_handle) {
-
-      };
+}
 
 /* See header for documentation. */
 void CommandBuffer::reset()
@@ -233,8 +232,7 @@ void CommandBuffer::executeCommands(CommandBuffer& secondary)
 /* See header for documentation. */
 CommandPool::CommandPool(VkCommandPool _handle)
     : handle(_handle) {
-
-      };
+}
 
 /* See header for documentation. */
 CommandBuffer& CommandPool::allocateCommandBuffer(VkCommandBuffer commandBuffer)