diff --git a/headers/private/graphics/intel_extreme/AreaKeeper.h b/headers/private/graphics/intel_extreme/AreaKeeper.h
index d604bb45cb..83861397f2 100644
--- a/headers/private/graphics/intel_extreme/AreaKeeper.h
+++ b/headers/private/graphics/intel_extreme/AreaKeeper.h
@@ -22,8 +22,9 @@ class AreaKeeper {
 
 		area_id Create(const char *name, void **_virtualAddress, uint32 spec,
 			size_t size, uint32 lock, uint32 protection);
-		area_id Map(const char *name, addr_t physicalAddress, size_t numBytes,
-			uint32 spec, uint32 protection, void **_virtualAddress);
+		area_id Map(const char *name, phys_addr_t physicalAddress,
+			size_t numBytes, uint32 spec, uint32 protection,
+			void **_virtualAddress);
 
 		status_t InitCheck() { return fArea < B_OK ? (status_t)fArea : B_OK; }
 		void Detach();
@@ -57,7 +58,7 @@ AreaKeeper::Create(const char *name, void **_virtualAddress, uint32 spec,
 
 
 area_id
-AreaKeeper::Map(const char *name, addr_t physicalAddress, size_t numBytes,
+AreaKeeper::Map(const char *name, phys_addr_t physicalAddress, size_t numBytes,
 	uint32 spec, uint32 protection, void **_virtualAddress)
 {
 	fArea = map_physical_memory(name, physicalAddress, numBytes, spec,
diff --git a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
index 77c6ff288e..5865b9edba 100644
--- a/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
+++ b/src/add-ons/kernel/busses/agp_gart/intel_gart.cpp
@@ -108,7 +108,7 @@ struct intel_info {
 	uint32		type;
 
 	uint32		*gtt_base;
-	addr_t		gtt_physical_base;
+	phys_addr_t	gtt_physical_base;
 	area_id		gtt_area;
 	size_t		gtt_entries;
 	size_t		gtt_stolen_entries;
@@ -117,7 +117,7 @@ struct intel_info {
 	area_id		registers_area;
 
 	addr_t		aperture_base;
-	addr_t		aperture_physical_base;
+	phys_addr_t	aperture_physical_base;
 	area_id		aperture_area;
 	size_t		aperture_size;
 	size_t		aperture_stolen_size;
@@ -439,7 +439,7 @@ intel_map(intel_info &info)
 	info.gtt_entries = gttSize / 4096;
 	info.gtt_stolen_entries = stolenSize / 4096;
 
-	TRACE("GTT base %lx, size %lu, entries %lu, stolen %lu\n",
+	TRACE("GTT base %" B_PRIxPHYSADDR ", size %lu, entries %lu, stolen %lu\n",
 		info.gtt_physical_base, gttSize, info.gtt_entries, stolenSize);
 
 	AreaKeeper gttMapper;
@@ -460,10 +460,12 @@ intel_map(intel_info &info)
 		"size %ld MB, GTT size %ld KB\n", (stolenSize + (1023 << 10)) >> 20,
 		info.aperture_size >> 20, gttSize >> 10);
 
-	dprintf("intel_gart: GTT base = 0x%lx\n", info.gtt_physical_base);
-	dprintf("intel_gart: MMIO base = 0x%lx\n",
+	dprintf("intel_gart: GTT base = 0x%" B_PRIxPHYSADDR "\n",
+		info.gtt_physical_base);
+	dprintf("intel_gart: MMIO base = 0x%" B_PRIx32 "\n",
 		info.display.u.h0.base_registers[mmioIndex]);
-	dprintf("intel_gart: GMR base = 0x%lx\n", info.aperture_physical_base);
+	dprintf("intel_gart: GMR base = 0x%" B_PRIxPHYSADDR "\n",
+		info.aperture_physical_base);
 
 	AreaKeeper apertureMapper;
 	info.aperture_area = apertureMapper.Map("intel graphics aperture",