diff --git a/src/backend/corebackend.h b/src/backend/corebackend.h
index 142921a..3a3d1e8 100644
--- a/src/backend/corebackend.h
+++ b/src/backend/corebackend.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COREBACKEND__H)
+#if !defined(KPMCORE_COREBACKEND_H)
 
-#define COREBACKEND__H
+#define KPMCORE_COREBACKEND_H
 
 #include "util/libpartitionmanagerexport.h"
 #include "fs/filesystem.h"
diff --git a/src/backend/corebackenddevice.h b/src/backend/corebackenddevice.h
index ae98f66..b35adc8 100644
--- a/src/backend/corebackenddevice.h
+++ b/src/backend/corebackenddevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COREBACKENDDEVICE__H)
+#if !defined(KPMCORE_COREBACKENDDEVICE_H)
 
-#define COREBACKENDDEVICE__H
+#define KPMCORE_COREBACKENDDEVICE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/backend/corebackendmanager.h b/src/backend/corebackendmanager.h
index d59732c..be7fd21 100644
--- a/src/backend/corebackendmanager.h
+++ b/src/backend/corebackendmanager.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COREBACKENDMANAGER__H)
+#if !defined(KPMCORE_COREBACKENDMANAGER_H)
 
-#define COREBACKENDMANAGER__H
+#define KPMCORE_COREBACKENDMANAGER_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/backend/corebackendpartition.h b/src/backend/corebackendpartition.h
index 6e5c463..e902b57 100644
--- a/src/backend/corebackendpartition.h
+++ b/src/backend/corebackendpartition.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COREBACKENDPARTITION__H)
+#if !defined(KPMCORE_COREBACKENDPARTITION_H)
 
-#define COREBACKENDPARTITION__H
+#define KPMCORE_COREBACKENDPARTITION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/backend/corebackendpartitiontable.h b/src/backend/corebackendpartitiontable.h
index f9fde45..560031a 100644
--- a/src/backend/corebackendpartitiontable.h
+++ b/src/backend/corebackendpartitiontable.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COREBACKENDPARTITIONTABLE__H)
+#if !defined(KPMCORE_COREBACKENDPARTITIONTABLE_H)
 
-#define COREBACKENDPARTITIONTABLE__H
+#define KPMCORE_COREBACKENDPARTITIONTABLE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/copysource.h b/src/core/copysource.h
index dbbebf0..baa8378 100644
--- a/src/core/copysource.h
+++ b/src/core/copysource.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYSOURCE__H)
+#if !defined(KPMCORE_COPYSOURCE_H)
 
-#define COPYSOURCE__H
+#define KPMCORE_COPYSOURCE_H
 
 #include <QtGlobal>
 
diff --git a/src/core/copysourcedevice.h b/src/core/copysourcedevice.h
index b05835a..d5581b7 100644
--- a/src/core/copysourcedevice.h
+++ b/src/core/copysourcedevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYSOURCEDEVICE__H)
+#if !defined(KPMCORE_COPYSOURCEDEVICE_H)
 
-#define COPYSOURCEDEVICE__H
+#define KPMCORE_COPYSOURCEDEVICE_H
 
 #include "core/copysource.h"
 #include "util/libpartitionmanagerexport.h"
diff --git a/src/core/copysourcefile.h b/src/core/copysourcefile.h
index 8908b88..e0a8dba 100644
--- a/src/core/copysourcefile.h
+++ b/src/core/copysourcefile.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYSOURCEFILE__H)
+#if !defined(KPMCORE_COPYSOURCEFILE_H)
 
-#define COPYSOURCEFILE__H
+#define KPMCORE_COPYSOURCEFILE_H
 
 #include "core/copysource.h"
 
diff --git a/src/core/copysourceshred.h b/src/core/copysourceshred.h
index 485bf6f..b66b1fa 100644
--- a/src/core/copysourceshred.h
+++ b/src/core/copysourceshred.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYSOURCESHRED__H)
+#if !defined(KPMCORE_COPYSOURCESHRED_H)
 
-#define COPYSOURCESHRED__H
+#define KPMCORE_COPYSOURCESHRED_H
 
 #include "core/copysource.h"
 
diff --git a/src/core/copytarget.h b/src/core/copytarget.h
index a32573e..5c3cd98 100644
--- a/src/core/copytarget.h
+++ b/src/core/copytarget.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYTARGET__H)
+#if !defined(KPMCORE_COPYTARGET_H)
 
-#define COPYTARGET__H
+#define KPMCORE_COPYTARGET_H
 
 #include <QtGlobal>
 
diff --git a/src/core/copytargetdevice.h b/src/core/copytargetdevice.h
index 88ba492..8042f3c 100644
--- a/src/core/copytargetdevice.h
+++ b/src/core/copytargetdevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYTARGETDEVICE__H)
+#if !defined(KPMCORE_COPYTARGETDEVICE_H)
 
-#define COPYTARGETDEVICE__H
+#define KPMCORE_COPYTARGETDEVICE_H
 
 #include "core/copytarget.h"
 #include "util/libpartitionmanagerexport.h"
diff --git a/src/core/copytargetfile.h b/src/core/copytargetfile.h
index c4fb06b..4a25f7c 100644
--- a/src/core/copytargetfile.h
+++ b/src/core/copytargetfile.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYTARGETFILE__H)
+#if !defined(KPMCORE_COPYTARGETFILE_H)
 
-#define COPYTARGETFILE__H
+#define KPMCORE_COPYTARGETFILE_H
 
 #include "core/copytarget.h"
 
diff --git a/src/core/device.h b/src/core/device.h
index 3fdf0ac..9553361 100644
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DEVICE__H)
+#if !defined(KPMCORE_DEVICE_H)
 
-#define DEVICE__H
+#define KPMCORE_DEVICE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/devicescanner.h b/src/core/devicescanner.h
index 0eb00e3..b7d5ece 100644
--- a/src/core/devicescanner.h
+++ b/src/core/devicescanner.h
@@ -15,8 +15,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#ifndef DEVICESCANNER_H
-#define DEVICESCANNER_H
+#ifndef KPMCORE_DEVICESCANNER_H
+#define KPMCORE_DEVICESCANNER_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/diskdevice.h b/src/core/diskdevice.h
index 4a87679..cd5002d 100644
--- a/src/core/diskdevice.h
+++ b/src/core/diskdevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DISKDEVICE__H)
+#if !defined(KPMCORE_DISKDEVICE_H)
 
-#define DISKDEVICE__H
+#define KPMCORE_DISKDEVICE_H
 
 #include "util/libpartitionmanagerexport.h"
 #include "core/device.h"
diff --git a/src/core/lvmdevice.h b/src/core/lvmdevice.h
index 87e0c98..5ff69ec 100644
--- a/src/core/lvmdevice.h
+++ b/src/core/lvmdevice.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LVMDEVICE__H)
+#if !defined(KPMCORE_LVMDEVICE_H)
 
-#define LVMDEVICE__H
+#define KPMCORE_LVMDEVICE_H
 
 #include "core/device.h"
 #include "core/volumemanagerdevice.h"
diff --git a/src/core/mountentry.h b/src/core/mountentry.h
index 9a301c7..1d9018c 100644
--- a/src/core/mountentry.h
+++ b/src/core/mountentry.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(MOUNTENTRY__H)
+#if !defined(KPMCORE_MOUNTENTRY_H)
 
-#define MOUNTENTRY__H
+#define KPMCORE_MOUNTENTRY_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/operationrunner.h b/src/core/operationrunner.h
index 6de7742..06aee79 100644
--- a/src/core/operationrunner.h
+++ b/src/core/operationrunner.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(OPERATIONRUNNER__H)
+#if !defined(KPMCORE_OPERATIONRUNNER_H)
 
-#define OPERATIONRUNNER__H
+#define KPMCORE_OPERATIONRUNNER_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/operationstack.h b/src/core/operationstack.h
index 2a8d098..ccf2897 100644
--- a/src/core/operationstack.h
+++ b/src/core/operationstack.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(OPERATIONSTACK__H)
+#if !defined(KPMCORE_OPERATIONSTACK_H)
 
-#define OPERATIONSTACK__H
+#define KPMCORE_OPERATIONSTACK_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/partition.h b/src/core/partition.h
index 239dd6e..95469aa 100644
--- a/src/core/partition.h
+++ b/src/core/partition.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTITION__H)
+#if !defined(KPMCORE_PARTITION_H)
 
-#define PARTITION__H
+#define KPMCORE_PARTITION_H
 
 #include "core/partitionnode.h"
 #include "core/partitionrole.h"
diff --git a/src/core/partitionalignment.h b/src/core/partitionalignment.h
index 1e6f013..918a471 100644
--- a/src/core/partitionalignment.h
+++ b/src/core/partitionalignment.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTITIONALIGNMENT__H)
+#if !defined(KPMCORE_PARTITIONALIGNMENT_H)
 
-#define PARTITIONALIGNMENT__H
+#define KPMCORE_PARTITIONALIGNMENT_H
 
 #include "QtGlobal"
 
diff --git a/src/core/partitionnode.h b/src/core/partitionnode.h
index 00d5d25..220388a 100644
--- a/src/core/partitionnode.h
+++ b/src/core/partitionnode.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTITIONNODE__H)
+#if !defined(KPMCORE_PARTITIONNODE_H)
 
-#define PARTITIONNODE__H
+#define KPMCORE_PARTITIONNODE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/partitionrole.h b/src/core/partitionrole.h
index 26df5f1..a979a32 100644
--- a/src/core/partitionrole.h
+++ b/src/core/partitionrole.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTITIONROLE__H)
+#if !defined(KPMCORE_PARTITIONROLE_H)
 
-#define PARTITIONROLE__H
+#define KPMCORE_PARTITIONROLE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h
index 253cc44..0c92d3f 100644
--- a/src/core/partitiontable.h
+++ b/src/core/partitiontable.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTITIONTABLE__H)
+#if !defined(KPMCORE_PARTITIONTABLE_H)
 
-#define PARTITIONTABLE__H
+#define KPMCORE_PARTITIONTABLE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/smartattribute.h b/src/core/smartattribute.h
index 8b6b692..226e6eb 100644
--- a/src/core/smartattribute.h
+++ b/src/core/smartattribute.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SMARTATTRIBUTE__H)
+#if !defined(KPMCORE_SMARTATTRIBUTE_H)
 
-#define SMARTATTRIBUTE__H
+#define KPMCORE_SMARTATTRIBUTE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/core/smartstatus.h b/src/core/smartstatus.h
index 7913328..29e44dd 100644
--- a/src/core/smartstatus.h
+++ b/src/core/smartstatus.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SMARTSTATUS__H)
+#if !defined(KPMCORE_SMARTSTATUS_H)
 
-#define SMARTSTATUS__H
+#define KPMCORE_SMARTSTATUS_H
 
 #include "util/libpartitionmanagerexport.h"
 #include "core/smartattribute.h"
diff --git a/src/core/volumemanagerdevice.h b/src/core/volumemanagerdevice.h
index fad70da..e4e43b0 100644
--- a/src/core/volumemanagerdevice.h
+++ b/src/core/volumemanagerdevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(VOLUMEMANAGERDEVICE__H)
+#if !defined(KPMCORE_VOLUMEMANAGERDEVICE_H)
 
-#define VOLUMEMANAGERDEVICE__H
+#define KPMCORE_VOLUMEMANAGERDEVICE_H
 
 #include "util/libpartitionmanagerexport.h"
 #include "core/device.h"
diff --git a/src/fs/btrfs.h b/src/fs/btrfs.h
index 9603676..d097f20 100644
--- a/src/fs/btrfs.h
+++ b/src/fs/btrfs.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(BTRFS__H)
+#if !defined(KPMCORE_BTRFS_H)
 
-#define BTRFS__H
+#define KPMCORE_BTRFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/exfat.h b/src/fs/exfat.h
index 53c864c..affbdb2 100644
--- a/src/fs/exfat.h
+++ b/src/fs/exfat.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(EXFAT__H)
+#if !defined(KPMCORE_EXFAT_H)
 
-#define EXFAT__H
+#define KPMCORE_EXFAT_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/ext2.h b/src/fs/ext2.h
index d26590c..acb72d0 100644
--- a/src/fs/ext2.h
+++ b/src/fs/ext2.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(EXT2__H)
+#if !defined(KPMCORE_EXT2_H)
 
-#define EXT2__H
+#define KPMCORE_EXT2_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/ext3.h b/src/fs/ext3.h
index ab25ed3..23ac4df 100644
--- a/src/fs/ext3.h
+++ b/src/fs/ext3.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(EXT3__H)
+#if !defined(KPMCORE_EXT3_H)
 
-#define EXT3__H
+#define KPMCORE_EXT3_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/ext4.h b/src/fs/ext4.h
index cd3c2a5..8050413 100644
--- a/src/fs/ext4.h
+++ b/src/fs/ext4.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(EXT4__H)
+#if !defined(KPMCORE_EXT4_H)
 
-#define EXT4__H
+#define KPMCORE_EXT4_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/extended.h b/src/fs/extended.h
index a770114..ef00a7c 100644
--- a/src/fs/extended.h
+++ b/src/fs/extended.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(EXTENDED__H)
+#if !defined(KPMCORE_EXTENDED_H)
 
-#define EXTENDED__H
+#define KPMCORE_EXTENDED_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/f2fs.h b/src/fs/f2fs.h
index 4c87aef..0669915 100644
--- a/src/fs/f2fs.h
+++ b/src/fs/f2fs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(F2FS__H)
+#if !defined(KPMCORE_F2FS_H)
 
-#define F2FS__H
+#define KPMCORE_F2FS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/fat16.h b/src/fs/fat16.h
index 31610f5..81cbf36 100644
--- a/src/fs/fat16.h
+++ b/src/fs/fat16.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(FAT16__H)
+#if !defined(KPMCORE_FAT16_H)
 
-#define FAT16__H
+#define KPMCORE_FAT16_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/fat32.h b/src/fs/fat32.h
index a54d5b8..a356bf7 100644
--- a/src/fs/fat32.h
+++ b/src/fs/fat32.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(FAT32__H)
+#if !defined(KPMCORE_FAT32_H)
 
-#define FAT32__H
+#define KPMCORE_FAT32_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/filesystem.h b/src/fs/filesystem.h
index db70dcf..f212871 100644
--- a/src/fs/filesystem.h
+++ b/src/fs/filesystem.h
@@ -17,9 +17,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(FILESYSTEM__H)
+#if !defined(KPMCORE_FILESYSTEM_H)
 
-#define FILESYSTEM__H
+#define KPMCORE_FILESYSTEM_H
 #include "util/libpartitionmanagerexport.h"
 
 #include <QColor>
diff --git a/src/fs/filesystemfactory.h b/src/fs/filesystemfactory.h
index 78431cf..185bc57 100644
--- a/src/fs/filesystemfactory.h
+++ b/src/fs/filesystemfactory.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(FILESYSTEMFACTORY__H)
+#if !defined(KPMCORE_FILESYSTEMFACTORY_H)
 
-#define FILESYSTEMFACTORY__H
+#define KPMCORE_FILESYSTEMFACTORY_H
 
 #include "fs/filesystem.h"
 
diff --git a/src/fs/hfs.h b/src/fs/hfs.h
index 0621279..ae1ac0c 100644
--- a/src/fs/hfs.h
+++ b/src/fs/hfs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(HFS__H)
+#if !defined(KPMCORE_HFS_H)
 
-#define HFS__H
+#define KPMCORE_HFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/hfsplus.h b/src/fs/hfsplus.h
index cf8df68..9980133 100644
--- a/src/fs/hfsplus.h
+++ b/src/fs/hfsplus.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(HFSPLUS__H)
+#if !defined(KPMCORE_HFSPLUS_H)
 
-#define HFSPLUS__H
+#define KPMCORE_HFSPLUS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/hpfs.h b/src/fs/hpfs.h
index c357f20..7bbb9ba 100644
--- a/src/fs/hpfs.h
+++ b/src/fs/hpfs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(HPFS__H)
+#if !defined(KPMCORE_HPFS_H)
 
-#define HPFS__H
+#define KPMCORE_HPFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/iso9660.h b/src/fs/iso9660.h
index 262cd0a..f6b2192 100644
--- a/src/fs/iso9660.h
+++ b/src/fs/iso9660.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(ISO9660__H)
+#if !defined(KPMCORE_ISO9660_H)
 
-#define ISO9660__H
+#define KPMCORE_ISO9660_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/jfs.h b/src/fs/jfs.h
index 62c861e..2468017 100644
--- a/src/fs/jfs.h
+++ b/src/fs/jfs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(JFS__H)
+#if !defined(KPMCORE_JFS_H)
 
-#define JFS__H
+#define KPMCORE_JFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/linuxswap.h b/src/fs/linuxswap.h
index 487013a..7f19303 100644
--- a/src/fs/linuxswap.h
+++ b/src/fs/linuxswap.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LINUXSWAP__H)
+#if !defined(KPMCORE_LINUXSWAP_H)
 
-#define LINUXSWAP__H
+#define KPMCORE_LINUXSWAP_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/luks.h b/src/fs/luks.h
index c5ac15e..7f9fb08 100644
--- a/src/fs/luks.h
+++ b/src/fs/luks.h
@@ -17,9 +17,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LUKS__H)
+#if !defined(KPMCORE_LUKS_H)
 
-#define LUKS__H
+#define KPMCORE_LUKS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h
index 29a71a6..e053204 100644
--- a/src/fs/lvm2_pv.h
+++ b/src/fs/lvm2_pv.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LVM2_PV__H)
+#if !defined(KPMCORE_LVM2_PV_H)
 
-#define LVM2_PV__H
+#define KPMCORE_LVM2_PV_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/nilfs2.h b/src/fs/nilfs2.h
index 55b1717..07117e9 100644
--- a/src/fs/nilfs2.h
+++ b/src/fs/nilfs2.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(NILFS2__H)
+#if !defined(KPMCORE_NILFS2_H)
 
-#define NILFS2__H
+#define KPMCORE_NILFS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/ntfs.h b/src/fs/ntfs.h
index bdc43e1..6cfc4de 100644
--- a/src/fs/ntfs.h
+++ b/src/fs/ntfs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(NTFS__H)
+#if !defined(KPMCORE_NTFS_H)
 
-#define NTFS__H
+#define KPMCORE_NTFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/ocfs2.h b/src/fs/ocfs2.h
index ef62cdb..1a86172 100644
--- a/src/fs/ocfs2.h
+++ b/src/fs/ocfs2.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(OCFS2__H)
+#if !defined(KPMCORE_OCFS2_H)
 
-#define OCFS2__H
+#define KPMCORE_OCFS2_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/reiser4.h b/src/fs/reiser4.h
index 8a46830..bf51763 100644
--- a/src/fs/reiser4.h
+++ b/src/fs/reiser4.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(REISER4__H)
+#if !defined(KPMCORE_REISER4_H)
 
-#define REISER4__H
+#define KPMCORE_REISER4_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/reiserfs.h b/src/fs/reiserfs.h
index ef31379..cfcfdb2 100644
--- a/src/fs/reiserfs.h
+++ b/src/fs/reiserfs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(REISERFS__H)
+#if !defined(KPMCORE_REISERFS_H)
 
-#define REISERFS__H
+#define KPMCORE_REISERFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/udf.h b/src/fs/udf.h
index 179f849..e144fe7 100644
--- a/src/fs/udf.h
+++ b/src/fs/udf.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(UDF__H)
+#if !defined(KPMCORE_UDF_H)
 
-#define UDF__H
+#define KPMCORE_UDF_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/ufs.h b/src/fs/ufs.h
index e73073e..2c67f92 100644
--- a/src/fs/ufs.h
+++ b/src/fs/ufs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(UFS__H)
+#if !defined(KPMCORE_UFS_H)
 
-#define UFS__H
+#define KPMCORE_UFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/unformatted.h b/src/fs/unformatted.h
index 2bce61c..8c66407 100644
--- a/src/fs/unformatted.h
+++ b/src/fs/unformatted.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(UNFORMATTED__H)
+#if !defined(KPMCORE_UNFORMATTED_H)
 
-#define UNFORMATTED__H
+#define KPMCORE_UNFORMATTED_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/unknown.h b/src/fs/unknown.h
index e427834..3d20d67 100644
--- a/src/fs/unknown.h
+++ b/src/fs/unknown.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(UNKNOWN__H)
+#if !defined(KPMCORE_UNKNOWN_H)
 
-#define UNKNOWN__H
+#define KPMCORE_UNKNOWN_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/xfs.h b/src/fs/xfs.h
index b2d6487..cd5720a 100644
--- a/src/fs/xfs.h
+++ b/src/fs/xfs.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(XFS__H)
+#if !defined(KPMCORE_XFS_H)
 
-#define XFS__H
+#define KPMCORE_XFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/fs/zfs.h b/src/fs/zfs.h
index 73e443e..c87f971 100644
--- a/src/fs/zfs.h
+++ b/src/fs/zfs.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(ZFS__H)
+#if !defined(KPMCORE_ZFS_H)
 
-#define ZFS__H
+#define KPMCORE_ZFS_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/gui/partresizerwidget.h b/src/gui/partresizerwidget.h
index fc8e2b0..7265ae6 100644
--- a/src/gui/partresizerwidget.h
+++ b/src/gui/partresizerwidget.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTRESIZERWIDGET__H)
+#if !defined(KPMCORE_PARTRESIZERWIDGET_H)
 
-#define PARTRESIZERWIDGET__H
+#define KPMCORE_PARTRESIZERWIDGET_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/gui/partwidget.h b/src/gui/partwidget.h
index 0f2a71c..ee86f2d 100644
--- a/src/gui/partwidget.h
+++ b/src/gui/partwidget.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTWIDGET__H)
+#if !defined(KPMCORE_PARTWIDGET_H)
 
-#define PARTWIDGET__H
+#define KPMCORE_PARTWIDGET_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/gui/partwidgetbase.h b/src/gui/partwidgetbase.h
index 12d548c..977b499 100644
--- a/src/gui/partwidgetbase.h
+++ b/src/gui/partwidgetbase.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(PARTWIDGETBASE__H)
+#if !defined(KPMCORE_PARTWIDGETBASE_H)
 
-#define PARTWIDGETBASE__H
+#define KPMCORE_PARTWIDGETBASE_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/jobs/backupfilesystemjob.h b/src/jobs/backupfilesystemjob.h
index 4285065..67a9c92 100644
--- a/src/jobs/backupfilesystemjob.h
+++ b/src/jobs/backupfilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(BACKUPFILESYSTEMJOB__H)
+#if !defined(KPMCORE_BACKUPFILESYSTEMJOB_H)
 
-#define BACKUPFILESYSTEMJOB__H
+#define KPMCORE_BACKUPFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/checkfilesystemjob.h b/src/jobs/checkfilesystemjob.h
index ad40693..815d88d 100644
--- a/src/jobs/checkfilesystemjob.h
+++ b/src/jobs/checkfilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CHECKFILESYSTEMJOB__H)
+#if !defined(KPMCORE_CHECKFILESYSTEMJOB_H)
 
-#define CHECKFILESYSTEMJOB__H
+#define KPMCORE_CHECKFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/copyfilesystemjob.h b/src/jobs/copyfilesystemjob.h
index f67f5e8..15fd54d 100644
--- a/src/jobs/copyfilesystemjob.h
+++ b/src/jobs/copyfilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYFILESYSTEMJOB__H)
+#if !defined(KPMCORE_COPYFILESYSTEMJOB_H)
 
-#define COPYFILESYSTEMJOB__H
+#define KPMCORE_COPYFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/createfilesystemjob.h b/src/jobs/createfilesystemjob.h
index 2fc12e4..6ad15f1 100644
--- a/src/jobs/createfilesystemjob.h
+++ b/src/jobs/createfilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEFILESYSTEMJOB__H)
+#if !defined(KPMCORE_CREATEFILESYSTEMJOB_H)
 
-#define CREATEFILESYSTEMJOB__H
+#define KPMCORE_CREATEFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/createpartitionjob.h b/src/jobs/createpartitionjob.h
index 7d81ed9..05fe5c8 100644
--- a/src/jobs/createpartitionjob.h
+++ b/src/jobs/createpartitionjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEPARTITIONJOB__H)
+#if !defined(KPMCORE_CREATEPARTITIONJOB_H)
 
-#define CREATEPARTITIONJOB__H
+#define KPMCORE_CREATEPARTITIONJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/createpartitiontablejob.h b/src/jobs/createpartitiontablejob.h
index 462b3ec..0888b1a 100644
--- a/src/jobs/createpartitiontablejob.h
+++ b/src/jobs/createpartitiontablejob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEPARTITIONTABLEJOB__H)
+#if !defined(KPMCORE_CREATEPARTITIONTABLEJOB_H)
 
-#define CREATEPARTITIONTABLEJOB__H
+#define KPMCORE_CREATEPARTITIONTABLEJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/createvolumegroupjob.h b/src/jobs/createvolumegroupjob.h
index 14dfc80..3935ce6 100644
--- a/src/jobs/createvolumegroupjob.h
+++ b/src/jobs/createvolumegroupjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEVOLUMEGROUPJOB_H)
+#if !defined(KPMCORE_CREATEVOLUMEGROUPJOB_H)
 
-#define CREATEVOLUMEGROUPJOB_H
+#define KPMCORE_CREATEVOLUMEGROUPJOB_H
 
 #include "core/partition.h"
 #include "jobs/job.h"
diff --git a/src/jobs/deactivatelogicalvolumejob.h b/src/jobs/deactivatelogicalvolumejob.h
index ac2a246..8437977 100644
--- a/src/jobs/deactivatelogicalvolumejob.h
+++ b/src/jobs/deactivatelogicalvolumejob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DEACTIVATELOGICALVOLUMEJOB_H)
+#if !defined(KPMCORE_DEACTIVATELOGICALVOLUMEJOB_H)
 
-#define DEACTIVATELOGICALVOLUMEJOB_H
+#define KPMCORE_DEACTIVATELOGICALVOLUMEJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/deactivatevolumegroupjob.h b/src/jobs/deactivatevolumegroupjob.h
index 1222a45..a7886b9 100644
--- a/src/jobs/deactivatevolumegroupjob.h
+++ b/src/jobs/deactivatevolumegroupjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DEACTIVATEVOLUMEGROUPJOB_H)
+#if !defined(KPMCORE_DEACTIVATEVOLUMEGROUPJOB_H)
 
-#define DEACTIVATEVOLUMEGROUPJOB_H
+#define KPMCORE_DEACTIVATEVOLUMEGROUPJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/deletefilesystemjob.h b/src/jobs/deletefilesystemjob.h
index 41e3afe..478a0a6 100644
--- a/src/jobs/deletefilesystemjob.h
+++ b/src/jobs/deletefilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DELETEFILESYSTEMJOB__H)
+#if !defined(KPMCORE_DELETEFILESYSTEMJOB_H)
 
-#define DELETEFILESYSTEMJOB__H
+#define KPMCORE_DELETEFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/deletepartitionjob.h b/src/jobs/deletepartitionjob.h
index 754c234..25cd83e 100644
--- a/src/jobs/deletepartitionjob.h
+++ b/src/jobs/deletepartitionjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DELETEPARTITIONJOB__H)
+#if !defined(KPMCORE_DELETEPARTITIONJOB_H)
 
-#define DELETEPARTITIONJOB__H
+#define KPMCORE_DELETEPARTITIONJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/job.h b/src/jobs/job.h
index 02ccafa..b4c46d5 100644
--- a/src/jobs/job.h
+++ b/src/jobs/job.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(JOB__H)
+#if !defined(KPMCORE_JOB_H)
 
-#define JOB__H
+#define KPMCORE_JOB_H
 
 #include "fs/filesystem.h"
 
diff --git a/src/jobs/movefilesystemjob.h b/src/jobs/movefilesystemjob.h
index 6eb6ac5..b7840cd 100644
--- a/src/jobs/movefilesystemjob.h
+++ b/src/jobs/movefilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(MOVEFILESYSTEMJOB__H)
+#if !defined(KPMCORE_MOVEFILESYSTEMJOB_H)
 
-#define MOVEFILESYSTEMJOB__H
+#define KPMCORE_MOVEFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/movephysicalvolumejob.h b/src/jobs/movephysicalvolumejob.h
index 08baa31..452e8ab 100644
--- a/src/jobs/movephysicalvolumejob.h
+++ b/src/jobs/movephysicalvolumejob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(MOVEPHYSICALVOLUMEJOB_H)
+#if !defined(KPMCORE_MOVEPHYSICALVOLUMEJOB_H)
 
-#define MOVEPHYSICALVOLUMEJOB_H
+#define KPMCORE_MOVEPHYSICALVOLUMEJOB_H
 
 #include "core/partition.h"
 #include "jobs/job.h"
diff --git a/src/jobs/removevolumegroupjob.h b/src/jobs/removevolumegroupjob.h
index a7e771e..8d065f0 100644
--- a/src/jobs/removevolumegroupjob.h
+++ b/src/jobs/removevolumegroupjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(REMOVEVOLUMEGROUPJOB_H)
+#if !defined(KPMCORE_REMOVEVOLUMEGROUPJOB_H)
 
-#define REMOVEVOLUMEGROUPJOB_H
+#define KPMCORE_REMOVEVOLUMEGROUPJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/resizefilesystemjob.h b/src/jobs/resizefilesystemjob.h
index 1afd628..2d94ea0 100644
--- a/src/jobs/resizefilesystemjob.h
+++ b/src/jobs/resizefilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(RESIZEFILESYSTEMJOB__H)
+#if !defined(KPMCORE_RESIZEFILESYSTEMJOB_H)
 
-#define RESIZEFILESYSTEMJOB__H
+#define KPMCORE_RESIZEFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/resizevolumegroupjob.h b/src/jobs/resizevolumegroupjob.h
index 757cb99..ca5f2de 100644
--- a/src/jobs/resizevolumegroupjob.h
+++ b/src/jobs/resizevolumegroupjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(RESIZEVOLUMEGROUPJOB_H)
+#if !defined(KPMCORE_RESIZEVOLUMEGROUPJOB_H)
 
-#define RESIZEVOLUMEGROUPJOB_H
+#define KPMCORE_RESIZEVOLUMEGROUPJOB_H
 
 #include "core/partition.h"
 #include "jobs/job.h"
diff --git a/src/jobs/restorefilesystemjob.h b/src/jobs/restorefilesystemjob.h
index f004a44..88104cb 100644
--- a/src/jobs/restorefilesystemjob.h
+++ b/src/jobs/restorefilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(RESTOREFILESYSTEMJOB__H)
+#if !defined(KPMCORE_RESTOREFILESYSTEMJOB_H)
 
-#define RESTOREFILESYSTEMJOB__H
+#define KPMCORE_RESTOREFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/setfilesystemlabeljob.h b/src/jobs/setfilesystemlabeljob.h
index 008f8f5..ed217ce 100644
--- a/src/jobs/setfilesystemlabeljob.h
+++ b/src/jobs/setfilesystemlabeljob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SETFILESYSTEMLABELJOB__H)
+#if !defined(KPMCORE_SETFILESYSTEMLABELJOB_H)
 
-#define SETFILESYSTEMLABELJOB__H
+#define KPMCORE_SETFILESYSTEMLABELJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/setpartflagsjob.h b/src/jobs/setpartflagsjob.h
index 0106313..e3d3aef 100644
--- a/src/jobs/setpartflagsjob.h
+++ b/src/jobs/setpartflagsjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SETPARTFLAGSJOB__H)
+#if !defined(KPMCORE_SETPARTFLAGSJOB_H)
 
-#define SETPARTFLAGSJOB__H
+#define KPMCORE_SETPARTFLAGSJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/setpartgeometryjob.h b/src/jobs/setpartgeometryjob.h
index 05d30b7..99d76ff 100644
--- a/src/jobs/setpartgeometryjob.h
+++ b/src/jobs/setpartgeometryjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SETPARTGEOMETRYJOB__H)
+#if !defined(KPMCORE_SETPARTGEOMETRYJOB_H)
 
-#define SETPARTGEOMETRYJOB__H
+#define KPMCORE_SETPARTGEOMETRYJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/jobs/shredfilesystemjob.h b/src/jobs/shredfilesystemjob.h
index c28c792..cb0e542 100644
--- a/src/jobs/shredfilesystemjob.h
+++ b/src/jobs/shredfilesystemjob.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SHREDFILESYSTEMJOB__H)
+#if !defined(KPMCORE_SHREDFILESYSTEMJOB_H)
 
-#define SHREDFILESYSTEMJOB__H
+#define KPMCORE_SHREDFILESYSTEMJOB_H
 
 #include "jobs/job.h"
 
diff --git a/src/ops/backupoperation.h b/src/ops/backupoperation.h
index cade4e3..9f3002d 100644
--- a/src/ops/backupoperation.h
+++ b/src/ops/backupoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(BACKUPOPERATION__H)
+#if !defined(KPMCORE_BACKUPOPERATION_H)
 
-#define BACKUPOPERATION__H
+#define KPMCORE_BACKUPOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/checkoperation.h b/src/ops/checkoperation.h
index 4c491c5..05c4da4 100644
--- a/src/ops/checkoperation.h
+++ b/src/ops/checkoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CHECKOPERATION__H)
+#if !defined(KPMCORE_CHECKOPERATION_H)
 
-#define CHECKOPERATION__H
+#define KPMCORE_CHECKOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/copyoperation.h b/src/ops/copyoperation.h
index ab98a6b..1bb04a6 100644
--- a/src/ops/copyoperation.h
+++ b/src/ops/copyoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(COPYOPERATION__H)
+#if !defined(KPMCORE_COPYOPERATION_H)
 
-#define COPYOPERATION__H
+#define KPMCORE_COPYOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/createfilesystemoperation.h b/src/ops/createfilesystemoperation.h
index c162d18..1efb876 100644
--- a/src/ops/createfilesystemoperation.h
+++ b/src/ops/createfilesystemoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEFILESYSTEMOPERATION__H)
+#if !defined(KPMCORE_CREATEFILESYSTEMOPERATION_H)
 
-#define CREATEFILESYSTEMOPERATION__H
+#define KPMCORE_CREATEFILESYSTEMOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/createpartitiontableoperation.h b/src/ops/createpartitiontableoperation.h
index c5f422b..9306d92 100644
--- a/src/ops/createpartitiontableoperation.h
+++ b/src/ops/createpartitiontableoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEPARTITIONTABLEOPERATION__H)
+#if !defined(KPMCORE_CREATEPARTITIONTABLEOPERATION_H)
 
-#define CREATEPARTITIONTABLEOPERATION__H
+#define KPMCORE_CREATEPARTITIONTABLEOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/createvolumegroupoperation.h b/src/ops/createvolumegroupoperation.h
index 4d23f02..c75c45c 100644
--- a/src/ops/createvolumegroupoperation.h
+++ b/src/ops/createvolumegroupoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CREATEVOLUMEGROUPOPERATION_H)
+#if !defined(KPMCORE_CREATEVOLUMEGROUPOPERATION_H)
 
-#define CREATEVOLUMEGROUPOPERATION_H
+#define KPMCORE_CREATEVOLUMEGROUPOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/deactivatevolumegroupoperation.h b/src/ops/deactivatevolumegroupoperation.h
index 8f7acdb..e0b2b00 100644
--- a/src/ops/deactivatevolumegroupoperation.h
+++ b/src/ops/deactivatevolumegroupoperation.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DEACTIVATEVOLUMEGROUPOPERATION_H)
+#if !defined(KPMCORE_DEACTIVATEVOLUMEGROUPOPERATION_H)
 
-#define DEACTIVATEVOLUMEGROUPOPERATION_H
+#define KPMCORE_DEACTIVATEVOLUMEGROUPOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/deleteoperation.h b/src/ops/deleteoperation.h
index 611e682..0796840 100644
--- a/src/ops/deleteoperation.h
+++ b/src/ops/deleteoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DELETEOPERATION__H)
+#if !defined(KPMCORE_DELETEOPERATION_H)
 
-#define DELETEOPERATION__H
+#define KPMCORE_DELETEOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/newoperation.h b/src/ops/newoperation.h
index 16c8e3a..36e9d2b 100644
--- a/src/ops/newoperation.h
+++ b/src/ops/newoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(NEWOPERATION__H)
+#if !defined(KPMCORE_NEWOPERATION_H)
 
-#define NEWOPERATION__H
+#define KPMCORE_NEWOPERATION_H
 
 #include "fs/filesystem.h"
 #include "ops/operation.h"
diff --git a/src/ops/operation.h b/src/ops/operation.h
index 29f71ed..0f1d7c1 100644
--- a/src/ops/operation.h
+++ b/src/ops/operation.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(OPERATION__H)
+#if !defined(KPMCORE_OPERATION_H)
 
-#define OPERATION__H
+#define KPMCORE_OPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/removevolumegroupoperation.h b/src/ops/removevolumegroupoperation.h
index c1e94f8..12e78a1 100644
--- a/src/ops/removevolumegroupoperation.h
+++ b/src/ops/removevolumegroupoperation.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(REMOVEVOLUMEGROUPOPERATION_H)
+#if !defined(KPMCORE_REMOVEVOLUMEGROUPOPERATION_H)
 
-#define REMOVEVOLUMEGROUPOPERATION_H
+#define KPMCORE_REMOVEVOLUMEGROUPOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/resizeoperation.h b/src/ops/resizeoperation.h
index 8e1976f..e620b5a 100644
--- a/src/ops/resizeoperation.h
+++ b/src/ops/resizeoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(RESIZEOPERATION__H)
+#if !defined(KPMCORE_RESIZEOPERATION_H)
 
-#define RESIZEOPERATION__H
+#define KPMCORE_RESIZEOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/resizevolumegroupoperation.h b/src/ops/resizevolumegroupoperation.h
index 1f612ec..c46364c 100644
--- a/src/ops/resizevolumegroupoperation.h
+++ b/src/ops/resizevolumegroupoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(RESIZEVOLUMEGROUPOPERATION_H)
+#if !defined(KPMCORE_RESIZEVOLUMEGROUPOPERATION_H)
 
-#define RESIZEVOLUMEGROUPOPERATION_H
+#define KPMCORE_RESIZEVOLUMEGROUPOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/restoreoperation.h b/src/ops/restoreoperation.h
index 56596a7..cf9d792 100644
--- a/src/ops/restoreoperation.h
+++ b/src/ops/restoreoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(RESTOREOPERATION__H)
+#if !defined(KPMCORE_RESTOREOPERATION_H)
 
-#define RESTOREOPERATION__H
+#define KPMCORE_RESTOREOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/setfilesystemlabeloperation.h b/src/ops/setfilesystemlabeloperation.h
index 54378d0..480da8f 100644
--- a/src/ops/setfilesystemlabeloperation.h
+++ b/src/ops/setfilesystemlabeloperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SETFILESYSTEMLABELOPERATION__H)
+#if !defined(KPMCORE_SETFILESYSTEMLABELOPERATION_H)
 
-#define SETFILESYSTEMLABELOPERATION__H
+#define KPMCORE_SETFILESYSTEMLABELOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/ops/setpartflagsoperation.h b/src/ops/setpartflagsoperation.h
index e4212e2..d2d024b 100644
--- a/src/ops/setpartflagsoperation.h
+++ b/src/ops/setpartflagsoperation.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(SETPARTFLAGSOPERATION__H)
+#if !defined(KPMCORE_SETPARTFLAGSOPERATION_H)
 
-#define SETPARTFLAGSOPERATION__H
+#define KPMCORE_SETPARTFLAGSOPERATION_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/plugins/dummy/dummybackend.h b/src/plugins/dummy/dummybackend.h
index 3cd1520..7024979 100644
--- a/src/plugins/dummy/dummybackend.h
+++ b/src/plugins/dummy/dummybackend.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DUMMYBACKEND__H)
+#if !defined(KPMCORE_DUMMYBACKEND_H)
 
-#define DUMMYBACKEND__H
+#define KPMCORE_DUMMYBACKEND_H
 
 #include "backend/corebackend.h"
 
diff --git a/src/plugins/dummy/dummydevice.h b/src/plugins/dummy/dummydevice.h
index 16cecae..b46b129 100644
--- a/src/plugins/dummy/dummydevice.h
+++ b/src/plugins/dummy/dummydevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DUMMYDEVICE__H)
+#if !defined(KPMCORE_DUMMYDEVICE_H)
 
-#define DUMMYDEVICE__H
+#define KPMCORE_DUMMYDEVICE_H
 
 #include "backend/corebackenddevice.h"
 
diff --git a/src/plugins/dummy/dummypartition.h b/src/plugins/dummy/dummypartition.h
index bbcbe2c..293a80b 100644
--- a/src/plugins/dummy/dummypartition.h
+++ b/src/plugins/dummy/dummypartition.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DUMMYPARTITION__H)
+#if !defined(KPMCORE_DUMMYPARTITION_H)
 
-#define DUMMYPARTITION__H
+#define KPMCORE_DUMMYPARTITION_H
 
 #include "backend/corebackendpartition.h"
 
diff --git a/src/plugins/dummy/dummypartitiontable.h b/src/plugins/dummy/dummypartitiontable.h
index b2d8772..6a3289c 100644
--- a/src/plugins/dummy/dummypartitiontable.h
+++ b/src/plugins/dummy/dummypartitiontable.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(DUMMYPARTITIONTABLE__H)
+#if !defined(KPMCORE_DUMMYPARTITIONTABLE_H)
 
-#define DUMMYPARTITIONTABLE__H
+#define KPMCORE_DUMMYPARTITIONTABLE_H
 
 #include "backend/corebackendpartitiontable.h"
 
diff --git a/src/plugins/libparted/libpartedbackend.h b/src/plugins/libparted/libpartedbackend.h
index 7337d9b..c7e2a15 100644
--- a/src/plugins/libparted/libpartedbackend.h
+++ b/src/plugins/libparted/libpartedbackend.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LIBPARTED__H)
+#if !defined(KPMCORE_LIBPARTED_H)
 
-#define LIBPARTED__H
+#define KPMCORE_LIBPARTED_H
 
 #include "backend/corebackend.h"
 
diff --git a/src/plugins/libparted/libparteddevice.h b/src/plugins/libparted/libparteddevice.h
index c7737a3..2833169 100644
--- a/src/plugins/libparted/libparteddevice.h
+++ b/src/plugins/libparted/libparteddevice.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LIBPARTEDDEVICE__H)
+#if !defined(KPMCORE_LIBPARTEDDEVICE_H)
 
-#define LIBPARTEDDEVICE__H
+#define KPMCORE_LIBPARTEDDEVICE_H
 
 #include "backend/corebackenddevice.h"
 
diff --git a/src/plugins/libparted/libpartedpartition.h b/src/plugins/libparted/libpartedpartition.h
index 1582e2e..f03cd54 100644
--- a/src/plugins/libparted/libpartedpartition.h
+++ b/src/plugins/libparted/libpartedpartition.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LIBPARTEDPARTITION__H)
+#if !defined(KPMCORE_LIBPARTEDPARTITION_H)
 
-#define LIBPARTEDPARTITION__H
+#define KPMCORE_LIBPARTEDPARTITION_H
 
 #include "backend/corebackendpartition.h"
 
diff --git a/src/plugins/libparted/libpartedpartitiontable.h b/src/plugins/libparted/libpartedpartitiontable.h
index f0aaa41..efa71b2 100644
--- a/src/plugins/libparted/libpartedpartitiontable.h
+++ b/src/plugins/libparted/libpartedpartitiontable.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(LIBPARTEDPARTITIONTABLE__H)
+#if !defined(KPMCORE_LIBPARTEDPARTITIONTABLE_H)
 
-#define LIBPARTEDPARTITIONTABLE__H
+#define KPMCORE_LIBPARTEDPARTITIONTABLE_H
 
 #include "backend/corebackendpartitiontable.h"
 
diff --git a/src/plugins/libparted/pedflags.h b/src/plugins/libparted/pedflags.h
index c9515ce..3687a18 100644
--- a/src/plugins/libparted/pedflags.h
+++ b/src/plugins/libparted/pedflags.h
@@ -16,6 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
+#ifndef KPMCORE_PEDFLAGS_H
+#define KPMCORE_PEDFLAGS_H
+
 static struct {
     PedPartitionFlag pedFlag;
     PartitionTable::Flag flag;
@@ -39,3 +42,5 @@ static struct {
     { PED_PARTITION_IRST,               PartitionTable::FlagIrst }, // Intel Rapid Start partition
     { PED_PARTITION_ESP,                PartitionTable::FlagEsp }   // EFI system
 };
+
+#endif
diff --git a/src/util/capacity.h b/src/util/capacity.h
index 80996b4..023bcfd 100644
--- a/src/util/capacity.h
+++ b/src/util/capacity.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(CAPACITY__H)
+#if !defined(KPMCORE_CAPACITY_H)
 
-#define CAPACITY__H
+#define KPMCORE_CAPACITY_H
 #include "util/libpartitionmanagerexport.h"
 
 class Partition;
diff --git a/src/util/externalcommand.h b/src/util/externalcommand.h
index 4c9c306..f9a665f 100644
--- a/src/util/externalcommand.h
+++ b/src/util/externalcommand.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(EXTERNALCOMMAND__H)
+#if !defined(KPMCORE_EXTERNALCOMMAND_H)
 
-#define EXTERNALCOMMAND__H
+#define KPMCORE_EXTERNALCOMMAND_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/util/globallog.h b/src/util/globallog.h
index 8add822..26eef60 100644
--- a/src/util/globallog.h
+++ b/src/util/globallog.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(GLOBALLOG__H)
+#if !defined(KPMCORE_GLOBALLOG_H)
 
-#define GLOBALLOG__H
+#define KPMCORE_GLOBALLOG_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/util/helpers.h b/src/util/helpers.h
index a43860d..d309f98 100644
--- a/src/util/helpers.h
+++ b/src/util/helpers.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(HELPERS__H)
+#if !defined(KPMCORE_HELPERS_H)
 
-#define HELPERS__H
+#define KPMCORE_HELPERS_H
 
 #include "core/partition.h"
 #include "fs/filesystem.h"
diff --git a/src/util/htmlreport.h b/src/util/htmlreport.h
index 3ffad3b..4b5869a 100644
--- a/src/util/htmlreport.h
+++ b/src/util/htmlreport.h
@@ -15,9 +15,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(HTMLREPORT__H)
+#if !defined(KPMCORE_HTMLREPORT_H)
 
-#define HTMLREPORT__H
+#define KPMCORE_HTMLREPORT_H
 
 #include "util/libpartitionmanagerexport.h"
 
diff --git a/src/util/libpartitionmanagerexport.h b/src/util/libpartitionmanagerexport.h
index b110632..457f0e8 100644
--- a/src/util/libpartitionmanagerexport.h
+++ b/src/util/libpartitionmanagerexport.h
@@ -17,8 +17,8 @@
 
 // #include "libpartitionmanager_export.h"
 
-#if !defined(LIBPARTITIONMANAGEREXPORT__H)
-#define LIBPARTITIONMANAGEREXPORT__H
+#if !defined(KPMCORE_LIBPARTITIONMANAGEREXPORT_H)
+#define KPMCORE_LIBPARTITIONMANAGEREXPORT_H
 
 #include <QtGlobal>
 
diff --git a/src/util/report.h b/src/util/report.h
index ae59fe9..51e89a8 100644
--- a/src/util/report.h
+++ b/src/util/report.h
@@ -16,9 +16,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
  *************************************************************************/
 
-#if !defined(REPORT__H)
+#if !defined(KPMCORE_REPORT_H)
 
-#define REPORT__H
+#define KPMCORE_REPORT_H
 
 #include "util/libpartitionmanagerexport.h"