diff --git a/headers/private/print/libprint/SpoolMetaData.h b/headers/private/print/libprint/SpoolMetaData.h
index 71fadf4672..739b53da6f 100644
--- a/headers/private/print/libprint/SpoolMetaData.h
+++ b/headers/private/print/libprint/SpoolMetaData.h
@@ -12,6 +12,7 @@
 using namespace std;
 
 class SpoolMetaData {
+	typedef std::string string;
 private:
 	string fDescription;
 	string fMimeType;
diff --git a/src/add-ons/print/drivers/pcl6/PCL6Writer.h b/src/add-ons/print/drivers/pcl6/PCL6Writer.h
index af9c45c5d8..08f27b9f7f 100644
--- a/src/add-ons/print/drivers/pcl6/PCL6Writer.h
+++ b/src/add-ons/print/drivers/pcl6/PCL6Writer.h
@@ -13,6 +13,7 @@ class PCL6Driver;
 
 class PCL6WriterStream {
 public:
+	virtual ~PCL6WriterStream() {}
 	virtual void write(const uint8 *data, uint32 size) = 0;
 };
 
diff --git a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
index 603d965177..8859933915 100644
--- a/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/FontsWindow.cpp
@@ -268,6 +268,7 @@ class ListIterator
 	virtual bool DoItem(BListItem* item) = 0;
 public:
 	static bool DoIt(BListItem* item, void* data);
+	virtual ~ListIterator() {}
 };
 
 
diff --git a/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp b/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp
index 50cb9b0b84..fe9023879e 100644
--- a/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp
+++ b/src/add-ons/print/drivers/pdf/source/LinePathBuilder.cpp
@@ -30,6 +30,8 @@ THE SOFTWARE.
 #include <math.h>
 #include "LinePathBuilder.h"
 
+#include <math.h>
+
 static const float kNearZero   = 0.000000000001;
 static const float kMinPenSize = 0.0001;
 
diff --git a/src/add-ons/print/drivers/pdf/source/Link.h b/src/add-ons/print/drivers/pdf/source/Link.h
index 7b68be0025..5f35aaebed 100644
--- a/src/add-ons/print/drivers/pdf/source/Link.h
+++ b/src/add-ons/print/drivers/pdf/source/Link.h
@@ -58,6 +58,7 @@ private:
 	
 public:
 	Link(PDFWriter* writer, BString* utf8);
+	virtual ~Link() {}
 	void Do();
 };
 
diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp
index a327e4b3ed..50d8ff0415 100644
--- a/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp
+++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp
@@ -882,26 +882,6 @@ PDFWriter::Paint(bool stroke)
 }
 
 
-// --------------------------------------------------
-bool 
-PDFWriter::IsSame(const pattern &p1, const pattern &p2)
-{
-	char *a = (char*)p1.data;
-	char *b = (char*)p2.data;
-	return memcmp(a, b, 8) == 0;
-}
-
-
-// --------------------------------------------------
-bool 
-PDFWriter::IsSame(const rgb_color &c1, const rgb_color &c2)
-{
-	char *a = (char*)&c1;
-	char *b = (char*)&c1;
-	return memcmp(a, b, sizeof(rgb_color)) == 0;
-}
-
-
 // --------------------------------------------------
 void 
 PDFWriter::SetColor() 
diff --git a/src/add-ons/print/drivers/pdf/source/PDFWriter.h b/src/add-ons/print/drivers/pdf/source/PDFWriter.h
index e979a2ec1d..722bd9e84a 100644
--- a/src/add-ons/print/drivers/pdf/source/PDFWriter.h
+++ b/src/add-ons/print/drivers/pdf/source/PDFWriter.h
@@ -394,6 +394,26 @@ class PDFWriter : public PrinterDriver, public PictureIterator
 
 
 
+// --------------------------------------------------
+inline bool 
+PDFWriter::IsSame(const pattern &p1, const pattern &p2)
+{
+	char *a = (char*)p1.data;
+	char *b = (char*)p2.data;
+	return memcmp(a, b, 8) == 0;
+}
+
+
+// --------------------------------------------------
+inline bool 
+PDFWriter::IsSame(const rgb_color &c1, const rgb_color &c2)
+{
+	char *a = (char*)&c1;
+	char *b = (char*)&c1;
+	return memcmp(a, b, sizeof(rgb_color)) == 0;
+}
+
+
 // PDFLib C callbacks class instance redirectors
 size_t	_WriteData(PDF *p, void *data, size_t size);
 void	_ErrorHandler(PDF *p, int type, const char *msg);
diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
index 46d0422084..0a46342dff 100644
--- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
+++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp
@@ -164,7 +164,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName)
 	margin.right = page.right - margin.right;
 	margin.bottom = page.bottom - margin.bottom;
 
-	fMarginView = new MarginView(BRect(20,20,200,160), width, height,
+	fMarginView = new MarginView(BRect(20,20,200,160), (int32)width, (int32)height,
 			margin, units);
 	panel->AddChild(fMarginView);
 	
diff --git a/src/add-ons/print/drivers/preview/PageSetupWindow.cpp b/src/add-ons/print/drivers/preview/PageSetupWindow.cpp
index b961150f50..ca4e4d2235 100644
--- a/src/add-ons/print/drivers/preview/PageSetupWindow.cpp
+++ b/src/add-ons/print/drivers/preview/PageSetupWindow.cpp
@@ -152,7 +152,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName)
 		margin.Set(0, 0, 0, 0);
 	}
 
-	fMarginView = new MarginView(BRect(20,20,200,160), width, height,
+	fMarginView = new MarginView(BRect(20,20,200,160), (int32)width, (int32)height,
 			margin, units);
 	panel->AddChild(fMarginView);
 	
diff --git a/src/add-ons/print/drivers/preview/Utils.cpp b/src/add-ons/print/drivers/preview/Utils.cpp
index da631bad41..9117dea48b 100644
--- a/src/add-ons/print/drivers/preview/Utils.cpp
+++ b/src/add-ons/print/drivers/preview/Utils.cpp
@@ -32,6 +32,7 @@ THE SOFTWARE.
 
 #include <string.h>
 #include "Utils.h"
+#include <string.h>
 
 // --------------------------------------------------
 EscapeMessageFilter::EscapeMessageFilter(BWindow *window, int32 what) 
diff --git a/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp b/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp
index 86f52980a1..2971f2f977 100644
--- a/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp
+++ b/src/add-ons/print/drivers/shared/libprint/JobSetupDlg.cpp
@@ -529,7 +529,7 @@ JobSetupView::AttachedToWindow()
 	fGamma = new JSDSlider(gamma_rect, "gamma", "Gamma", new BMessage(kMsgQuality), -300, 300, B_BLOCK_THUMB);
 	
 	fGamma->SetLimitLabels("Brighter", "Darker");
-	fGamma->SetValue(100 * log(fJobData->getGamma()) / log(2.0));
+	fGamma->SetValue((int32)(100 * log(fJobData->getGamma()) / log(2.0)));
 	fGamma->SetHashMarks(B_HASH_MARKS_BOTH);
 	fGamma->SetHashMarkCount(7);
 	box->AddChild(fGamma);
diff --git a/src/add-ons/print/drivers/shared/libprint/PagesView.cpp b/src/add-ons/print/drivers/shared/libprint/PagesView.cpp
index 73a467b4a8..9f5c6f2b28 100644
--- a/src/add-ons/print/drivers/shared/libprint/PagesView.cpp
+++ b/src/add-ons/print/drivers/shared/libprint/PagesView.cpp
@@ -119,4 +119,4 @@ void PagesView::setReverse(bool reverse)
 {
 	fReverse = reverse;
 	Invalidate();
-}
\ No newline at end of file
+}
diff --git a/src/add-ons/print/drivers/shared/libprint/PrinterCap.cpp b/src/add-ons/print/drivers/shared/libprint/PrinterCap.cpp
index ff359f461a..6efeadbb71 100644
--- a/src/add-ons/print/drivers/shared/libprint/PrinterCap.cpp
+++ b/src/add-ons/print/drivers/shared/libprint/PrinterCap.cpp
@@ -33,4 +33,4 @@ const BaseCap *PrinterCap::getDefaultCap(CapID id) const
 
 int PrinterCap::getProtocolClass() const {
 	return fPrinterData->getProtocolClass();
-}
\ No newline at end of file
+}
diff --git a/src/add-ons/print/transports/ipp/HttpURLConnection.h b/src/add-ons/print/transports/ipp/HttpURLConnection.h
index 1170040fca..4c28e04ea6 100644
--- a/src/add-ons/print/transports/ipp/HttpURLConnection.h
+++ b/src/add-ons/print/transports/ipp/HttpURLConnection.h
@@ -4,8 +4,7 @@
 #ifndef __HttpURLConnection_H
 #define __HttpURLConnection_H
 
-#include <istream.h>
-#include <ostream.h>
+#include <iostream>
 
 #include <list>
 #include <string>
diff --git a/src/add-ons/print/transports/ipp/IppContent.h b/src/add-ons/print/transports/ipp/IppContent.h
index 2024fa4ac0..e6ecd851d0 100644
--- a/src/add-ons/print/transports/ipp/IppContent.h
+++ b/src/add-ons/print/transports/ipp/IppContent.h
@@ -4,8 +4,7 @@
 #ifndef __IppContent_H
 #define __IppContent_H
 
-#include <istream.h>
-#include <ostream.h>
+#include <iostream>
 #include <list>
 #include <string>
 
diff --git a/src/add-ons/print/transports/ipp/IppTransport.cpp b/src/add-ons/print/transports/ipp/IppTransport.cpp
index 3c4ae75378..0fcf29d329 100644
--- a/src/add-ons/print/transports/ipp/IppTransport.cpp
+++ b/src/add-ons/print/transports/ipp/IppTransport.cpp
@@ -141,7 +141,7 @@ ssize_t IppTransport::Write(const void *buffer, size_t size)
 {
 //	DBGMSG(("write: %d\n", size));
 
-	if (!__fs.write(buffer, size)) {
+	if (!__fs.write((const char *)buffer, size)) {
 		__error = true;
 		return 0;
 	}
diff --git a/src/add-ons/print/transports/ipp/IppURLConnection.cpp b/src/add-ons/print/transports/ipp/IppURLConnection.cpp
index 72c5ab26b7..2bcde63a88 100644
--- a/src/add-ons/print/transports/ipp/IppURLConnection.cpp
+++ b/src/add-ons/print/transports/ipp/IppURLConnection.cpp
@@ -6,7 +6,7 @@
 #else
 #	include <net/socket.h>
 #endif
-#include <ostream.h>
+#include <iostream>
 #include <string.h>
 #include <stdio.h>
 char *itoa(int i, char *buf, int unit)
diff --git a/src/add-ons/print/transports/lpr/LprTransport.cpp b/src/add-ons/print/transports/lpr/LprTransport.cpp
index 16f18411d0..97f91f83c4 100644
--- a/src/add-ons/print/transports/lpr/LprTransport.cpp
+++ b/src/add-ons/print/transports/lpr/LprTransport.cpp
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <iomanip>
-#include  "_sstream"
+#include  <sstream>
 
 #include "LpsClient.h"
 #include "LprSetupDlg.h"
diff --git a/src/add-ons/print/transports/lpr/LpsClient.cpp b/src/add-ons/print/transports/lpr/LpsClient.cpp
index b3a295ec9e..526853c46d 100644
--- a/src/add-ons/print/transports/lpr/LpsClient.cpp
+++ b/src/add-ons/print/transports/lpr/LpsClient.cpp
@@ -9,7 +9,7 @@
 #	include <net/netdb.h>
 #endif
 #include <errno.h>
-#include "_sstream"
+#include <sstream>
 
 #include <iomanip>
 #include <algorithm>
diff --git a/src/add-ons/print/transports/lpr/LpsClient.h b/src/add-ons/print/transports/lpr/LpsClient.h
index 692f5a294d..c5701a68ac 100644
--- a/src/add-ons/print/transports/lpr/LpsClient.h
+++ b/src/add-ons/print/transports/lpr/LpsClient.h
@@ -4,8 +4,7 @@
 #ifndef __LPSCLIENT_H
 #define __LPSCLIENT_H
 
-#include <istream.h>
-#include <ostream.h>
+#include <iostream>
 #include <string>
 
 #if (!__MWERKS__)
diff --git a/src/add-ons/print/transports/shared/Socket.h b/src/add-ons/print/transports/shared/Socket.h
index 08fb4a8ec5..6c8a25db16 100644
--- a/src/add-ons/print/transports/shared/Socket.h
+++ b/src/add-ons/print/transports/shared/Socket.h
@@ -4,8 +4,7 @@
 #ifndef __Socket_H
 #define __Socket_H
 
-#include <istream.h>
-#include <ostream.h>
+#include <iostream>
 
 #include <string>
 
diff --git a/src/add-ons/print/transports/shared/SocketStream.h b/src/add-ons/print/transports/shared/SocketStream.h
index 5a1d15da2e..11072f8197 100644
--- a/src/add-ons/print/transports/shared/SocketStream.h
+++ b/src/add-ons/print/transports/shared/SocketStream.h
@@ -4,9 +4,7 @@
 #ifndef __SocketStream_H
 #define __SocketStream_H
 
-#include <istream.h>
-#include <ostream.h>
-#include <streambuf.h>
+#include <iostream>
 
 class Socket;
 
diff --git a/src/add-ons/print/transports/shared/_sstream b/src/add-ons/print/transports/shared/_sstream
deleted file mode 100644
index df8172ccfc..0000000000
--- a/src/add-ons/print/transports/shared/_sstream
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * _sstream
- * Copyright 1999 Y.Takagi. All Rights Reserved.
- */
-
-#if __MWERKS__
-#include <sstream>
-#else
-
-#ifndef __SSTREAM_H
-#define __SSTREAM_H
-
-#include <strstream>
-#include <string>
-
-class ostringstream : public ostrstream {
-public:
-	ostringstream() : ostrstream() {}
-	~ostringstream() { delete [] ostrstream::str(); }
-	string str() { *this << ends; return string(ostrstream::str()); }
-};
-
-#endif	/* __SSTREAM_H */
-#endif	/* USING_STRSTREAM */