diff --git a/include/CopyBlocks.h b/include/CopyBlocks.h
index 99305acc..2fe44e6f 100644
--- a/include/CopyBlocks.h
+++ b/include/CopyBlocks.h
@@ -17,8 +17,8 @@
 #ifndef GPARTED_COPYBLOCKS_H
 #define GPARTED_COPYBLOCKS_H
 
-#include "../include/OperationDetail.h"
-#include "../include/Utils.h"
+#include "OperationDetail.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <parted/parted.h>
diff --git a/include/DMRaid.h b/include/DMRaid.h
index 2f6790e6..36a4b860 100644
--- a/include/DMRaid.h
+++ b/include/DMRaid.h
@@ -26,9 +26,9 @@
 #ifndef GPARTED_DMRAID_H
 #define GPARTED_DMRAID_H
 
-#include "../include/Utils.h"
-#include "../include/Partition.h"
-#include "../include/OperationDetail.h"
+#include "Utils.h"
+#include "Partition.h"
+#include "OperationDetail.h"
 
 #include <vector>
 
diff --git a/include/Device.h b/include/Device.h
index b8ddc13d..40e4d508 100644
--- a/include/Device.h
+++ b/include/Device.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_DEVICE_H
 #define GPARTED_DEVICE_H
 
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/DialogFeatures.h b/include/DialogFeatures.h
index f7c0071e..4d72d5a9 100644
--- a/include/DialogFeatures.h
+++ b/include/DialogFeatures.h
@@ -18,7 +18,7 @@
 #ifndef GPARTED_DIALOGFEATURES_H
 #define GPARTED_DIALOGFEATURES_H
 
-#include "../include/Utils.h"
+#include "Utils.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/frame.h>
diff --git a/include/DialogManageFlags.h b/include/DialogManageFlags.h
index a7c90fd1..436cff79 100644
--- a/include/DialogManageFlags.h
+++ b/include/DialogManageFlags.h
@@ -18,7 +18,7 @@
 #ifndef GPARTED_DIALOGMANAGEFLAGS_H
 #define GPARTED_DIALOGMANAGEFLAGS_H
 
-#include "../include/Partition.h"
+#include "Partition.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/treeview.h>
diff --git a/include/Dialog_Base_Partition.h b/include/Dialog_Base_Partition.h
index 5ca0d839..f8fc819c 100644
--- a/include/Dialog_Base_Partition.h
+++ b/include/Dialog_Base_Partition.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_DIALOG_BASE_PARTITION_H
 #define GPARTED_DIALOG_BASE_PARTITION_H
 
-#include "../include/Frame_Resizer_Extended.h"
-#include "../include/Partition.h"
+#include "Frame_Resizer_Extended.h"
+#include "Partition.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
diff --git a/include/Dialog_Disklabel.h b/include/Dialog_Disklabel.h
index ca26a04d..c6a23496 100644
--- a/include/Dialog_Disklabel.h
+++ b/include/Dialog_Disklabel.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_DIALOG_DISKLABEL_H
 #define GPARTED_DIALOG_DISKLABEL_H
 
-#include "../include/Utils.h"
-#include "../include/Device.h"
+#include "Utils.h"
+#include "Device.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/button.h>
diff --git a/include/Dialog_FileSystem_Label.h b/include/Dialog_FileSystem_Label.h
index 67e5c030..094f01aa 100644
--- a/include/Dialog_FileSystem_Label.h
+++ b/include/Dialog_FileSystem_Label.h
@@ -17,8 +17,8 @@
 #ifndef GPARTED_DIALOG_FILESYSTEM_LABEL_H
 #define GPARTED_DIALOG_FILESYSTEM_LABEL_H
 
-#include "../include/Partition.h"
-#include "../include/i18n.h"
+#include "Partition.h"
+#include "i18n.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
diff --git a/include/Dialog_Partition_Copy.h b/include/Dialog_Partition_Copy.h
index 7675c1f7..31030f0a 100644
--- a/include/Dialog_Partition_Copy.h
+++ b/include/Dialog_Partition_Copy.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_DIALOG_PARTITION_COPY_H
 #define GPARTED_DIALOG_PARTITION_COPY_H
 
-#include "../include/Dialog_Base_Partition.h"
-#include "../include/Partition.h"
+#include "Dialog_Base_Partition.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/Dialog_Partition_Info.h b/include/Dialog_Partition_Info.h
index 5051539c..a9043a82 100644
--- a/include/Dialog_Partition_Info.h
+++ b/include/Dialog_Partition_Info.h
@@ -20,8 +20,8 @@
 //what kind of info would one prefer to see here?
 //my guess is, it's best to keep the amount of info minimal and wait for users requests
 
-#include "../include/Partition.h"
-#include "../include/i18n.h"
+#include "Partition.h"
+#include "i18n.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
diff --git a/include/Dialog_Partition_Name.h b/include/Dialog_Partition_Name.h
index d671fd33..31627d27 100644
--- a/include/Dialog_Partition_Name.h
+++ b/include/Dialog_Partition_Name.h
@@ -17,8 +17,8 @@
 #ifndef GPARTED_DIALOG_PARTITION_NAME_H
 #define GPARTED_DIALOG_PARTITION_NAME_H
 
-#include "../include/Partition.h"
-#include "../include/i18n.h"
+#include "Partition.h"
+#include "i18n.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
diff --git a/include/Dialog_Partition_New.h b/include/Dialog_Partition_New.h
index 7c698820..800c366d 100644
--- a/include/Dialog_Partition_New.h
+++ b/include/Dialog_Partition_New.h
@@ -18,9 +18,9 @@
 #ifndef GPARTED_DIALOG_PARTITION_NEW_H
 #define GPARTED_DIALOG_PARTITION_NEW_H
 
-#include "../include/Dialog_Base_Partition.h"
-#include "../include/Device.h"
-#include "../include/Partition.h"
+#include "Dialog_Base_Partition.h"
+#include "Device.h"
+#include "Partition.h"
 
 #include <gtkmm/optionmenu.h>
 
diff --git a/include/Dialog_Partition_Resize_Move.h b/include/Dialog_Partition_Resize_Move.h
index a2f163c2..5645e5bc 100644
--- a/include/Dialog_Partition_Resize_Move.h
+++ b/include/Dialog_Partition_Resize_Move.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H
 #define GPARTED_DIALOG_PARTITION_RESIZE_MOVE_H
 
-#include "../include/Dialog_Base_Partition.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Dialog_Base_Partition.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/Dialog_Progress.h b/include/Dialog_Progress.h
index a3c88e71..f2fd2c30 100644
--- a/include/Dialog_Progress.h
+++ b/include/Dialog_Progress.h
@@ -18,9 +18,9 @@
 #ifndef GPARTED_DIALOG_PROGRESS_H
 #define GPARTED_DIALOG_PROGRESS_H
 
-#include "../include/i18n.h"
-#include "../include/Utils.h"
-#include "../include/Operation.h"
+#include "i18n.h"
+#include "Utils.h"
+#include "Operation.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/progressbar.h>
diff --git a/include/Dialog_Rescue_Data.h b/include/Dialog_Rescue_Data.h
index 97425c16..fc23b6ce 100644
--- a/include/Dialog_Rescue_Data.h
+++ b/include/Dialog_Rescue_Data.h
@@ -22,9 +22,9 @@
 #ifndef GPARTED_DIALOG_RESCUE_DATA_H
 #define GPARTED_DIALOG_RESCUE_DATA_H
 
-#include "../include/Device.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Device.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/frame.h>
diff --git a/include/DrawingAreaVisualDisk.h b/include/DrawingAreaVisualDisk.h
index 9f4b41ad..7f8c34fe 100644
--- a/include/DrawingAreaVisualDisk.h
+++ b/include/DrawingAreaVisualDisk.h
@@ -17,8 +17,8 @@
 #ifndef GPARTED_DRAWINGAREAVISUALDISK_H
 #define GPARTED_DRAWINGAREAVISUALDISK_H
 
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 #include <gtkmm/drawingarea.h>
 
diff --git a/include/FS_Info.h b/include/FS_Info.h
index 1b69b625..09f57619 100644
--- a/include/FS_Info.h
+++ b/include/FS_Info.h
@@ -17,7 +17,7 @@
 #ifndef GPARTED_FS_INFO_H
 #define GPARTED_FS_INFO_H
 
-#include "../include/BlockSpecial.h"
+#include "BlockSpecial.h"
 
 #include <glibmm/ustring.h>
 #include <vector>
diff --git a/include/FileSystem.h b/include/FileSystem.h
index 4b167350..80832ba2 100644
--- a/include/FileSystem.h
+++ b/include/FileSystem.h
@@ -19,9 +19,9 @@
 #ifndef GPARTED_FILESYSTEM_H
 #define GPARTED_FILESYSTEM_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PipeCapture.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PipeCapture.h"
 
 #include <fstream>
 #include <sys/stat.h>
diff --git a/include/Frame_Resizer_Extended.h b/include/Frame_Resizer_Extended.h
index 8283bc39..96f67ec8 100644
--- a/include/Frame_Resizer_Extended.h
+++ b/include/Frame_Resizer_Extended.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_FRAME_RESIZER_EXTENDED_H
 #define GPARTED_FRAME_RESIZER_EXTENDED_H
 
-#include "../include/Frame_Resizer_Base.h"
- 
+#include "Frame_Resizer_Base.h"
+
 class Frame_Resizer_Extended : public Frame_Resizer_Base
 {
 public:
diff --git a/include/GParted_Core.h b/include/GParted_Core.h
index 73415d72..88ff7ecb 100644
--- a/include/GParted_Core.h
+++ b/include/GParted_Core.h
@@ -18,12 +18,12 @@
 #ifndef GPARTED_GPARTED_CORE_H
 #define GPARTED_GPARTED_CORE_H
 
-#include "../include/BlockSpecial.h"
-#include "../include/FileSystem.h"
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionLUKS.h"
-#include "../include/PartitionVector.h"
+#include "BlockSpecial.h"
+#include "FileSystem.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionLUKS.h"
+#include "PartitionVector.h"
 
 #include <parted/parted.h>
 #include <vector>
diff --git a/include/HBoxOperations.h b/include/HBoxOperations.h
index 6cbb0e4f..28600928 100644
--- a/include/HBoxOperations.h
+++ b/include/HBoxOperations.h
@@ -17,7 +17,7 @@
 #ifndef GPARTED_HBOXOPERATIONS_H
 #define GPARTED_HBOXOPERATIONS_H
 
-#include "../include/Operation.h"
+#include "Operation.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/liststore.h>
diff --git a/include/LUKS_Info.h b/include/LUKS_Info.h
index a9a7979f..6ac6c9d0 100644
--- a/include/LUKS_Info.h
+++ b/include/LUKS_Info.h
@@ -25,8 +25,8 @@
 #ifndef GPARTED_LUKS_INFO_H
 #define GPARTED_LUKS_INFO_H
 
-#include "../include/BlockSpecial.h"
-#include "../include/Utils.h"
+#include "BlockSpecial.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <vector>
diff --git a/include/LVM2_PV_Info.h b/include/LVM2_PV_Info.h
index 37009475..c87b7b0c 100644
--- a/include/LVM2_PV_Info.h
+++ b/include/LVM2_PV_Info.h
@@ -25,8 +25,8 @@
 #ifndef GPARTED_LVM2_PV_INFO_H
 #define GPARTED_LVM2_PV_INFO_H
 
-#include "../include/BlockSpecial.h"
-#include "../include/Utils.h"
+#include "BlockSpecial.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <vector>
diff --git a/include/Mount_Info.h b/include/Mount_Info.h
index 95ee6d8f..6ef411ed 100644
--- a/include/Mount_Info.h
+++ b/include/Mount_Info.h
@@ -24,7 +24,7 @@
 #ifndef GPARTED_MOUNT_INFO_H
 #define GPARTED_MOUNT_INFO_H
 
-#include "../include/BlockSpecial.h"
+#include "BlockSpecial.h"
 
 #include <glibmm/ustring.h>
 #include <map>
diff --git a/include/Operation.h b/include/Operation.h
index 319fdf32..f84e1333 100644
--- a/include/Operation.h
+++ b/include/Operation.h
@@ -18,10 +18,10 @@
 #ifndef GPARTED_OPERATION_H
 #define GPARTED_OPERATION_H
 
-#include "../include/Device.h"
-#include "../include/OperationDetail.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Device.h"
+#include "OperationDetail.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationChangeUUID.h b/include/OperationChangeUUID.h
index 4e4961d0..a20540ec 100644
--- a/include/OperationChangeUUID.h
+++ b/include/OperationChangeUUID.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONCHANGEUUID_H
 #define GPARTED_OPERATIONCHANGEUUID_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationCheck.h b/include/OperationCheck.h
index 336d2eab..58fd5432 100644
--- a/include/OperationCheck.h
+++ b/include/OperationCheck.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONCHECK_H
 #define GPARTED_OPERATIONCHECK_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationCopy.h b/include/OperationCopy.h
index 767a2f4b..8d8d8390 100644
--- a/include/OperationCopy.h
+++ b/include/OperationCopy.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONCOPY_H
 #define GPARTED_OPERATIONCOPY_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationCreate.h b/include/OperationCreate.h
index 75c57ecf..505ccd0f 100644
--- a/include/OperationCreate.h
+++ b/include/OperationCreate.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONCREATE_H
 #define GPARTED_OPERATIONCREATE_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationDelete.h b/include/OperationDelete.h
index 37584dfd..37ff80ae 100644
--- a/include/OperationDelete.h
+++ b/include/OperationDelete.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONDELETE_H
 #define GPARTED_OPERATIONDELETE_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationDetail.h b/include/OperationDetail.h
index 9ba78136..372b0953 100644
--- a/include/OperationDetail.h
+++ b/include/OperationDetail.h
@@ -18,7 +18,7 @@
 #ifndef GPARTED_OPERATIONDETAIL_H
 #define GPARTED_OPERATIONDETAIL_H
 
-#include "../include/ProgressBar.h"
+#include "ProgressBar.h"
 
 #include <glibmm/ustring.h>
 #include <glibmm/markup.h>
diff --git a/include/OperationFormat.h b/include/OperationFormat.h
index 8f6a22bb..ac211e62 100644
--- a/include/OperationFormat.h
+++ b/include/OperationFormat.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONFORMAT_H
 #define GPARTED_OPERATIONFORMAT_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationLabelFileSystem.h b/include/OperationLabelFileSystem.h
index 04050dcf..28e0ef18 100644
--- a/include/OperationLabelFileSystem.h
+++ b/include/OperationLabelFileSystem.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONLABELFILESYSTEM_H
 #define GPARTED_OPERATIONLABELFILESYSTEM_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationNamePartition.h b/include/OperationNamePartition.h
index 692c28ab..0aae5803 100644
--- a/include/OperationNamePartition.h
+++ b/include/OperationNamePartition.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONNAMEPARTITION_H
 #define GPARTED_OPERATIONNAMEPARTITION_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/OperationResizeMove.h b/include/OperationResizeMove.h
index 55619ecb..dbcb5c7c 100644
--- a/include/OperationResizeMove.h
+++ b/include/OperationResizeMove.h
@@ -17,9 +17,9 @@
 #ifndef GPARTED_OPERATIONRESIZEMOVE_H
 #define GPARTED_OPERATIONRESIZEMOVE_H
 
-#include "../include/Operation.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/include/Partition.h b/include/Partition.h
index bc2aabb0..20860d73 100644
--- a/include/Partition.h
+++ b/include/Partition.h
@@ -23,8 +23,8 @@
 #ifndef GPARTED_PARTITION_H
 #define GPARTED_PARTITION_H
 
-#include "../include/Utils.h"
-#include "../include/PartitionVector.h"
+#include "Utils.h"
+#include "PartitionVector.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/include/PartitionLUKS.h b/include/PartitionLUKS.h
index 11107eac..0a810b0a 100644
--- a/include/PartitionLUKS.h
+++ b/include/PartitionLUKS.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_PARTITIONLUKS_H
 #define GPARTED_PARTITIONLUKS_H
 
-#include "../include/Partition.h"
-#include "../include/Utils.h"
+#include "Partition.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/include/PartitionVector.h b/include/PartitionVector.h
index 4c65e2cc..37054d6a 100644
--- a/include/PartitionVector.h
+++ b/include/PartitionVector.h
@@ -25,7 +25,7 @@
 #ifndef GPARTED_PARTITIONVECTOR_H
 #define GPARTED_PARTITIONVECTOR_H
 
-#include "../include/Partition.h"
+#include "Partition.h"
 
 #include <cstddef>
 #include <vector>
diff --git a/include/SWRaid_Info.h b/include/SWRaid_Info.h
index 56a4a9e5..f4828347 100644
--- a/include/SWRaid_Info.h
+++ b/include/SWRaid_Info.h
@@ -24,7 +24,7 @@
 #ifndef GPARTED_SWRAID_INFO_H
 #define GPARTED_SWRAID_INFO_H
 
-#include "../include/BlockSpecial.h"
+#include "BlockSpecial.h"
 
 #include <glibmm/ustring.h>
 #include <vector>
diff --git a/include/TreeView_Detail.h b/include/TreeView_Detail.h
index fb52fc52..c7238e61 100644
--- a/include/TreeView_Detail.h
+++ b/include/TreeView_Detail.h
@@ -17,8 +17,8 @@
 #ifndef GPARTED_TREEVIEW_DETAIL_H
 #define GPARTED_TREEVIEW_DETAIL_H
 
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
diff --git a/include/Utils.h b/include/Utils.h
index e14a5279..127b0d19 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -24,7 +24,7 @@
 #ifndef GPARTED_UTILS_H
 #define GPARTED_UTILS_H
 
-#include "../include/i18n.h"
+#include "i18n.h"
 
 #include <gtkmm/label.h>
 #include <glibmm/ustring.h>
diff --git a/include/Win_GParted.h b/include/Win_GParted.h
index 13209cc6..4ec07b7a 100644
--- a/include/Win_GParted.h
+++ b/include/Win_GParted.h
@@ -18,13 +18,13 @@
 #ifndef GPARTED_WIN_GPARTED_H
 #define GPARTED_WIN_GPARTED_H
 
-#include "../include/Device.h"
-#include "../include/DrawingAreaVisualDisk.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
-#include "../include/TreeView_Detail.h"
-#include "../include/GParted_Core.h"
-#include "../include/HBoxOperations.h" 
+#include "Device.h"
+#include "DrawingAreaVisualDisk.h"
+#include "Partition.h"
+#include "PartitionVector.h"
+#include "TreeView_Detail.h"
+#include "GParted_Core.h"
+#include "HBoxOperations.h"
 
 #include <gtkmm/paned.h>
 #include <gtkmm/toolbar.h>
diff --git a/include/btrfs.h b/include/btrfs.h
index 56ee4bf2..619f8cf9 100644
--- a/include/btrfs.h
+++ b/include/btrfs.h
@@ -19,9 +19,9 @@
 #ifndef GPARTED_BTRFS_H
 #define GPARTED_BTRFS_H
 
-#include "../include/FileSystem.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "BlockSpecial.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/exfat.h b/include/exfat.h
index 8ade7092..40132993 100644
--- a/include/exfat.h
+++ b/include/exfat.h
@@ -18,7 +18,7 @@
 #ifndef GPARTED_EXFAT_H
 #define GPARTED_EXFAT_H
 
-#include "../include/FileSystem.h"
+#include "FileSystem.h"
 
 namespace GParted
 {
diff --git a/include/ext2.h b/include/ext2.h
index 69302c78..fc0a39a2 100644
--- a/include/ext2.h
+++ b/include/ext2.h
@@ -19,10 +19,10 @@
 #ifndef GPARTED_EXT2_H
 #define GPARTED_EXT2_H
 
-#include "../include/FileSystem.h"
-#include "../include/OperationDetail.h"
-#include "../include/Partition.h"
-#include "../include/Utils.h"
+#include "FileSystem.h"
+#include "OperationDetail.h"
+#include "Partition.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/include/f2fs.h b/include/f2fs.h
index 821c0c7b..a7b6cb0c 100644
--- a/include/f2fs.h
+++ b/include/f2fs.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_F2FS_H
 #define GPARTED_F2FS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/fat16.h b/include/fat16.h
index 65fbb44f..969ae73e 100644
--- a/include/fat16.h
+++ b/include/fat16.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_FAT16_H
 #define GPARTED_FAT16_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/hfs.h b/include/hfs.h
index 673e138c..c1d0051f 100644
--- a/include/hfs.h
+++ b/include/hfs.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_HFS_H
 #define GPARTED_HFS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/hfsplus.h b/include/hfsplus.h
index 42280d89..477ea9f5 100644
--- a/include/hfsplus.h
+++ b/include/hfsplus.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_HFSPLUS_H
 #define GPARTED_HFSPLUS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/jfs.h b/include/jfs.h
index f70abf2b..b0cfa863 100644
--- a/include/jfs.h
+++ b/include/jfs.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_JFS_H
 #define GPARTED_JFS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/linux_swap.h b/include/linux_swap.h
index 1db9b9b7..cdf1c09c 100644
--- a/include/linux_swap.h
+++ b/include/linux_swap.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_LINUX_SWAP_H
 #define GPARTED_LINUX_SWAP_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/luks.h b/include/luks.h
index 86e4e156..b21569ff 100644
--- a/include/luks.h
+++ b/include/luks.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_LUKS_H
 #define GPARTED_LUKS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/lvm2_pv.h b/include/lvm2_pv.h
index 5fb1a4b8..1a850ef6 100644
--- a/include/lvm2_pv.h
+++ b/include/lvm2_pv.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_LVM2_PV_H
 #define GPARTED_LVM2_PV_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/nilfs2.h b/include/nilfs2.h
index 4cf59c9f..c90f8bba 100644
--- a/include/nilfs2.h
+++ b/include/nilfs2.h
@@ -18,8 +18,8 @@
 #ifndef GPARTED_NILFS2_H
 #define GPARTED_NILFS2_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/ntfs.h b/include/ntfs.h
index 5273be9d..660480b2 100644
--- a/include/ntfs.h
+++ b/include/ntfs.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_NTFS_H
 #define GPARTED_NTFS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/reiser4.h b/include/reiser4.h
index 875cedb9..7320b465 100644
--- a/include/reiser4.h
+++ b/include/reiser4.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_REISER4_H
 #define GPARTED_REISER4_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/reiserfs.h b/include/reiserfs.h
index 4b049f0c..aadb114e 100644
--- a/include/reiserfs.h
+++ b/include/reiserfs.h
@@ -19,8 +19,8 @@
 #ifndef GPARTED_REISERFS_H
 #define GPARTED_REISERFS_H
 
-#include "../include/FileSystem.h"
-#include "../include/Partition.h"
+#include "FileSystem.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/include/ufs.h b/include/ufs.h
index a755b824..1b81f126 100644
--- a/include/ufs.h
+++ b/include/ufs.h
@@ -19,7 +19,7 @@
 #ifndef GPARTED_UFS_H
 #define GPARTED_UFS_H
 
-#include "../include/FileSystem.h"
+#include "FileSystem.h"
 
 namespace GParted
 {
diff --git a/include/xfs.h b/include/xfs.h
index 6f11cd3f..4ae0f678 100644
--- a/include/xfs.h
+++ b/include/xfs.h
@@ -19,10 +19,10 @@
 #ifndef GPARTED_XFS_H
 #define GPARTED_XFS_H
 
-#include "../include/FileSystem.h"
-#include "../include/OperationDetail.h"
-#include "../include/Partition.h"
-#include "../include/Utils.h"
+#include "FileSystem.h"
+#include "OperationDetail.h"
+#include "Partition.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/src/BlockSpecial.cc b/src/BlockSpecial.cc
index e8e11eb3..22062cf2 100644
--- a/src/BlockSpecial.cc
+++ b/src/BlockSpecial.cc
@@ -14,7 +14,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/BlockSpecial.h"
+#include "BlockSpecial.h"
 
 #include <glibmm/ustring.h>
 #include <sys/types.h>
diff --git a/src/CopyBlocks.cc b/src/CopyBlocks.cc
index f0aa0de0..2826b7b0 100644
--- a/src/CopyBlocks.cc
+++ b/src/CopyBlocks.cc
@@ -16,10 +16,10 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/CopyBlocks.h"
-#include "../include/OperationDetail.h"
-#include "../include/ProgressBar.h"
-#include "../include/Utils.h"
+#include "CopyBlocks.h"
+#include "OperationDetail.h"
+#include "ProgressBar.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <gtkmm/main.h>
diff --git a/src/DMRaid.cc b/src/DMRaid.cc
index a439826d..1b01a9af 100644
--- a/src/DMRaid.cc
+++ b/src/DMRaid.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DMRaid.h"
-#include "../include/Partition.h"
+#include "DMRaid.h"
+#include "Partition.h"
 
 #include <limits.h>
 #include <stdlib.h>		//atoi function
diff --git a/src/Device.cc b/src/Device.cc
index 8419baa9..78efcb42 100644
--- a/src/Device.cc
+++ b/src/Device.cc
@@ -14,8 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Device.h"
+
+#include "Device.h"
 
 namespace GParted
 {
diff --git a/src/DialogFeatures.cc b/src/DialogFeatures.cc
index adc379c8..58bd9d79 100644
--- a/src/DialogFeatures.cc
+++ b/src/DialogFeatures.cc
@@ -14,9 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/DialogFeatures.h" 
-#include "../include/GParted_Core.h"
+
+#include "DialogFeatures.h"
+#include "GParted_Core.h"
 
 #include <gtkmm/stock.h>
 
diff --git a/src/DialogManageFlags.cc b/src/DialogManageFlags.cc
index 2e9a39bb..26c61f1d 100644
--- a/src/DialogManageFlags.cc
+++ b/src/DialogManageFlags.cc
@@ -13,9 +13,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/DialogManageFlags.h"
-#include "../include/Partition.h"
+
+#include "DialogManageFlags.h"
+#include "Partition.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm/stock.h>
diff --git a/src/Dialog_Base_Partition.cc b/src/Dialog_Base_Partition.cc
index fc14c811..aeaae9a0 100644
--- a/src/Dialog_Base_Partition.cc
+++ b/src/Dialog_Base_Partition.cc
@@ -14,9 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Dialog_Base_Partition.h"
-#include "../include/Partition.h"
+
+#include "Dialog_Base_Partition.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_Disklabel.cc b/src/Dialog_Disklabel.cc
index abdc6000..a0c97993 100644
--- a/src/Dialog_Disklabel.cc
+++ b/src/Dialog_Disklabel.cc
@@ -14,9 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Dialog_Disklabel.h"
-#include "../include/GParted_Core.h"
+
+#include "Dialog_Disklabel.h"
+#include "GParted_Core.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_FileSystem_Label.cc b/src/Dialog_FileSystem_Label.cc
index 0b691540..ce35f597 100644
--- a/src/Dialog_FileSystem_Label.cc
+++ b/src/Dialog_FileSystem_Label.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Dialog_FileSystem_Label.h"
-#include "../include/Partition.h"
+#include "Dialog_FileSystem_Label.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_Partition_Copy.cc b/src/Dialog_Partition_Copy.cc
index dd0579bc..97eb01cc 100644
--- a/src/Dialog_Partition_Copy.cc
+++ b/src/Dialog_Partition_Copy.cc
@@ -15,10 +15,10 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Dialog_Partition_Copy.h"
-#include "../include/GParted_Core.h"
-#include "../include/Partition.h"
-#include "../include/Utils.h"
+#include "Dialog_Partition_Copy.h"
+#include "GParted_Core.h"
+#include "Partition.h"
+#include "Utils.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_Partition_Info.cc b/src/Dialog_Partition_Info.cc
index 8fb073f3..e676ee56 100644
--- a/src/Dialog_Partition_Info.cc
+++ b/src/Dialog_Partition_Info.cc
@@ -14,13 +14,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Dialog_Partition_Info.h"
-#include "../include/LVM2_PV_Info.h"
-#include "../include/Partition.h"
-#include "../include/PartitionLUKS.h"
-#include "../include/Utils.h"
-#include "../include/btrfs.h"
+
+#include "Dialog_Partition_Info.h"
+#include "LVM2_PV_Info.h"
+#include "Partition.h"
+#include "PartitionLUKS.h"
+#include "Utils.h"
+#include "btrfs.h"
 
 #include <gtk/gtk.h>
 #include <gtkmm/alignment.h>
diff --git a/src/Dialog_Partition_Name.cc b/src/Dialog_Partition_Name.cc
index 41eb4752..37cc274f 100644
--- a/src/Dialog_Partition_Name.cc
+++ b/src/Dialog_Partition_Name.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Dialog_Partition_Name.h"
-#include "../include/Partition.h"
+#include "Dialog_Partition_Name.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_Partition_New.cc b/src/Dialog_Partition_New.cc
index 5b1f6a78..c2f5401d 100644
--- a/src/Dialog_Partition_New.cc
+++ b/src/Dialog_Partition_New.cc
@@ -15,9 +15,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Dialog_Partition_New.h"
-#include "../include/GParted_Core.h"
-#include "../include/Partition.h"
+#include "Dialog_Partition_New.h"
+#include "GParted_Core.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_Partition_Resize_Move.cc b/src/Dialog_Partition_Resize_Move.cc
index 382971af..40723b11 100644
--- a/src/Dialog_Partition_Resize_Move.cc
+++ b/src/Dialog_Partition_Resize_Move.cc
@@ -14,12 +14,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Dialog_Partition_Resize_Move.h"
-#include "../include/GParted_Core.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
-#include "../include/Utils.h"
+
+#include "Dialog_Partition_Resize_Move.h"
+#include "GParted_Core.h"
+#include "Partition.h"
+#include "PartitionVector.h"
+#include "Utils.h"
 
 namespace GParted
 {
diff --git a/src/Dialog_Progress.cc b/src/Dialog_Progress.cc
index 90f1a97b..55368db1 100644
--- a/src/Dialog_Progress.cc
+++ b/src/Dialog_Progress.cc
@@ -14,10 +14,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Dialog_Progress.h"
-#include "../include/OperationDetail.h"
-#include "../include/ProgressBar.h"
+
+#include "Dialog_Progress.h"
+#include "OperationDetail.h"
+#include "ProgressBar.h"
 
 #include <gtkmm/stock.h>
 #include <gtkmm/main.h>
diff --git a/src/Dialog_Rescue_Data.cc b/src/Dialog_Rescue_Data.cc
index da87a55f..ac530207 100644
--- a/src/Dialog_Rescue_Data.cc
+++ b/src/Dialog_Rescue_Data.cc
@@ -15,9 +15,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Utils.h"
-#include "../include/Dialog_Rescue_Data.h"
-#include "../include/Partition.h"
+#include "Utils.h"
+#include "Dialog_Rescue_Data.h"
+#include "Partition.h"
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/stock.h>
diff --git a/src/DrawingAreaVisualDisk.cc b/src/DrawingAreaVisualDisk.cc
index 3c98ab15..2622ccfc 100644
--- a/src/DrawingAreaVisualDisk.cc
+++ b/src/DrawingAreaVisualDisk.cc
@@ -15,11 +15,11 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/DrawingAreaVisualDisk.h"
-#include "../include/Partition.h"
-#include "../include/PartitionLUKS.h"
-#include "../include/PartitionVector.h"
-#include "../include/Utils.h"
+#include "DrawingAreaVisualDisk.h"
+#include "Partition.h"
+#include "PartitionLUKS.h"
+#include "PartitionVector.h"
+#include "Utils.h"
 
 #define MAIN_BORDER 5
 #define BORDER 4
diff --git a/src/FS_Info.cc b/src/FS_Info.cc
index c205bca5..a7621393 100644
--- a/src/FS_Info.cc
+++ b/src/FS_Info.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/FS_Info.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Utils.h"
+#include "FS_Info.h"
+#include "BlockSpecial.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <vector>
diff --git a/src/FileSystem.cc b/src/FileSystem.cc
index fdfbdbc9..9fc6ce2e 100644
--- a/src/FileSystem.cc
+++ b/src/FileSystem.cc
@@ -13,10 +13,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/FileSystem.h"
-#include "../include/GParted_Core.h"
+
+#include "FileSystem.h"
+#include "GParted_Core.h"
 
 #include <cerrno>
 #include <iostream>
diff --git a/src/Frame_Resizer_Base.cc b/src/Frame_Resizer_Base.cc
index 5444796d..0af2b03f 100644
--- a/src/Frame_Resizer_Base.cc
+++ b/src/Frame_Resizer_Base.cc
@@ -14,8 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Frame_Resizer_Base.h"
+
+#include "Frame_Resizer_Base.h"
 
 Frame_Resizer_Base::Frame_Resizer_Base()
 {
diff --git a/src/Frame_Resizer_Extended.cc b/src/Frame_Resizer_Extended.cc
index abbd1cf1..321dc004 100644
--- a/src/Frame_Resizer_Extended.cc
+++ b/src/Frame_Resizer_Extended.cc
@@ -14,8 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Frame_Resizer_Extended.h"
+
+#include "Frame_Resizer_Extended.h"
 
 Frame_Resizer_Extended::Frame_Resizer_Extended()
 {
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index ab9af91a..b7ae4be6 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -14,41 +14,41 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Win_GParted.h"
-#include "../include/GParted_Core.h"
-#include "../include/BlockSpecial.h"
-#include "../include/DMRaid.h"
-#include "../include/FS_Info.h"
-#include "../include/LVM2_PV_Info.h"
-#include "../include/LUKS_Info.h"
-#include "../include/Mount_Info.h"
-#include "../include/Operation.h"
-#include "../include/OperationCopy.h"
-#include "../include/Partition.h"
-#include "../include/PartitionLUKS.h"
-#include "../include/PartitionVector.h"
-#include "../include/Proc_Partitions_Info.h"
-#include "../include/SWRaid_Info.h"
 
-#include "../include/btrfs.h"
-#include "../include/exfat.h"
-#include "../include/ext2.h"
-#include "../include/f2fs.h"
-#include "../include/fat16.h"
-#include "../include/linux_swap.h"
-#include "../include/lvm2_pv.h"
-#include "../include/luks.h"
-#include "../include/reiserfs.h"
-#include "../include/nilfs2.h"
-#include "../include/ntfs.h"
-#include "../include/xfs.h"
-#include "../include/jfs.h"
-#include "../include/hfs.h"
-#include "../include/hfsplus.h"
-#include "../include/reiser4.h"
-#include "../include/ufs.h"
-#include "../include/CopyBlocks.h"
+#include "Win_GParted.h"
+#include "GParted_Core.h"
+#include "CopyBlocks.h"
+#include "BlockSpecial.h"
+#include "DMRaid.h"
+#include "FS_Info.h"
+#include "LVM2_PV_Info.h"
+#include "LUKS_Info.h"
+#include "Mount_Info.h"
+#include "Operation.h"
+#include "OperationCopy.h"
+#include "Partition.h"
+#include "PartitionLUKS.h"
+#include "PartitionVector.h"
+#include "Proc_Partitions_Info.h"
+#include "SWRaid_Info.h"
+
+#include "btrfs.h"
+#include "exfat.h"
+#include "ext2.h"
+#include "f2fs.h"
+#include "fat16.h"
+#include "linux_swap.h"
+#include "lvm2_pv.h"
+#include "luks.h"
+#include "reiserfs.h"
+#include "nilfs2.h"
+#include "ntfs.h"
+#include "xfs.h"
+#include "jfs.h"
+#include "hfs.h"
+#include "hfsplus.h"
+#include "reiser4.h"
+#include "ufs.h"
 
 #include <cerrno>
 #include <cstring>
diff --git a/src/HBoxOperations.cc b/src/HBoxOperations.cc
index 1e46908c..5858ed1c 100644
--- a/src/HBoxOperations.cc
+++ b/src/HBoxOperations.cc
@@ -13,9 +13,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/HBoxOperations.h" 
- 
+
+#include "HBoxOperations.h"
+
 #include <gtkmm/stock.h>
 
 namespace GParted
diff --git a/src/LUKS_Info.cc b/src/LUKS_Info.cc
index cba7b78f..be6f7398 100644
--- a/src/LUKS_Info.cc
+++ b/src/LUKS_Info.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/LUKS_Info.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Utils.h"
+#include "LUKS_Info.h"
+#include "BlockSpecial.h"
+#include "Utils.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/LVM2_PV_Info.cc b/src/LVM2_PV_Info.cc
index 98a98b72..f0e2b694 100644
--- a/src/LVM2_PV_Info.cc
+++ b/src/LVM2_PV_Info.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/LVM2_PV_Info.h"
-#include "../include/BlockSpecial.h"
+#include "LVM2_PV_Info.h"
+#include "BlockSpecial.h"
 
 namespace GParted
 {
diff --git a/src/Makefile.am b/src/Makefile.am
index 23a0b1ee..deaa58b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
 AM_CPPFLAGS =						\
+	-I$(top_srcdir)/include				\
 	$(GTHREAD_CFLAGS) 				\
 	$(GTKMM_CFLAGS) 				\
 	-DGPARTED_DATADIR=\""$(datadir)"\"			\
diff --git a/src/Mount_Info.cc b/src/Mount_Info.cc
index c73f41ca..b26b1c2b 100644
--- a/src/Mount_Info.cc
+++ b/src/Mount_Info.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Mount_Info.h"
-#include "../include/FS_Info.h"
-#include "../include/Utils.h"
+#include "Mount_Info.h"
+#include "FS_Info.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <stdio.h>
diff --git a/src/Operation.cc b/src/Operation.cc
index 43cf895e..feb5ff76 100644
--- a/src/Operation.cc
+++ b/src/Operation.cc
@@ -15,10 +15,10 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Operation.h"
-#include "../include/GParted_Core.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Operation.h"
+#include "GParted_Core.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationChangeUUID.cc b/src/OperationChangeUUID.cc
index 8293049c..ac1f18c8 100644
--- a/src/OperationChangeUUID.cc
+++ b/src/OperationChangeUUID.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationChangeUUID.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationChangeUUID.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationCheck.cc b/src/OperationCheck.cc
index 918853d7..b92aa775 100644
--- a/src/OperationCheck.cc
+++ b/src/OperationCheck.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationCheck.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationCheck.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationCopy.cc b/src/OperationCopy.cc
index b5cc59df..f0672a12 100644
--- a/src/OperationCopy.cc
+++ b/src/OperationCopy.cc
@@ -15,9 +15,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationCopy.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationCopy.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationCreate.cc b/src/OperationCreate.cc
index 317cf46c..a659a5e0 100644
--- a/src/OperationCreate.cc
+++ b/src/OperationCreate.cc
@@ -15,11 +15,11 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationCreate.h"
-#include "../include/OperationFormat.h"
-#include "../include/OperationResizeMove.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationCreate.h"
+#include "OperationFormat.h"
+#include "OperationResizeMove.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationDelete.cc b/src/OperationDelete.cc
index 45ee2897..96387c98 100644
--- a/src/OperationDelete.cc
+++ b/src/OperationDelete.cc
@@ -15,9 +15,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationDelete.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationDelete.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationDetail.cc b/src/OperationDetail.cc
index 3b9ac8cf..aa8912d8 100644
--- a/src/OperationDetail.cc
+++ b/src/OperationDetail.cc
@@ -15,9 +15,9 @@
  */
 
 
-#include "../include/OperationDetail.h"
-#include "../include/ProgressBar.h"
-#include "../include/Utils.h"
+#include "OperationDetail.h"
+#include "ProgressBar.h"
+#include "Utils.h"
 
 namespace GParted
 {
diff --git a/src/OperationFormat.cc b/src/OperationFormat.cc
index b02eafc6..efd1d699 100644
--- a/src/OperationFormat.cc
+++ b/src/OperationFormat.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationFormat.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationFormat.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationLabelFileSystem.cc b/src/OperationLabelFileSystem.cc
index f45b1ea0..c0b2cfe7 100644
--- a/src/OperationLabelFileSystem.cc
+++ b/src/OperationLabelFileSystem.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationLabelFileSystem.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationLabelFileSystem.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationNamePartition.cc b/src/OperationNamePartition.cc
index 89ef42b4..808b82c9 100644
--- a/src/OperationNamePartition.cc
+++ b/src/OperationNamePartition.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationNamePartition.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationNamePartition.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/OperationResizeMove.cc b/src/OperationResizeMove.cc
index 6c930b7f..7c276016 100644
--- a/src/OperationResizeMove.cc
+++ b/src/OperationResizeMove.cc
@@ -15,9 +15,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/OperationResizeMove.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "OperationResizeMove.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 namespace GParted
 {
diff --git a/src/Partition.cc b/src/Partition.cc
index 17d6d3bf..93d0dbb4 100644
--- a/src/Partition.cc
+++ b/src/Partition.cc
@@ -14,8 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Partition.h"
+
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/PartitionLUKS.cc b/src/PartitionLUKS.cc
index 66b43884..83e0049a 100644
--- a/src/PartitionLUKS.cc
+++ b/src/PartitionLUKS.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/PartitionLUKS.h"
-#include "../include/Utils.h"
+#include "PartitionLUKS.h"
+#include "Utils.h"
 
 namespace GParted
 {
diff --git a/src/PartitionVector.cc b/src/PartitionVector.cc
index 19a8cb61..edc172f9 100644
--- a/src/PartitionVector.cc
+++ b/src/PartitionVector.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
+#include "Partition.h"
+#include "PartitionVector.h"
 
 #include <algorithm>
 
diff --git a/src/PipeCapture.cc b/src/PipeCapture.cc
index a19dbc97..2673f3b6 100644
--- a/src/PipeCapture.cc
+++ b/src/PipeCapture.cc
@@ -14,7 +14,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/PipeCapture.h"
+#include "PipeCapture.h"
 #include <iostream>
 
 namespace GParted {
diff --git a/src/Proc_Partitions_Info.cc b/src/Proc_Partitions_Info.cc
index ea1cd38f..f3aa77fc 100644
--- a/src/Proc_Partitions_Info.cc
+++ b/src/Proc_Partitions_Info.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Proc_Partitions_Info.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Utils.h"
+#include "Proc_Partitions_Info.h"
+#include "BlockSpecial.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <vector>
diff --git a/src/ProgressBar.cc b/src/ProgressBar.cc
index fa47fa5c..10f47f27 100644
--- a/src/ProgressBar.cc
+++ b/src/ProgressBar.cc
@@ -14,8 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/ProgressBar.h"
-#include "../include/Utils.h"
+#include "ProgressBar.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/src/SWRaid_Info.cc b/src/SWRaid_Info.cc
index 4368509d..7e7e27de 100644
--- a/src/SWRaid_Info.cc
+++ b/src/SWRaid_Info.cc
@@ -14,9 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/SWRaid_Info.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Utils.h"
+#include "SWRaid_Info.h"
+#include "BlockSpecial.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 #include <fstream>
diff --git a/src/TreeView_Detail.cc b/src/TreeView_Detail.cc
index 9f045c19..707da9db 100644
--- a/src/TreeView_Detail.cc
+++ b/src/TreeView_Detail.cc
@@ -14,11 +14,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/TreeView_Detail.h"
-#include "../include/Partition.h"
-#include "../include/PartitionLUKS.h"
-#include "../include/PartitionVector.h"
+
+#include "TreeView_Detail.h"
+#include "Partition.h"
+#include "PartitionLUKS.h"
+#include "PartitionVector.h"
 
 #include <vector>
 #include <gtkmm/cellrenderer.h>
diff --git a/src/Utils.cc b/src/Utils.cc
index 8a8da5e9..23b9a388 100644
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -15,9 +15,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../include/Utils.h"
-#include "../include/GParted_Core.h"
-#include "../include/PipeCapture.h"
+#include "Utils.h"
+#include "GParted_Core.h"
+#include "PipeCapture.h"
 
 #include <sstream>
 #include <fstream>
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 51035006..44627ac2 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -14,32 +14,32 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Win_GParted.h"
-#include "../include/Dialog_Progress.h"
-#include "../include/DialogFeatures.h" 
-#include "../include/Dialog_Disklabel.h"
-#include "../include/Dialog_Rescue_Data.h"
-#include "../include/Dialog_Partition_Resize_Move.h"
-#include "../include/Dialog_Partition_Copy.h"
-#include "../include/Dialog_Partition_New.h"
-#include "../include/Dialog_Partition_Info.h"
-#include "../include/Dialog_FileSystem_Label.h"
-#include "../include/Dialog_Partition_Name.h"
-#include "../include/DialogManageFlags.h"
-#include "../include/Mount_Info.h"
-#include "../include/OperationCopy.h"
-#include "../include/OperationCheck.h"
-#include "../include/OperationCreate.h"
-#include "../include/OperationDelete.h"
-#include "../include/OperationFormat.h"
-#include "../include/OperationResizeMove.h"
-#include "../include/OperationChangeUUID.h"
-#include "../include/OperationLabelFileSystem.h"
-#include "../include/OperationNamePartition.h"
-#include "../include/Partition.h"
-#include "../include/PartitionVector.h"
-#include "../include/LVM2_PV_Info.h"
+
+#include "Win_GParted.h"
+#include "Dialog_Progress.h"
+#include "DialogFeatures.h"
+#include "Dialog_Disklabel.h"
+#include "Dialog_Rescue_Data.h"
+#include "Dialog_Partition_Resize_Move.h"
+#include "Dialog_Partition_Copy.h"
+#include "Dialog_Partition_New.h"
+#include "Dialog_Partition_Info.h"
+#include "Dialog_FileSystem_Label.h"
+#include "Dialog_Partition_Name.h"
+#include "DialogManageFlags.h"
+#include "Mount_Info.h"
+#include "OperationCopy.h"
+#include "OperationCheck.h"
+#include "OperationCreate.h"
+#include "OperationDelete.h"
+#include "OperationFormat.h"
+#include "OperationResizeMove.h"
+#include "OperationChangeUUID.h"
+#include "OperationLabelFileSystem.h"
+#include "OperationNamePartition.h"
+#include "Partition.h"
+#include "PartitionVector.h"
+#include "LVM2_PV_Info.h"
 #include "../config.h"
 
 #include <gtkmm/aboutdialog.h>
diff --git a/src/btrfs.cc b/src/btrfs.cc
index 645a97fb..4f5e6eec 100644
--- a/src/btrfs.cc
+++ b/src/btrfs.cc
@@ -15,11 +15,10 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../include/btrfs.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Mount_Info.h"
-#include "../include/Partition.h"
+#include "btrfs.h"
+#include "BlockSpecial.h"
+#include "Mount_Info.h"
+#include "Partition.h"
 
 #include <ctype.h>
 
diff --git a/src/exfat.cc b/src/exfat.cc
index 3f589a62..ce32b880 100644
--- a/src/exfat.cc
+++ b/src/exfat.cc
@@ -14,8 +14,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../include/exfat.h"
+#include "exfat.h"
 
 namespace GParted
 {
diff --git a/src/ext2.cc b/src/ext2.cc
index 8472d74d..59b8a8cf 100644
--- a/src/ext2.cc
+++ b/src/ext2.cc
@@ -14,12 +14,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/ext2.h"
-#include "../include/OperationDetail.h"
-#include "../include/Partition.h"
-#include "../include/ProgressBar.h"
-#include "../include/Utils.h"
+
+#include "ext2.h"
+#include "OperationDetail.h"
+#include "Partition.h"
+#include "ProgressBar.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/src/f2fs.cc b/src/f2fs.cc
index e68475aa..66d7af34 100644
--- a/src/f2fs.cc
+++ b/src/f2fs.cc
@@ -14,9 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../include/f2fs.h"
-#include "../include/Partition.h"
+#include "f2fs.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/fat16.cc b/src/fat16.cc
index 8f116f01..7b3224dd 100644
--- a/src/fat16.cc
+++ b/src/fat16.cc
@@ -14,10 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/fat16.h"
-#include "../include/Partition.h"
+
+#include "fat16.h"
+#include "Partition.h"
 
 /*****
 //For some reason unknown, this works without these include statements.
diff --git a/src/hfs.cc b/src/hfs.cc
index 50237494..7c5388d8 100644
--- a/src/hfs.cc
+++ b/src/hfs.cc
@@ -14,10 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/hfs.h"
-#include "../include/Partition.h"
+
+#include "hfs.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/hfsplus.cc b/src/hfsplus.cc
index 1e690fa8..a4154ae7 100644
--- a/src/hfsplus.cc
+++ b/src/hfsplus.cc
@@ -14,10 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/hfsplus.h"
-#include "../include/Partition.h"
+
+#include "hfsplus.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/jfs.cc b/src/jfs.cc
index 12d592d3..5ee70643 100644
--- a/src/jfs.cc
+++ b/src/jfs.cc
@@ -14,10 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/jfs.h"
-#include "../include/Partition.h"
+
+#include "jfs.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/linux_swap.cc b/src/linux_swap.cc
index 17f0b59f..89ef1412 100644
--- a/src/linux_swap.cc
+++ b/src/linux_swap.cc
@@ -14,11 +14,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/linux_swap.h"
-#include "../include/BlockSpecial.h"
-#include "../include/Partition.h"
+
+#include "linux_swap.h"
+#include "BlockSpecial.h"
+#include "Partition.h"
 
 #include <cerrno>
 
diff --git a/src/luks.cc b/src/luks.cc
index d4205907..f9a1a1bd 100644
--- a/src/luks.cc
+++ b/src/luks.cc
@@ -14,10 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../include/LUKS_Info.h"
-#include "../include/Utils.h"
-#include "../include/luks.h"
+#include "LUKS_Info.h"
+#include "Utils.h"
+#include "luks.h"
 
 namespace GParted
 {
diff --git a/src/lvm2_pv.cc b/src/lvm2_pv.cc
index 5b8d9bc4..f6c87bfb 100644
--- a/src/lvm2_pv.cc
+++ b/src/lvm2_pv.cc
@@ -14,10 +14,9 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../include/LVM2_PV_Info.h"
-#include "../include/lvm2_pv.h"
-#include "../include/Partition.h"
+#include "LVM2_PV_Info.h"
+#include "lvm2_pv.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/main.cc b/src/main.cc
index 05a13b74..d3583175 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -13,12 +13,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
-#include "../include/Win_GParted.h"
+
+#include "GParted_Core.h"
+#include "Win_GParted.h"
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/main.h>
-#include "../include/GParted_Core.h"
 
 int main( int argc, char *argv[] )
 {
diff --git a/src/nilfs2.cc b/src/nilfs2.cc
index a98c8310..e628e731 100644
--- a/src/nilfs2.cc
+++ b/src/nilfs2.cc
@@ -14,9 +14,8 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include "../include/nilfs2.h"
-#include "../include/Partition.h"
+#include "nilfs2.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/ntfs.cc b/src/ntfs.cc
index b5024fe0..076d7b12 100644
--- a/src/ntfs.cc
+++ b/src/ntfs.cc
@@ -14,12 +14,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/ntfs.h"
-#include "../include/OperationDetail.h"
-#include "../include/Partition.h"
-#include "../include/Utils.h"
+
+#include "ntfs.h"
+#include "OperationDetail.h"
+#include "Partition.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>
 
diff --git a/src/reiser4.cc b/src/reiser4.cc
index f8b63287..9ed72fc9 100644
--- a/src/reiser4.cc
+++ b/src/reiser4.cc
@@ -14,10 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/reiser4.h"
-#include "../include/Partition.h"
+
+#include "reiser4.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/reiserfs.cc b/src/reiserfs.cc
index 98c95dc2..65c98c85 100644
--- a/src/reiserfs.cc
+++ b/src/reiserfs.cc
@@ -14,10 +14,9 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/reiserfs.h"
-#include "../include/Partition.h"
+
+#include "reiserfs.h"
+#include "Partition.h"
 
 namespace GParted
 {
diff --git a/src/ufs.cc b/src/ufs.cc
index 42d34b6f..5067a0f7 100644
--- a/src/ufs.cc
+++ b/src/ufs.cc
@@ -14,9 +14,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/ufs.h"
+
+#include "ufs.h"
 
 namespace GParted
 {
diff --git a/src/xfs.cc b/src/xfs.cc
index dc24f82b..8593e906 100644
--- a/src/xfs.cc
+++ b/src/xfs.cc
@@ -14,13 +14,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
- 
- 
-#include "../include/xfs.h"
-#include "../include/OperationDetail.h"
-#include "../include/Partition.h"
-#include "../include/ProgressBar.h"
-#include "../include/Utils.h"
+
+#include "xfs.h"
+#include "OperationDetail.h"
+#include "Partition.h"
+#include "ProgressBar.h"
+#include "Utils.h"
 
 #include <glibmm/ustring.h>