diff --git a/src/mimeattachment.h b/src/mimeattachment.h
index 90a5780..8b8e4cd 100644
--- a/src/mimeattachment.h
+++ b/src/mimeattachment.h
@@ -20,14 +20,12 @@
 #define MIMEATTACHMENT_H
 
 
-#include <QFile>
 #include "smtpmime_global.h"
 #include "mimepart.h"
 #include "mimefile.h"
 
 class SMTP_MIME_EXPORT MimeAttachment : public MimeFile
 {
-    Q_OBJECT
 public:
 
     /* [1] Constructors and Destructors */
diff --git a/src/mimefile.h b/src/mimefile.h
index 8540c77..0ec74f2 100644
--- a/src/mimefile.h
+++ b/src/mimefile.h
@@ -19,13 +19,13 @@
 #ifndef MIMEFILE_H
 #define MIMEFILE_H
 
-#include <QFile>
 #include "mimepart.h"
 #include "smtpmime_global.h"
 
+class QFile;
+
 class SMTP_MIME_EXPORT MimeFile : public MimePart
 {
-    Q_OBJECT
 public:
 
     /* [1] Constructors and Destructors */
diff --git a/src/mimehtml.h b/src/mimehtml.h
index 5d59bc4..b8b7098 100644
--- a/src/mimehtml.h
+++ b/src/mimehtml.h
@@ -24,7 +24,6 @@
 
 class SMTP_MIME_EXPORT MimeHtml : public MimeText
 {
-    Q_OBJECT
 public:
 
     /* [1] Constructors and Destructors */
diff --git a/src/mimemultipart.cpp b/src/mimemultipart.cpp
index b3a70d1..8f14144 100644
--- a/src/mimemultipart.cpp
+++ b/src/mimemultipart.cpp
@@ -17,6 +17,7 @@
 */
 
 #include "mimemultipart.h"
+#include <QIODevice>
 #include <QTime>
 #include <QCryptographicHash>
 
diff --git a/src/mimemultipart.h b/src/mimemultipart.h
index 6355347..f4770c4 100644
--- a/src/mimemultipart.h
+++ b/src/mimemultipart.h
@@ -20,13 +20,11 @@
 #define MIMEMULTIPART_H
 
 #include <QList>
-#include <QTextStream>
 #include "smtpmime_global.h"
 #include "mimepart.h"
 
 class SMTP_MIME_EXPORT MimeMultiPart : public MimePart
 {
-    Q_OBJECT
 public:
 
     /* [0] Enums */
diff --git a/src/mimepart.h b/src/mimepart.h
index 49bbb19..bb3d65a 100644
--- a/src/mimepart.h
+++ b/src/mimepart.h
@@ -19,13 +19,14 @@
 #ifndef MIMEPART_H
 #define MIMEPART_H
 
-#include <QObject>
-#include <QTextStream>
 #include "smtpmime_global.h"
+#include <QByteArray>
+#include <QString>
 
-class SMTP_MIME_EXPORT MimePart : public QObject
+class QIODevice;
+
+class SMTP_MIME_EXPORT MimePart
 {
-    Q_OBJECT
 public:
 
     /* [0] Enumerations */
@@ -43,7 +44,7 @@ public:
     /* [1] Constructors and Destructors */
 
     MimePart();
-    ~MimePart();
+    virtual ~MimePart();
 
     /* [1] --- */