diff --git a/include/RMGEventAction.hh b/include/RMGEventAction.hh
index 259a1b0..0ef7e19 100644
--- a/include/RMGEventAction.hh
+++ b/include/RMGEventAction.hh
@@ -22,7 +22,6 @@
 #include "G4UserEventAction.hh"
 
 class RMGRunAction;
-class G4GenericMessenger;
 class RMGEventAction : public G4UserEventAction {
 
   public:
diff --git a/include/RMGExceptionHandler.hh b/include/RMGExceptionHandler.hh
index bf3cc0a..8901e8f 100644
--- a/include/RMGExceptionHandler.hh
+++ b/include/RMGExceptionHandler.hh
@@ -16,19 +16,8 @@
 #ifndef _RMG_EXCEPTION_HANDLER_HH_
 #define _RMG_EXCEPTION_HANDLER_HH_
 
-#include <memory>
-#include <vector>
-
 #include "G4ExceptionHandler.hh"
-#include "globals.hh"
-
-#include "RMGLog.hh"
 
-class G4VUserPhysicsList;
-class RMGHardware;
-class RMGUserAction;
-class G4GenericMessenger;
-class G4UIExecutive;
 class RMGExceptionHandler : public G4ExceptionHandler {
 
   public:
diff --git a/include/RMGGeneratorCosmicMuons.hh b/include/RMGGeneratorCosmicMuons.hh
index e0ffa01..6aa2261 100644
--- a/include/RMGGeneratorCosmicMuons.hh
+++ b/include/RMGGeneratorCosmicMuons.hh
@@ -22,7 +22,6 @@
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "G4GenericMessenger.hh"
 #include "G4ParticleGun.hh"
-#include "G4VUserPrimaryGeneratorAction.hh"
 
 #include "RMGVGenerator.hh"
 
diff --git a/include/RMGGeneratorMUSUNCosmicMuons.hh b/include/RMGGeneratorMUSUNCosmicMuons.hh
index a08d0fc..cdfdd37 100644
--- a/include/RMGGeneratorMUSUNCosmicMuons.hh
+++ b/include/RMGGeneratorMUSUNCosmicMuons.hh
@@ -7,7 +7,6 @@
 #include "G4CsvAnalysisReader.hh"
 #include "G4GenericMessenger.hh"
 #include "G4ParticleGun.hh"
-#include "G4VUserPrimaryGeneratorAction.hh"
 
 #include "RMGVGenerator.hh"
 #include "RMGVVertexGenerator.hh"
diff --git a/include/RMGGermaniumDetector.hh b/include/RMGGermaniumDetector.hh
index a0211ea..a92be40 100644
--- a/include/RMGGermaniumDetector.hh
+++ b/include/RMGGermaniumDetector.hh
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "G4Allocator.hh"
-#include "G4GenericMessenger.hh"
 #include "G4THitsCollection.hh"
 #include "G4ThreeVector.hh"
 #include "G4VHit.hh"
diff --git a/include/RMGMasterGenerator.hh b/include/RMGMasterGenerator.hh
index de5cff6..ffb556b 100644
--- a/include/RMGMasterGenerator.hh
+++ b/include/RMGMasterGenerator.hh
@@ -25,7 +25,6 @@
 
 class G4Event;
 class G4GenericMessenger;
-class G4Run;
 class RMGMasterGenerator : public G4VUserPrimaryGeneratorAction {
 
   public:
diff --git a/include/RMGOpticalDetector.hh b/include/RMGOpticalDetector.hh
index 90e50ff..2bd8d71 100644
--- a/include/RMGOpticalDetector.hh
+++ b/include/RMGOpticalDetector.hh
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "G4Allocator.hh"
-#include "G4GenericMessenger.hh"
 #include "G4THitsCollection.hh"
 #include "G4VHit.hh"
 #include "G4VSensitiveDetector.hh"
@@ -56,7 +55,6 @@ using RMGOpticalDetectorHitsCollection = G4THitsCollection<RMGOpticalDetectorHit
 class G4Step;
 class G4HCofThisEvent;
 class G4TouchableHistory;
-class G4GenericMessenger;
 class RMGOpticalDetector : public G4VSensitiveDetector {
 
   public:
diff --git a/src/RMGEventAction.cc b/src/RMGEventAction.cc
index 58a62c1..2c6a0b7 100644
--- a/src/RMGEventAction.cc
+++ b/src/RMGEventAction.cc
@@ -19,15 +19,12 @@
 #include <sstream>
 
 #include "G4AnalysisManager.hh"
-#include "G4GenericMessenger.hh"
 #include "G4RunManager.hh"
 
-#include "RMGHardware.hh"
 #include "RMGLog.hh"
 #include "RMGManager.hh"
 #include "RMGRun.hh"
 #include "RMGRunAction.hh"
-#include "RMGUserAction.hh"
 
 #include "fmt/chrono.h"
 #include "magic_enum/magic_enum.hpp"
diff --git a/src/RMGGermaniumDetector.cc b/src/RMGGermaniumDetector.cc
index 569ab90..b255cb6 100644
--- a/src/RMGGermaniumDetector.cc
+++ b/src/RMGGermaniumDetector.cc
@@ -19,14 +19,11 @@
 #include <stdexcept>
 #include <string>
 
-#include "G4AffineTransform.hh"
 #include "G4Circle.hh"
-#include "G4GenericMessenger.hh"
 #include "G4HCofThisEvent.hh"
 #include "G4OpticalPhoton.hh"
 #include "G4SDManager.hh"
 #include "G4Step.hh"
-#include "G4Track.hh"
 #include "G4UnitsTable.hh"
 #include "G4VVisManager.hh"
 
diff --git a/src/RMGOpticalDetector.cc b/src/RMGOpticalDetector.cc
index cab3673..5a48a23 100644
--- a/src/RMGOpticalDetector.cc
+++ b/src/RMGOpticalDetector.cc
@@ -18,13 +18,10 @@
 #include <map>
 #include <stdexcept>
 
-#include "G4GenericMessenger.hh"
 #include "G4HCofThisEvent.hh"
 #include "G4OpticalPhoton.hh"
 #include "G4SDManager.hh"
 #include "G4Step.hh"
-#include "G4ThreeVector.hh"
-#include "G4Track.hh"
 
 #include "RMGHardware.hh"
 #include "RMGLog.hh"