diff --git a/cpp/devices/scsi_host_bridge.cpp b/cpp/devices/scsi_host_bridge.cpp
index 3e4dee01f4..161220657a 100644
--- a/cpp/devices/scsi_host_bridge.cpp
+++ b/cpp/devices/scsi_host_bridge.cpp
@@ -20,7 +20,6 @@
 #include "scsi_command_util.h"
 #include "scsi_host_bridge.h"
 #include <arpa/inet.h>
-#include <array>
 
 using namespace std;
 using namespace scsi_defs;
diff --git a/cpp/devices/storage_device.cpp b/cpp/devices/storage_device.cpp
index 612e3b7a4f..f831a9ac96 100644
--- a/cpp/devices/storage_device.cpp
+++ b/cpp/devices/storage_device.cpp
@@ -10,7 +10,6 @@
 #include "shared/piscsi_exceptions.h"
 #include "storage_device.h"
 #include <unistd.h>
-#include <filesystem>
 
 using namespace std;
 using namespace filesystem;
diff --git a/cpp/monitor/sm_core.cpp b/cpp/monitor/sm_core.cpp
index dbb12fff82..1de6aca78b 100644
--- a/cpp/monitor/sm_core.cpp
+++ b/cpp/monitor/sm_core.cpp
@@ -10,7 +10,6 @@
 //---------------------------------------------------------------------------
 
 #include "monitor/sm_core.h"
-#include "hal/data_sample.h"
 #include "hal/gpiobus.h"
 #include "hal/gpiobus_factory.h"
 #include "monitor/sm_reports.h"
diff --git a/cpp/piscsi/command_context.cpp b/cpp/piscsi/command_context.cpp
index ce11e6ef1f..6cdfa96736 100644
--- a/cpp/piscsi/command_context.cpp
+++ b/cpp/piscsi/command_context.cpp
@@ -3,12 +3,11 @@
 // SCSI Target Emulator PiSCSI
 // for Raspberry Pi
 //
-// Copyright (C) 2021-2022 Uwe Seimet
+// Copyright (C) 2021-2023 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
 #include "shared/log.h"
-#include "generated/piscsi_interface.pb.h"
 #include "command_context.h"
 #include <iostream>
 
diff --git a/cpp/piscsi/localizer.cpp b/cpp/piscsi/localizer.cpp
index 6c044caa4a..72f64c3337 100644
--- a/cpp/piscsi/localizer.cpp
+++ b/cpp/piscsi/localizer.cpp
@@ -9,7 +9,6 @@
 
 #include "localizer.h"
 #include <cassert>
-#include <string>
 #include <algorithm>
 #include <regex>
 
diff --git a/cpp/piscsi/piscsi_core.cpp b/cpp/piscsi/piscsi_core.cpp
index 87acc5a951..f366f2b3e8 100644
--- a/cpp/piscsi/piscsi_core.cpp
+++ b/cpp/piscsi/piscsi_core.cpp
@@ -28,12 +28,10 @@
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include <netinet/in.h>
 #include <csignal>
-#include <string>
 #include <sstream>
 #include <iostream>
 #include <fstream>
 #include <list>
-#include <filesystem>
 
 using namespace std;
 using namespace filesystem;
diff --git a/cpp/piscsi/piscsi_image.cpp b/cpp/piscsi/piscsi_image.cpp
index 0ae6f0b0f2..6b4f2c54bd 100644
--- a/cpp/piscsi/piscsi_image.cpp
+++ b/cpp/piscsi/piscsi_image.cpp
@@ -10,14 +10,11 @@
 #include "shared/log.h"
 #include "shared/protobuf_util.h"
 #include "devices/disk.h"
-#include "command_context.h"
 #include "piscsi_image.h"
 #include <unistd.h>
 #include <pwd.h>
 #include <fstream>
-#include <string>
 #include <array>
-#include <filesystem>
 
 using namespace std;
 using namespace filesystem;
diff --git a/cpp/piscsi/piscsi_response.cpp b/cpp/piscsi/piscsi_response.cpp
index 3397a7ce24..4de1044ce7 100644
--- a/cpp/piscsi/piscsi_response.cpp
+++ b/cpp/piscsi/piscsi_response.cpp
@@ -11,8 +11,6 @@
 #include "shared/protobuf_util.h"
 #include "shared/piscsi_version.h"
 #include "devices/disk.h"
-#include "devices/device_factory.h"
-#include "generated/piscsi_interface.pb.h"
 #include "piscsi_response.h"
 #include <filesystem>
 
diff --git a/cpp/scsictl/scsictl_core.cpp b/cpp/scsictl/scsictl_core.cpp
index db2dea6267..2967bb9929 100644
--- a/cpp/scsictl/scsictl_core.cpp
+++ b/cpp/scsictl/scsictl_core.cpp
@@ -14,7 +14,6 @@
 #include "shared/protobuf_util.h"
 #include "shared/piscsi_exceptions.h"
 #include "shared/piscsi_version.h"
-#include "generated/piscsi_interface.pb.h"
 #include "scsictl/scsictl_parser.h"
 #include "scsictl/scsictl_commands.h"
 #include "scsictl/scsictl_core.h"
diff --git a/cpp/scsictl/scsictl_display.cpp b/cpp/scsictl/scsictl_display.cpp
index c5f75eb97e..77f1e393eb 100644
--- a/cpp/scsictl/scsictl_display.cpp
+++ b/cpp/scsictl/scsictl_display.cpp
@@ -3,14 +3,12 @@
 // SCSI Target Emulator PiSCSI
 // for Raspberry Pi
 //
-// Copyright (C) 2021-2022 Uwe Seimet
+// Copyright (C) 2021-2023 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
 #include "shared/protobuf_util.h"
-#include "generated/piscsi_interface.pb.h"
 #include "scsictl_display.h"
-#include <sstream>
 #include <list>
 #include <iomanip>