diff --git a/libk3b/jobs/k3bblankingjob.h b/libk3b/jobs/k3bblankingjob.h
index 18234bd..4555238 100644
--- a/libk3b/jobs/k3bblankingjob.h
+++ b/libk3b/jobs/k3bblankingjob.h
@@ -20,7 +20,9 @@
 #include "k3b_export.h"
 class TDEProcess;
 class TQString;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class K3bAbstractWriter;
 
 
diff --git a/libk3b/projects/audiocd/k3baudiojob.h b/libk3b/projects/audiocd/k3baudiojob.h
index c0054c6..4dd2602 100644
--- a/libk3b/projects/audiocd/k3baudiojob.h
+++ b/libk3b/projects/audiocd/k3baudiojob.h
@@ -29,7 +29,9 @@ class KTempFile;
 class K3bCdrecordWriter;
 class K3bAudioNormalizeJob;
 class K3bAudioJobTempData;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class K3bAudioMaxSpeedJob;
 
 /**
diff --git a/libk3b/projects/datacd/k3bisoimager.h b/libk3b/projects/datacd/k3bisoimager.h
index 42277c2..0c3535e 100644
--- a/libk3b/projects/datacd/k3bisoimager.h
+++ b/libk3b/projects/datacd/k3bisoimager.h
@@ -29,7 +29,9 @@ class K3bFileItem;
 class TQTextStream;
 class K3bProcess;
 class TDEProcess;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class KTempFile;
 
 
diff --git a/libk3b/projects/k3babstractwriter.h b/libk3b/projects/k3babstractwriter.h
index a521675..803bf47 100644
--- a/libk3b/projects/k3babstractwriter.h
+++ b/libk3b/projects/k3babstractwriter.h
@@ -22,7 +22,9 @@
 
 #include <tqdatetime.h>
 
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class K3bJobHandler;
 
 
diff --git a/libk3b/projects/k3bcdrdaowriter.h b/libk3b/projects/k3bcdrdaowriter.h
index c1d1457..1f8c99b 100644
--- a/libk3b/projects/k3bcdrdaowriter.h
+++ b/libk3b/projects/k3bcdrdaowriter.h
@@ -24,7 +24,9 @@
 class K3bExternalBin;
 class K3bProcess;
 class TDEProcess;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class TQSocket;
 
 
diff --git a/libk3b/projects/k3bcdrecordwriter.h b/libk3b/projects/k3bcdrecordwriter.h
index dd81402..8737ca2 100644
--- a/libk3b/projects/k3bcdrecordwriter.h
+++ b/libk3b/projects/k3bcdrecordwriter.h
@@ -25,7 +25,9 @@
 class K3bExternalBin;
 class K3bProcess;
 class TDEProcess;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 
 
 class K3bCdrecordWriter : public K3bAbstractWriter
diff --git a/libk3b/projects/k3bdvdrecordwriter.h b/libk3b/projects/k3bdvdrecordwriter.h
index 2a7de9a..5b2ab23 100644
--- a/libk3b/projects/k3bdvdrecordwriter.h
+++ b/libk3b/projects/k3bdvdrecordwriter.h
@@ -19,7 +19,9 @@
 #include "k3bcdrecordwriter.h"
 
 
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 
 /**
  * Basically this is just a wrapper around K3bCdrecordWriter
diff --git a/libk3b/projects/mixedcd/k3bmixedjob.h b/libk3b/projects/mixedcd/k3bmixedjob.h
index ff2c911..a36d47f 100644
--- a/libk3b/projects/mixedcd/k3bmixedjob.h
+++ b/libk3b/projects/mixedcd/k3bmixedjob.h
@@ -32,7 +32,9 @@ class K3bCdrecordWriter;
 class K3bMsInfoFetcher;
 class K3bAudioNormalizeJob;
 class K3bAudioJobTempData;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 
 /**
   *@author Sebastian Trueg
diff --git a/libk3b/projects/movixcd/k3bmovixjob.h b/libk3b/projects/movixcd/k3bmovixjob.h
index 0117e5f..dbed444 100644
--- a/libk3b/projects/movixcd/k3bmovixjob.h
+++ b/libk3b/projects/movixcd/k3bmovixjob.h
@@ -20,7 +20,9 @@
 #include <k3bjob.h>
 
 class K3bMovixDoc;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class K3bDataJob;
 class KTempFile;
 class K3bMovixInstallation;
diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.h b/libk3b/projects/movixdvd/k3bmovixdvdjob.h
index aa5dadb..2ddea38 100644
--- a/libk3b/projects/movixdvd/k3bmovixdvdjob.h
+++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.h
@@ -20,7 +20,9 @@
 #include <k3bjob.h>
 
 class K3bMovixDvdDoc;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 class K3bDvdJob;
 class KTempFile;
 class K3bMovixInstallation;
diff --git a/libk3b/projects/videocd/k3bvcdjob.h b/libk3b/projects/videocd/k3bvcdjob.h
index 329646f..9eca0ed 100644
--- a/libk3b/projects/videocd/k3bvcdjob.h
+++ b/libk3b/projects/videocd/k3bvcdjob.h
@@ -25,7 +25,9 @@ class K3bProcess;
 class TDEProcess;
 class TQDataStream;
 class K3bAbstractWriter;
-class K3bDevice::Device;
+namespace K3bDevice {
+    class Device;
+}
 
 
 class K3bVcdJob : public K3bBurnJob