diff --git a/include/Makefile.am b/include/Makefile.am
index 661b4b8f..4db4462c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,58 +1,58 @@
 gparted_includedir = $(pkgincludedir)
 
 EXTRA_DIST = \
-	Device.h 			\
+	Copy_Blocks.h			\
+	DMRaid.h			\
+	Device.h			\
+	DialogFeatures.h		\
+	DialogManageFlags.h		\
 	Dialog_Base_Partition.h		\
-	Dialog_Disklabel.h 		\
-	Dialog_Rescue_Data.h		\
+	Dialog_Disklabel.h		\
 	Dialog_Partition_Copy.h		\
-    Dialog_Partition_Info.h		\
-    Dialog_Partition_Label.h	\
-	Dialog_Partition_New.h    	\
-	Dialog_Partition_Resize_Move.h 	\
-	Dialog_Progress.h  		\
-	DialogFeatures.h 		\
-	DialogManageFlags.h  		\
-	DrawingAreaVisualDisk.h 	\
-	DMRaid.h				\
-	FileSystem.h  			\
+	Dialog_Partition_Info.h		\
+	Dialog_Partition_Label.h	\
+	Dialog_Partition_New.h		\
+	Dialog_Partition_Resize_Move.h	\
+	Dialog_Progress.h		\
+	Dialog_Rescue_Data.h		\
+	DrawingAreaVisualDisk.h		\
+	FS_Info.h			\
+	FileSystem.h			\
 	Frame_Resizer_Base.h		\
 	Frame_Resizer_Extended.h	\
-	FS_Info.h				\
-	GParted_Core.h    		\
-	HBoxOperations.h    		\
+	GParted_Core.h			\
+	HBoxOperations.h		\
 	LVM2_PV_Info.h			\
-	Operation.h 			\
-	OperationCopy.h			\
+	Operation.h			\
+	OperationChangeUUID.h		\
 	OperationCheck.h		\
+	OperationCopy.h			\
 	OperationCreate.h		\
 	OperationDelete.h		\
 	OperationDetail.h		\
 	OperationFormat.h		\
-	OperationResizeMove.h		\
-	OperationChangeUUID.h		\
 	OperationLabelPartition.h	\
-	Partition.h  			\
-	Proc_Partitions_Info.h	\
-	TreeView_Detail.h 		\
-	Utils.h 			\
-	Win_GParted.h 			\
+	OperationResizeMove.h		\
+	Partition.h			\
+	PipeCapture.h			\
+	Proc_Partitions_Info.h		\
+	TreeView_Detail.h		\
+	Utils.h				\
+	Win_GParted.h			\
 	btrfs.h				\
 	exfat.h				\
 	ext2.h				\
 	f2fs.h				\
-	fat16.h    			\
-	hfs.h  				\
-	hfsplus.h 			\
+	fat16.h				\
+	hfs.h				\
+	hfsplus.h			\
 	i18n.h				\
-	jfs.h 				\
-	linux_swap.h 			\
+	jfs.h				\
+	linux_swap.h			\
 	lvm2_pv.h			\
 	nilfs2.h			\
-	ntfs.h  			\
-	reiser4.h   			\
-	reiserfs.h  			\
-	ufs.h  				\
-	xfs.h				\
-	PipeCapture.h			\
-	Copy_Blocks.h
+	ntfs.h				\
+	reiser4.h			\
+	reiserfs.h			\
+	ufs.h				\
+	xfs.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 138ccb79..39b76b74 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,38 +12,40 @@ AM_CXXFLAGS = -Wall
 sbin_PROGRAMS = gpartedbin
 
 gpartedbin_SOURCES = \
+	Copy_Blocks.cc			\
+	DMRaid.cc			\
 	Device.cc			\
+	DialogFeatures.cc		\
+	DialogManageFlags.cc		\
 	Dialog_Base_Partition.cc	\
-	Dialog_Disklabel.cc 		\
-	Dialog_Rescue_Data.cc		\
+	Dialog_Disklabel.cc		\
 	Dialog_Partition_Copy.cc	\
 	Dialog_Partition_Info.cc	\
 	Dialog_Partition_Label.cc	\
 	Dialog_Partition_New.cc		\
 	Dialog_Partition_Resize_Move.cc	\
 	Dialog_Progress.cc		\
-	DialogFeatures.cc		\
-	DialogManageFlags.cc		\
+	Dialog_Rescue_Data.cc		\
 	DrawingAreaVisualDisk.cc	\
-	DMRaid.cc				\
+	FS_Info.cc			\
 	FileSystem.cc			\
 	Frame_Resizer_Base.cc		\
 	Frame_Resizer_Extended.cc	\
-	FS_Info.cc				\
 	GParted_Core.cc			\
 	HBoxOperations.cc		\
 	LVM2_PV_Info.cc			\
 	Operation.cc			\
 	OperationChangeUUID.cc		\
-	OperationCopy.cc		\
 	OperationCheck.cc		\
+	OperationCopy.cc		\
 	OperationCreate.cc		\
 	OperationDelete.cc		\
 	OperationDetail.cc		\
 	OperationFormat.cc		\
-	OperationResizeMove.cc		\
 	OperationLabelPartition.cc	\
+	OperationResizeMove.cc		\
 	Partition.cc			\
+	PipeCapture.cc			\
 	Proc_Partitions_Info.cc		\
 	TreeView_Detail.cc		\
 	Utils.cc			\
@@ -61,12 +63,10 @@ gpartedbin_SOURCES = \
 	main.cc				\
 	nilfs2.cc			\
 	ntfs.cc				\
-	reiser4.cc 			\
+	reiser4.cc			\
 	reiserfs.cc			\
 	ufs.cc				\
-	xfs.cc				\
-	PipeCapture.cc			\
-	Copy_Blocks.cc
+	xfs.cc
 
 gpartedbin_LDFLAGS = -lparted