diff --git a/Source/bluetoothaudiosink/Module.h b/Source/bluetoothaudiosink/Module.h
index 80d652f9..5037542d 100644
--- a/Source/bluetoothaudiosink/Module.h
+++ b/Source/bluetoothaudiosink/Module.h
@@ -25,5 +25,5 @@
 
 #include <com/com.h>
 #include <core/core.h>
-#include <plugins/plugins.h>
+#include <plugins/Types.h>
 #include <messaging/messaging.h>
diff --git a/Source/bluetoothaudiosource/Module.h b/Source/bluetoothaudiosource/Module.h
index 16fba8c1..dc9a84b6 100644
--- a/Source/bluetoothaudiosource/Module.h
+++ b/Source/bluetoothaudiosource/Module.h
@@ -25,5 +25,5 @@
 
 #include <com/com.h>
 #include <core/core.h>
-#include <plugins/plugins.h>
+#include <plugins/Types.h>
 #include <messaging/messaging.h>
diff --git a/Source/cryptography/Module.h b/Source/cryptography/Module.h
index 1cf90ad0..40a869ac 100644
--- a/Source/cryptography/Module.h
+++ b/Source/cryptography/Module.h
@@ -25,7 +25,6 @@
 
 #include <core/core.h>
 #include <com/com.h>
-#include <messaging/messaging.h>
 #include <cryptalgo/cryptalgo.h>
 
 #if defined(__WINDOWS__) 
diff --git a/Source/deviceinfo/Module.h b/Source/deviceinfo/Module.h
index 1da1a536..5b313428 100644
--- a/Source/deviceinfo/Module.h
+++ b/Source/deviceinfo/Module.h
@@ -25,8 +25,8 @@
 
 #include <com/com.h>
 #include <core/core.h>
-#include <plugins/plugins.h>
-#include <messaging/messaging.h>
+#include <plugins/Types.h>
+#include <plugins/ISubSystem.h>
 
 #if defined(__WINDOWS__) && defined(DEVICEINFO_EXPORTS)
 #undef EXTERNAL
diff --git a/Source/securityagent/Module.h b/Source/securityagent/Module.h
index 97d91226..bf553c2d 100644
--- a/Source/securityagent/Module.h
+++ b/Source/securityagent/Module.h
@@ -25,7 +25,7 @@
 
 #include <core/core.h>
 #include <com/com.h>
-#include <plugins/plugins.h>
+#include <plugins/Types.h>
 
 
 #if defined(__WINDOWS__) && defined(SECURITYAGENT_EXPORTS)