diff --git a/src/add-ons/disk_systems/gpt/GPTPartitionHandle.cpp b/src/add-ons/disk_systems/gpt/GPTPartitionHandle.cpp
index 73dfc1c3e5..9811fa66a1 100644
--- a/src/add-ons/disk_systems/gpt/GPTPartitionHandle.cpp
+++ b/src/add-ons/disk_systems/gpt/GPTPartitionHandle.cpp
@@ -18,6 +18,7 @@
 
 #include <AutoDeleter.h>
 
+#include "guid.h"
 #include "gpt_known_guids.h"
 
 
diff --git a/src/add-ons/disk_systems/gpt/GPTPartitionHandle.h b/src/add-ons/disk_systems/gpt/GPTPartitionHandle.h
index c743bd0065..23fbf14119 100644
--- a/src/add-ons/disk_systems/gpt/GPTPartitionHandle.h
+++ b/src/add-ons/disk_systems/gpt/GPTPartitionHandle.h
@@ -8,8 +8,6 @@
 
 #include <DiskSystemAddOn.h>
 
-#include "Header.h"
-
 
 class GPTPartitionHandle : public BPartitionHandle {
 public:
@@ -41,9 +39,6 @@ public:
 									const char* parameters,
 									BMutablePartition** child);
 	virtual status_t			DeleteChild(BMutablePartition* child);
-
-private:
-			EFI::Header*		fHeader;
 };
 
 
diff --git a/src/add-ons/disk_systems/gpt/Jamfile b/src/add-ons/disk_systems/gpt/Jamfile
index 6de3a29f39..c6ab3f84fb 100644
--- a/src/add-ons/disk_systems/gpt/Jamfile
+++ b/src/add-ons/disk_systems/gpt/Jamfile
@@ -3,8 +3,6 @@ SubDir HAIKU_TOP src add-ons disk_systems gpt ;
 UsePrivateHeaders interface shared storage ;
 UsePrivateSystemHeaders ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs uuid ] ;
-
 SEARCH_SOURCE
 	+= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ] ;
 
@@ -15,10 +13,5 @@ Addon <disk_system>gpt :
 	GPTDiskAddOn.cpp
 	GPTPartitionHandle.cpp
 
-	# from the kernel partitioning system add-on
-	Header.cpp
-	crc32.cpp
-	utility.cpp
-
 	: be [ TargetLibsupc++ ] libuuid_kernel.a
 ;