diff --git a/mediachanger/acs/AcsCmd.hpp b/mediachanger/acs/AcsCmd.hpp
index 0cf8de91f1cb832a0d675285b07dacba9ed5a174..54650e61ac05ff581bd0fdea6db80779e7dc3130 100644
--- a/mediachanger/acs/AcsCmd.hpp
+++ b/mediachanger/acs/AcsCmd.hpp
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/Mismatch.hpp"
 //#include "common/exception/RequestFailed.hpp"
 #include "common/exception/RequestFailed.hpp"
diff --git a/mediachanger/acs/AcsDismountCmd.hpp b/mediachanger/acs/AcsDismountCmd.hpp
index 729d15a4c33c491e583b466ff2d972c2405c8ef1..a9ef4d3f1d9836f9a26725e1fbeb2abca7af63f2 100644
--- a/mediachanger/acs/AcsDismountCmd.hpp
+++ b/mediachanger/acs/AcsDismountCmd.hpp
@@ -21,7 +21,6 @@
 #include "AcsCmd.hpp"
 #include "AcsDismountCmdLine.hpp"
 #include "common/exception/DismountFailed.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 
 namespace cta {
diff --git a/mediachanger/acs/AcsDismountCmdLine.cpp b/mediachanger/acs/AcsDismountCmdLine.cpp
index 47e288ca3f752927c186b47d4a2ae6e39646f0f4..00d90b1ad574fd78f209bc7839670225c58ae085 100644
--- a/mediachanger/acs/AcsDismountCmdLine.cpp
+++ b/mediachanger/acs/AcsDismountCmdLine.cpp
@@ -20,7 +20,6 @@
 #include "AcsCmdLine.hpp"
 #include "AcsDismountCmdLine.hpp"
 #include "Constants.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 
 #include <getopt.h>
diff --git a/mediachanger/acs/AcsMountCmd.hpp b/mediachanger/acs/AcsMountCmd.hpp
index 992b6f1d6dc9a5ffbd430078880e1fa2b40c9936..6962cf2d8c072c1a83ec0e8393cef118d6ab86d4 100644
--- a/mediachanger/acs/AcsMountCmd.hpp
+++ b/mediachanger/acs/AcsMountCmd.hpp
@@ -20,7 +20,6 @@
 
 #include "AcsCmd.hpp"
 #include "AcsMountCmdLine.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 #include "common/exception/MountFailed.hpp"
 
diff --git a/mediachanger/acs/AcsMountCmdLine.cpp b/mediachanger/acs/AcsMountCmdLine.cpp
index b59befdd9c28723729eae40b0c6939634c19b5e6..67e7e0c545c56700b6b4788379ca0376c60e5caf 100644
--- a/mediachanger/acs/AcsMountCmdLine.cpp
+++ b/mediachanger/acs/AcsMountCmdLine.cpp
@@ -19,7 +19,6 @@
 #include "Acs.hpp"
 #include "AcsMountCmdLine.hpp"
 #include "Constants.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 
 #include <getopt.h>
diff --git a/mediachanger/acs/AcsQueryDriveCmd.hpp b/mediachanger/acs/AcsQueryDriveCmd.hpp
index 7c94d3f6ccaa37bdbc0ce883033dae761b2ee783..d4c012c8f59b38a2770e2fedffb04e438e3a4921 100644
--- a/mediachanger/acs/AcsQueryDriveCmd.hpp
+++ b/mediachanger/acs/AcsQueryDriveCmd.hpp
@@ -20,7 +20,6 @@
 
 #include "AcsCmd.hpp"
 #include "AcsQueryDriveCmdLine.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 #include "mediachanger/CmdLineTool.hpp"
 #include <stdint.h>
diff --git a/mediachanger/acs/AcsQueryDriveCmdLine.cpp b/mediachanger/acs/AcsQueryDriveCmdLine.cpp
index bffb3fe1acc10be5b6db41afbc0ec48d6b192ea2..f7022bb16c4d51d6a5d591b29663b47a2186ca9f 100644
--- a/mediachanger/acs/AcsQueryDriveCmdLine.cpp
+++ b/mediachanger/acs/AcsQueryDriveCmdLine.cpp
@@ -20,7 +20,6 @@
 #include "Acs.hpp"
 #include "AcsQueryDriveCmdLine.hpp"
 #include "Constants.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 #include <getopt.h>
 #include <stdlib.h>
diff --git a/mediachanger/acs/AcsQueryVolumeCmd.hpp b/mediachanger/acs/AcsQueryVolumeCmd.hpp
index 93c753a53ccd5a79bb3ee655e8c62c92b02c90af..dda0aa48246c98f51b4d5644490957e9bc03082e 100644
--- a/mediachanger/acs/AcsQueryVolumeCmd.hpp
+++ b/mediachanger/acs/AcsQueryVolumeCmd.hpp
@@ -20,7 +20,6 @@
 
 #include "AcsCmd.hpp"
 #include "AcsQueryVolumeCmdLine.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 #include "common/exception/QueryVolumeFailed.hpp"
 
diff --git a/mediachanger/acs/AcsQueryVolumeCmdLine.cpp b/mediachanger/acs/AcsQueryVolumeCmdLine.cpp
index 66e3a8b34957f0188e3cd5fbbdf92533692942ff..98029595ac89fdb21eb88a289db296d679b61a81 100644
--- a/mediachanger/acs/AcsQueryVolumeCmdLine.cpp
+++ b/mediachanger/acs/AcsQueryVolumeCmdLine.cpp
@@ -20,7 +20,6 @@
 #include "Acs.hpp"
 #include "AcsQueryVolumeCmdLine.hpp"
 #include "Constants.hpp"
-#include "common/exception/InvalidArgument.hpp"
 #include "common/exception/MissingOperand.hpp"
 
 #include <getopt.h>
diff --git a/mediachanger/acs/AcsTest.cpp b/mediachanger/acs/AcsTest.cpp
index da2af32430c12ff298eb434ebde4c1a4cae2a744..262a031da81d430f8cf02034baf74f69f4f49a46 100644
--- a/mediachanger/acs/AcsTest.cpp
+++ b/mediachanger/acs/AcsTest.cpp
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "common/exception/InvalidArgument.hpp"
 #include "mediachanger/acs/Acs.hpp"
 
 #include <gtest/gtest.h>