diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 584c8b4..77cc332 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -41,9 +41,6 @@ set(CORE_LIB_HDRS
     core/partitiontable.h
     core/smartattribute.h
     core/smartstatus.h
-    core/smartparser.h
-    core/smartattributeparseddata.h
-    core/smartdiskinformation.h
     core/volumemanagerdevice.h
 )
 
diff --git a/src/core/copysource.h b/src/core/copysource.h
index f8f36b2..4e4f447 100644
--- a/src/core/copysource.h
+++ b/src/core/copysource.h
@@ -48,8 +48,6 @@ public:
 
     virtual qint64 firstByte() const = 0;
     virtual qint64 lastByte() const = 0;
-
-private:
 };
 
 #endif
diff --git a/src/core/smartattribute.h b/src/core/smartattribute.h
index d0d2e2a..08687d1 100644
--- a/src/core/smartattribute.h
+++ b/src/core/smartattribute.h
@@ -15,15 +15,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_SMARTATTRIBUTE_H)
-
+#ifndef KPMCORE_SMARTATTRIBUTE_H
 #define KPMCORE_SMARTATTRIBUTE_H
 
 #include "util/libpartitionmanagerexport.h"
-#include "core/smartattributeparseddata.h"
 
 #include <QString>
 
+class SmartAttributeParsedData;
 
 class LIBKPMCORE_EXPORT SmartAttribute
 {
@@ -104,4 +103,3 @@ private:
 };
 
 #endif
-
diff --git a/src/core/smartattributeparseddata.h b/src/core/smartattributeparseddata.h
index ef3ed51..3f1a7fc 100644
--- a/src/core/smartattributeparseddata.h
+++ b/src/core/smartattributeparseddata.h
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_SMARTATTRIBUTEPARSEDDATA_H)
+#ifndef KPMCORE_SMARTATTRIBUTEPARSEDDATA_H
 #define KPMCORE_SMARTATTRIBUTEPARSEDDATA_H
 
 #include <QJsonObject>
diff --git a/src/core/smartdiskinformation.h b/src/core/smartdiskinformation.h
index 572168b..996c2fc 100644
--- a/src/core/smartdiskinformation.h
+++ b/src/core/smartdiskinformation.h
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_SMARTDISKINFORMATION_H)
+#ifndef KPMCORE_SMARTDISKINFORMATION_H
 #define KPMCORE_SMARTDISKINFORMATION_H
 
 #include <QList>
diff --git a/src/core/smartparser.h b/src/core/smartparser.h
index 3438e8d..a48750c 100644
--- a/src/core/smartparser.h
+++ b/src/core/smartparser.h
@@ -15,7 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_SMARTPARSER_H)
+#ifndef KPMCORE_SMARTPARSER_H
 #define KPMCORE_SMARTPARSER_H
 
 #include <QJsonDocument>
diff --git a/src/core/smartstatus.h b/src/core/smartstatus.h
index 2983582..d064b7e 100644
--- a/src/core/smartstatus.h
+++ b/src/core/smartstatus.h
@@ -15,8 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(KPMCORE_SMARTSTATUS_H)
-
+#ifndef KPMCORE_SMARTSTATUS_H
 #define KPMCORE_SMARTSTATUS_H
 
 #include "util/libpartitionmanagerexport.h"
diff --git a/src/core/volumemanagerdevice.h b/src/core/volumemanagerdevice.h
index db4272e..42c84c8 100644
--- a/src/core/volumemanagerdevice.h
+++ b/src/core/volumemanagerdevice.h
@@ -80,9 +80,9 @@ protected:
 
 public:
 
-    /** string deviceNodes together into comma-sperated list
+    /** join deviceNodes together into comma-separated list
      *
-     *  @return comma-seperated list of deviceNodes
+     *  @return comma-separated list of deviceNodes
      */
     virtual QString prettyDeviceNodeList() const;