diff --git a/ChangeLog b/ChangeLog
index 3052f027..bf0ec43a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-26 Bart Hakvoort <hakvoort@cvs.gnome.org>
+
+	* include/Dialog_Partition_Info.h,
+	  include/Win_GParted.h,
+	  src/Win_GParted.cc: cleanups
+
 2006-01-26 Bart Hakvoort <hakvoort@cvs.gnome.org>
 
 	* include/Partition.h: added FIXME
diff --git a/include/Dialog_Partition_Info.h b/include/Dialog_Partition_Info.h
index 01504830..bad4254d 100644
--- a/include/Dialog_Partition_Info.h
+++ b/include/Dialog_Partition_Info.h
@@ -26,14 +26,10 @@
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
-#include <gtkmm/label.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/table.h>
 
-#include <vector>
-#include <fstream>
-
 #define BORDER 8
  
 namespace GParted
@@ -46,11 +42,11 @@ public:
 	~Dialog_Partition_Info();
 
 private:
-	void init_drawingarea( ) ;
-	void Display_Info( );
+	void init_drawingarea() ;
+	void Display_Info();
 
 	//signalhandlers
-	void drawingarea_on_realize( );
+	void drawingarea_on_realize();
 	bool drawingarea_on_expose( GdkEventExpose *ev );
 
 	Partition partition ;
diff --git a/include/Win_GParted.h b/include/Win_GParted.h
index 6d324928..20ff9cb1 100644
--- a/include/Win_GParted.h
+++ b/include/Win_GParted.h
@@ -22,14 +22,8 @@
 #include "../include/VBox_VisualDisk.h"
 #include "../include/Partition.h"
 #include "../include/TreeView_Detail.h"
-#include "../include/Dialog_Partition_Info.h"
-#include "../include/Dialog_Partition_New.h"
 #include "../include/Operation.h"
-#include "../include/Dialog_Partition_Resize_Move.h"
-#include "../include/Dialog_Partition_Copy.h"
 #include "../include/GParted_Core.h"
-#include "../include/Dialog_Disklabel.h"
-#include "../include/Dialog_Filesystems.h" 
 
 #include <sigc++/class_slot.h>
 #include <gtkmm/main.h>
@@ -42,6 +36,8 @@
 #include <gtkmm/combobox.h>
 #include <gtkmm/progressbar.h>
 #include <gtkmm/scrolledwindow.h>
+#include <gtkmm/window.h>
+#include <gtkmm/table.h>
 
 #include <unistd.h> //should be included by gtkmm headers. but decided to include it anyway after getting some bugreports..
 
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 72cc1f50..e165d4ed 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -17,6 +17,12 @@
  
 #include "../include/Win_GParted.h"
 #include "../include/Dialog_Progress.h"
+#include "../include/Dialog_Filesystems.h" 
+#include "../include/Dialog_Disklabel.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 <gtkmm/aboutdialog.h>
 #include <gtkmm/messagedialog.h>