diff --git a/headers/os/interface/PrintJob.h b/headers/os/interface/PrintJob.h
index 902de0ed59..324f101dfa 100644
--- a/headers/os/interface/PrintJob.h
+++ b/headers/os/interface/PrintJob.h
@@ -18,7 +18,7 @@ struct print_file_header {
 	off_t	first_page;
 
 	int32	_reserved[3];
-};
+} _PACKED;
 
 struct _page_header_;
 
diff --git a/src/add-ons/print/drivers/preview/PrinterDriver.cpp b/src/add-ons/print/drivers/preview/PrinterDriver.cpp
index ef2048f477..127e1db9a6 100644
--- a/src/add-ons/print/drivers/preview/PrinterDriver.cpp
+++ b/src/add-ons/print/drivers/preview/PrinterDriver.cpp
@@ -38,18 +38,6 @@ PrinterDriver::~PrinterDriver()
 }
 
 
-#ifdef B_BEOS_VERSION_DANO
-struct print_file_header {
-       int32   version;
-       int32   page_count;
-       off_t   first_page;
-       int32   _reserved_3_;
-       int32   _reserved_4_;
-       int32   _reserved_5_;
-};
-#endif
-
-
 status_t
 PrinterDriver::PrintJob(BFile *spoolFile, BMessage *jobMsg)
 {
diff --git a/src/kits/interface/PrintJob.cpp b/src/kits/interface/PrintJob.cpp
index 0a5ad29f7c..ed7affbf63 100644
--- a/src/kits/interface/PrintJob.cpp
+++ b/src/kits/interface/PrintJob.cpp
@@ -97,7 +97,7 @@ struct _page_header_ {
 	int32 number_of_pictures;
 	off_t next_page;
 	int32 reserved[10];
-};
+} _PACKED;
 
 
 static void
diff --git a/src/libs/print/libprint/GraphicsDriver.cpp b/src/libs/print/libprint/GraphicsDriver.cpp
index aa6994f95e..f530e21949 100644
--- a/src/libs/print/libprint/GraphicsDriver.cpp
+++ b/src/libs/print/libprint/GraphicsDriver.cpp
@@ -90,11 +90,7 @@ GraphicsDriver::_SetupData(BFile* spoolFile)
 		return true;
 	}
 
-#ifndef B_BEOS_VERSION_DANO
 	print_file_header pfh;
-#else			
-	BPrintJob::print_file_header pfh;
-#endif
 	spoolFile->Seek(0, SEEK_SET);
 	spoolFile->Read(&pfh, sizeof(pfh));
 
diff --git a/src/libs/print/libprint/PrintJobReader.cpp b/src/libs/print/libprint/PrintJobReader.cpp
index 2d0f0f5082..383b2ca1ef 100644
--- a/src/libs/print/libprint/PrintJobReader.cpp
+++ b/src/libs/print/libprint/PrintJobReader.cpp
@@ -126,11 +126,7 @@ PrintJobReader::PrintJobReader(BFile* jobFile)
 	, fNumberOfPages(-1)
 	, fPageIndex(NULL)
 {
-#ifndef B_BEOS_VERSION_DANO
 	print_file_header header;
-#else
-	BPrintJob::print_file_header header;
-#endif
 	fJobFile.Seek(0, SEEK_SET);
 	if (fJobFile.Read(&header, sizeof(header)) == sizeof(header)) {
 		if (fJobSettings.Unflatten(&fJobFile) == B_OK) {
diff --git a/src/libs/print/libprint/PrintUtils.cpp b/src/libs/print/libprint/PrintUtils.cpp
index 636d09f41f..b1fbcb84ca 100644
--- a/src/libs/print/libprint/PrintUtils.cpp
+++ b/src/libs/print/libprint/PrintUtils.cpp
@@ -130,11 +130,7 @@ AddFields(BMessage* to, const BMessage* from, const char* excludeList[],
 {
 	if (to == from)
 		return;
-#ifndef B_BEOS_VERSION_DANO
 	char* name;
-#else
-	const char* name;
-#endif
 	type_code type;
 	int32 count;
 	for (int32 i = 0; from->GetInfo(B_ANY_TYPE, i, &name, &type, &count)