--- dicom3tools_1.00.snapshot.20100815/appsrc/acrnema/ancp.cc	2007-11-24 17:30:27.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/acrnema/ancp.cc	2010-09-30 13:04:12.628171879 -0400
@@ -1,5 +1,6 @@ 
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
+#include <cstdio>
 #include <string.h>
 #include <ctype.h>
 
@@ -12,6 +13,8 @@ 
 #include "elmdict.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 static bool
 isOtherByteOrWordVR(const char *vr)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/acrnema/ancreate.cc	2007-01-20 11:18:28.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/acrnema/ancreate.cc	2010-09-29 18:51:46.768172081 -0400
@@ -1,6 +1,6 @@ 
-#include <iostream.h>
-#include <iomanip.h>
-#include <string.h>
+#include <iostream>
+#include <iomanip>
+#include <string>
 #include <ctype.h>
 
 #include "basetype.h"
@@ -8,6 +8,8 @@ 
 #include "getoptns.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 #define INPUTLINEBUFFERLENGTH 32768
 
 // all the following is copied from dconvert/fltype.h
--- dicom3tools_1.00.snapshot.20100815/appsrc/acrnema/andump.cc	2008-05-21 08:02:24.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/acrnema/andump.cc	2010-09-29 19:17:28.402171904 -0400
@@ -1,8 +1,11 @@ 
-#include <iostream.h>
-#include <iomanip.h>
-#include <string.h>
+#include <iostream>
+#include <iomanip>
+#include <string>
+#include <cstdio>
 #include <ctype.h>
 
+using namespace std;
+
 #ifdef POWINTEGEREXPONENTTYPE
 #define	powi(m,e)	pow(m,(POWINTEGEREXPONENTTYPE)(e))
 #else
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcdirmk.cc	2010-01-30 13:00:45.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcdirmk.cc	2010-09-30 12:55:44.602173681 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 #include <ctype.h>
 
 #include "attrmxls.h"
@@ -16,6 +16,8 @@ 
 #include "mesgtext.h"
 #include "dcopt.h"
 
+using namespace std;
+
 // In a lot of places, there is an assumption that sequences and items will
 // be written delimited, ie. with undefined lengths ... this will break if
 // this changes (write() in attrseq.cc) :(
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcdtchg.cc	2007-11-10 11:06:29.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcdtchg.cc	2010-09-30 12:57:05.874171776 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 //#include <time.h>
 
 #include "attrmxls.h"
@@ -13,6 +13,8 @@ 
 
 #include "dcdtchg.h"
 
+using namespace std;
+
 class EntryString {
 	HashKeyString key;
 	const char *value;
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcentvfy.cc	2009-12-22 09:06:58.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcentvfy.cc	2010-09-29 18:52:20.168046802 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "mesgtext.h"
@@ -10,6 +10,8 @@ 
 
 #include "iodcomp.h"
 
+using namespace std;
+
 static const char *
 getStringValueElseDefault(AttributeList &list,Tag tag,const char *def)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcfile.cc	2007-03-06 14:20:19.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcfile.cc	2010-09-30 13:12:45.623047001 -0400
@@ -1,3 +1,5 @@ 
+#include <cstdio>
+
 #include "basetype.h"
 #include "mesgtext.h"
 #include "dcopt.h"
@@ -8,6 +10,8 @@ 
 #include "elmconst.h"
 #include "transynd.h"
 
+using namespace std;
+
 static bool
 isOtherByteOrWordVR(const char *vr)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcmulti.cc	2010-02-06 17:34:45.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcmulti.cc	2010-09-30 12:56:03.499172095 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 #include <ctype.h>
 
 #include "attrmxls.h"
@@ -17,6 +17,8 @@ 
 #define M_PI 3.14159265358979323846
 #endif
 
+using namespace std;
+
 static const double defaultWindowCenter = 127.5;
 static const double defaultWindowWidth = 256;
 
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcpost.cc	2009-11-14 09:31:24.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcpost.cc	2010-09-30 12:56:51.178171736 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "attrtype.h"
@@ -10,6 +10,8 @@ 
 #include "mesgtext.h"
 #include "dcopt.h"
 
+using namespace std;
+
 static Attribute *
 isValuePresentElseAbort(AttributeList &list,Tag tag,const char *label,const char *filename,TextOutputStream &log)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcrmmeta.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcrmmeta.cc	2010-09-30 13:05:00.508179217 -0400
@@ -1,5 +1,5 @@ 
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
 #include <string.h>
 #include <ctype.h>
 
@@ -11,6 +11,8 @@ 
 #include "ioopt.h"
 #include "dcopt.h"
 
+using namespace std;
+
 static void copyBytes(istream& i,ostream& o) {
 	const int bufsize=1024;
 	char buffer[1024];
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcsort.cc	2009-12-22 13:27:11.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcsort.cc	2010-09-30 12:56:36.866172460 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "attrtype.h"
@@ -14,6 +14,8 @@ 
 #define M_PI 3.14159265358979323846
 #endif
 
+using namespace std;
+
 static ElementDictionary staticDictionary;
 
 // Various functions to check and match values ...
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcsqextr.cc	2007-03-15 22:00:20.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcsqextr.cc	2010-09-30 12:54:48.066172087 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "transynu.h"
 #include "attrmxls.h"
@@ -7,6 +7,8 @@ 
 #include "mesgtext.h"
 #include "dcopt.h"
 
+using namespace std;
+
 static bool
 writeImageInSequence(Attribute *a,
 	DicomOutputOptions& dicom_output_options,
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcsrmrg.cc	2006-09-17 13:24:08.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcsrmrg.cc	2010-09-30 12:55:05.513172554 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "attrtype.h"
@@ -11,6 +11,8 @@ 
 #include "mesgtext.h"
 #include "dcopt.h"
 
+using namespace std;
+
 static ElementDictionary staticDictionary;
 
 // Define a funky derived OX class to be able to writeBase() and not activateSource() ...
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dctable.cc	2010-03-23 14:08:09.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dctable.cc	2010-09-30 12:57:20.546172062 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "attrnew.h"
@@ -9,6 +9,8 @@ 
 #include "dcstream.h"
 #include "elmconst.h"
 
+using namespace std;
+
 static const char *options_output_key[] = {
 	"key",
 	"k",
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcuidchg.cc	2007-03-15 22:00:21.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcuidchg.cc	2010-09-30 12:56:19.234046978 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "attrtype.h"
@@ -10,6 +10,8 @@ 
 #include "hash.h"
 #include "uidgen.h"
 
+using namespace std;
+
 class UIDEntryString {
 	HashKeyString key;
 	const char *value;
--- dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcuncat.cc	2010-01-31 06:46:41.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dcfile/dcuncat.cc	2010-09-30 12:55:20.217172214 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attrmxls.h"
 #include "attrtype.h"
@@ -11,6 +11,8 @@ 
 #include "uidgen.h"
 #include "sopclu.h"
 
+using namespace std;
+
 // The following are copied unchanged from dcmulti.cc
 
 // Define a funky derived OX class to be able to writeBase() and not activateSource() ...
--- dicom3tools_1.00.snapshot.20100815/appsrc/dconvert/pq/pqsplit.cc	2004-11-24 13:29:24.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/dconvert/pq/pqsplit.cc	2010-09-30 12:59:52.656047401 -0400
@@ -1,9 +1,11 @@ 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>	// for atoi()
 
+using namespace std;
+
 int
 main(int argc,char **argv)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/binpatch.cc	2004-11-24 15:32:57.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/binpatch.cc	2010-09-30 13:13:34.656172006 -0400
@@ -1,6 +1,6 @@ 
-#include <iostream.h>          // for listsimp.h
-#include <iomanip.h>           // for listsimp.h
-#include <fstream.h>
+#include <iostream>          // for listsimp.h
+#include <iomanip>           // for listsimp.h
+#include <fstream>
 #include <stdlib.h>            // for atoi()
 #include <string.h>            // for strlen()
 #include <ctype.h>             // for isdigit()
@@ -10,6 +10,8 @@ 
 #include "ioopt.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 class Patch {
 	unsigned	offset;
 	unsigned	length;
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/dcunmeta.cc	2001-11-11 09:57:49.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/dcunmeta.cc	2010-09-29 18:13:31.536172164 -0400
@@ -1,8 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 #ifndef REPLACESTANDARDIOBUFSIZE
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/dumptiff.cc	2001-11-11 09:57:49.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/dumptiff.cc	2010-09-29 18:14:12.293172422 -0400
@@ -1,10 +1,12 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "bnstream.h"
 #include "errclass.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 class TIFF_Reader : public ErrorsInClass {
 private:
 	BinaryInputStream *bin;
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/dumpwhat.cc	2006-09-17 13:24:08.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/dumpwhat.cc	2010-09-30 13:06:36.197046763 -0400
@@ -1,5 +1,6 @@ 
-#include <fstream.h>
-#include <iomanip.h>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
 #include <stdlib.h>            // for atoi()
 #include <ctype.h>
 #include <string.h>
@@ -8,6 +9,8 @@ 
 #include "ioopt.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 const unsigned 	DefaultBufferSizeIncrement	= 1024;
 const double 	ReasonableMinimumFloatToShow 	= 0.01;
 	
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/jpegdump.cc	2004-07-23 14:15:58.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/jpegdump.cc	2010-09-29 18:13:47.545046910 -0400
@@ -1,8 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "txstream.h"
 
+using namespace std;
+
 const Uint16 JPEG_MARKER_APP0 = 0xffe0;
 const Uint16 JPEG_MARKER_APP1 = 0xffe1;
 const Uint16 JPEG_MARKER_APP2 = 0xffe2;
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/jpegdump.cc.pre2000	2001-11-11 09:57:49.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/jpegdump.cc.pre2000	2010-09-29 18:13:14.928171660 -0400
@@ -1,7 +1,9 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 
+using namespace std;
+
 const Uint16 JPEG_MARKER_APP0 = 0xffe0;
 const Uint16 JPEG_MARKER_APP1 = 0xffe1;
 const Uint16 JPEG_MARKER_APP2 = 0xffe2;
--- dicom3tools_1.00.snapshot.20100815/appsrc/misc/jpegsplit.cc	2004-11-24 13:29:24.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/misc/jpegsplit.cc	2010-09-30 13:20:41.602171905 -0400
@@ -1,9 +1,12 @@ 
-#include <fstream.h>
+#include <fstream>
+#include <iostream>
 
 #include "basetype.h"
 #include "mesgtext.h"
 #include "getoptns.h"
 
+using namespace std;
+
 const Uint16 JPEG_MARKER_APP0 = 0xffe0;
 const Uint16 JPEG_MARKER_APP1 = 0xffe1;
 const Uint16 JPEG_MARKER_APP2 = 0xffe2;
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/ge9800/ge98id.cc	2006-09-17 13:24:08.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/ge9800/ge98id.cc	2010-09-29 18:59:07.243171870 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 
@@ -6,6 +6,8 @@ 
 
 #include <float.h>
 
+using namespace std;
+
 #ifdef POWINTEGEREXPONENTTYPE
 #define	powi(m,e)	pow(m,(POWINTEGEREXPONENTTYPE)(e))
 #else
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/ge9800/ge98topgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/ge9800/ge98topgm.cc	2010-09-29 18:53:18.976173380 -0400
@@ -1,7 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
+using namespace std;
+
 #ifndef PNMBIGRAW
 #define PNMBIGRAW 1
 #endif
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/genesis/gentopgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/genesis/gentopgm.cc	2010-09-29 18:53:53.120172454 -0400
@@ -1,7 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
+using namespace std;
+
 #ifndef PNMBIGRAW
 #define PNMBIGRAW 1
 #endif
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/pace/pacetopgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/pace/pacetopgm.cc	2010-09-29 18:54:15.993046873 -0400
@@ -1,7 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
+using namespace std;
+
 #ifndef PNMBIGRAW
 #define PNMBIGRAW 1
 #endif
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/signa/sgntopgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/signa/sgntopgm.cc	2010-09-29 18:54:34.257171807 -0400
@@ -1,7 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
+using namespace std;
+
 #ifndef PNMBIGRAW
 #define PNMBIGRAW 1
 #endif
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/somatom/somtopgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/somatom/somtopgm.cc	2010-09-29 18:55:13.378172392 -0400
@@ -1,4 +1,5 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
@@ -6,6 +7,8 @@ 
 #define PNMBIGRAW 1
 #endif
 
+using namespace std;
+
 static Uint16
 read16(istream& instream)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/sytec/syttopgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/sytec/syttopgm.cc	2010-09-29 18:55:34.649171956 -0400
@@ -1,4 +1,5 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
@@ -6,6 +7,8 @@ 
 #define PNMBIGRAW 1
 #endif
 
+using namespace std;
+
 static Uint16
 read16(istream& instream)
 {
--- dicom3tools_1.00.snapshot.20100815/appsrc/simple/vision/vsntopgm.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/appsrc/simple/vision/vsntopgm.cc	2010-09-29 18:55:58.610172035 -0400
@@ -1,7 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
+#include <cstdio>
 
 #include "basetype.h"
 
+using namespace std;
+
 #ifndef PNMBIGRAW
 #define PNMBIGRAW 1
 #endif
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/dconvert/planev.h	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/dconvert/planev.h	2010-09-29 18:28:33.055047079 -0400
@@ -4,8 +4,8 @@ 
 #define __Header_planev__
 
 #ifdef DEBUGPLANE
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
 #endif
 
 #include <math.h>
@@ -17,6 +17,8 @@ 
 #define	cosd(theta)	cos((theta)/180*M_PI)
 #define	sind(theta)	sin((theta)/180*M_PI)
 
+using namespace std;
+
 enum Index3D { X=0,Y,Z };
 
 class Vector3DBase {
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/dconvert/ptyhdr.h	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/dconvert/ptyhdr.h	2010-09-29 18:28:45.735046927 -0400
@@ -1,7 +1,7 @@ 
 #ifndef __Header_ptyhdr__
 #define __Header_ptyhdr__
 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "convtype.h"
@@ -10,6 +10,8 @@ 
 #include "datetype.h"
 #include "dateconv.h"
 
+using namespace std;
+
 static inline bool
 ReadProprietaryHeader(istream *istr,long offset,size_t length,char *buffer)
 {
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/bnstream.h	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/bnstream.h	2010-09-29 18:33:16.672172796 -0400
@@ -1,12 +1,14 @@ 
 #ifndef __Header_bnstream__
 #define __Header_bnstream__
 
-#include <iostream.h>
-//#include <iomanip.h>
+#include <iostream>
+//#include <iomanip>
 
 #include "basetype.h"
 #include "endtype.h"
 
+using namespace std;
+
 // Note that great care has to be taken adding insert and
 // extract operators as these classes (and any derived classes)
 // are themselves derived from iostream classes which DO NOT
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/endtype.h	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/endtype.h	2010-09-29 18:27:42.494171756 -0400
@@ -1,7 +1,9 @@ 
 #ifndef __Header_endtype__
 #define __Header_endtype__
 
-#include <iostream.h>	//for debugging only
+#include <iostream>	//for debugging only
+
+using namespace std;
 
 typedef enum { NoEndian, LittleEndian, BigEndian, ByteEndian } Endian;
 
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/errclass.h	2008-09-04 10:39:41.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/errclass.h	2010-09-29 18:33:02.840172491 -0400
@@ -1,7 +1,9 @@ 
 #ifndef __Header_errclass__
 #define __Header_errclass__
 
-#include <iomanip.h>
+#include <iomanip>
+
+using namespace std;
 
 class ErrorsInClass {
 private:
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/listsimp.h	2006-07-25 17:42:09.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/listsimp.h	2010-09-30 13:14:40.109172427 -0400
@@ -1,6 +1,10 @@ 
+#include <iostream>
+
 #ifndef __Header_listsimp__
 #define __Header_listsimp__
 
+using namespace std;
+
 template<class T> class SimpleList;
 template<class T> class SimpleListIterator;
 
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/ntstream.h	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/ntstream.h	2010-09-29 18:26:55.998046828 -0400
@@ -2,7 +2,9 @@ 
 #ifndef __Header_nstream__
 #define __Header_nstream__
 
-#include <iostream.h>
+#include <iostream>
+
+using namespace std;
 
 class netbuf: public streambuf {
 protected:
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/txstream.h	2005-02-26 08:50:12.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/generic/txstream.h	2010-09-29 18:26:09.878172482 -0400
@@ -1,8 +1,10 @@ 
 #ifndef __Header_txstream__
 #define __Header_txstream__
 
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
+
+using namespace std;
 
 class TextOutputStream : public ostream {
 public:
--- dicom3tools_1.00.snapshot.20100815/libsrc/include/pixeldat/srcsink.h	2010-05-09 10:43:41.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/include/pixeldat/srcsink.h	2010-09-29 18:44:40.781171820 -0400
@@ -1,12 +1,16 @@ 
 #ifndef __Header_srcsink__
 #define __Header_srcsink__
 
+#include <istream>
+
 #include "buffer.h"
 
 #ifndef DEFAULTCHUNKSIZE
 #define DEFAULTCHUNKSIZE 16384
 #endif
 
+using namespace std;
+
 template<class T>
 class SourceBase {
 public:
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdargb.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdargb.cc	2010-09-29 18:22:22.092047001 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "attr.h"
 #include "srcsink.h"
@@ -10,6 +10,8 @@ 
 #include "rdimage.h"
 #include "rdargb.h"
 
+using namespace std;
+
 ReadableInterleaved32BitARGBImage::ReadableInterleaved32BitARGBImage(
 	SupplySource *s,Uint16 vColumns,Uint16 vRows,Uint16 vNumberOfFrames,
 	Uint16 vBitsAllocated,Uint16 vBitsStored,Uint16 vHighBit,
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdcmyk.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdcmyk.cc	2010-09-29 18:22:34.692172114 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "srcsink.h"
@@ -6,6 +6,8 @@ 
 #include "rdimage.h"
 #include "rdcmyk.h"
 
+using namespace std;
+
 ReadableInterleaved32BitCMYKImage::ReadableInterleaved32BitCMYKImage(
 	SupplySource *s,Uint16 vColumns,Uint16 vRows,Uint16 vNumberOfFrames,
 	Uint16 vBitsAllocated,Uint16 vBitsStored,Uint16 vHighBit)
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdgray.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdgray.cc	2010-09-29 18:23:07.892067689 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "srcsink.h"
@@ -6,6 +6,8 @@ 
 #include "rdimage.h"
 #include "rdgray.h"
 
+using namespace std;
+
 ReadableWindowed8BitGrayImage::ReadableWindowed8BitGrayImage(
 	SupplySource *s,Uint16 vColumns,Uint16 vRows,Uint16 vNumberOfFrames,
 	Uint16 vBitsAllocated,Uint16 vBitsStored,Uint16 vHighBit,
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdhsv.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdhsv.cc	2010-09-29 18:24:08.717171966 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "srcsink.h"
@@ -6,6 +6,8 @@ 
 #include "rdimage.h"
 #include "rdhsv.h"
 
+using namespace std;
+
 ReadableInterleaved24BitHSVImage::ReadableInterleaved24BitHSVImage(
 	SupplySource *s,Uint16 vColumns,Uint16 vRows,Uint16 vNumberOfFrames,
 	Uint16 vBitsAllocated,Uint16 vBitsStored,Uint16 vHighBit)
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdimage.cc	2002-09-02 10:30:42.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdimage.cc	2010-09-29 18:24:34.789171874 -0400
@@ -1,11 +1,13 @@ 
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
 
 #include "basetype.h"
 #include "srcsink.h"
 #include "rdimage.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 class SourceBase<Uint16> *
 ReadableImage::getSource(void)
 {
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdimage.cc.postsignextend	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdimage.cc.postsignextend	2010-09-29 18:22:52.852172410 -0400
@@ -1,11 +1,13 @@ 
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
 
 #include "basetype.h"
 #include "srcsink.h"
 #include "rdimage.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 class SourceBase<Uint16> *
 ReadableImage::getSource(void)
 {
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdindex.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdindex.cc	2010-09-29 18:23:40.253172132 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "attr.h"
 #include "srcsink.h"
@@ -9,6 +9,8 @@ 
 #include "rdimage.h"
 #include "rdindex.h"
 
+using namespace std;
+
 Readable8BitIndexedColorImage::Readable8BitIndexedColorImage(
 	SupplySource *s,Uint16 vColumns,Uint16 vRows,Uint16 vNumberOfFrames,
 	Uint16 vBitsAllocated,Uint16 vBitsStored,Uint16 vHighBit,
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdrgb.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/rdrgb.cc	2010-09-29 18:24:19.981172094 -0400
@@ -1,4 +1,4 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "basetype.h"
 #include "srcsink.h"
@@ -6,6 +6,8 @@ 
 #include "rdimage.h"
 #include "rdrgb.h"
 
+using namespace std;
+
 ReadableInterleaved24BitRGBImage::ReadableInterleaved24BitRGBImage(
 	SupplySource *s,Uint16 vColumns,Uint16 vRows,Uint16 vNumberOfFrames,
 	Uint16 vBitsAllocated,Uint16 vBitsStored,Uint16 vHighBit)
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/usegray.cc	2007-10-02 09:10:45.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/usegray.cc	2010-09-29 18:23:24.341047059 -0400
@@ -1,9 +1,11 @@ 
-#include <iostream.h>	// only for debugging
-#include <iomanip.h>	// only for debugging
+#include <iostream>	// only for debugging
+#include <iomanip>	// only for debugging
 
 #include "basetype.h"
 #include "usegray.h"
 
+using namespace std;
+
 UseableWindowedGrayImage::UseableWindowedGrayImage(
 	bool invertedgrayscale,Uint16 bits,bool issigned)
 {
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/usegray.cc.signedwork	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dcdisp/usegray.cc.signedwork	2010-09-29 18:31:05.711172093 -0400
@@ -1,9 +1,11 @@ 
-#include <iostream.h>	// only for debugging
-#include <iomanip.h>	// only for debugging
+#include <iostream>	// only for debugging
+#include <iomanip>	// only for debugging
 
 #include "basetype.h"
 #include "usegray.h"
 
+using namespace std;
+
 UseableWindowedGrayImage::UseableWindowedGrayImage(
 	bool invertedgrayscale,Uint16 bits,bool issigned)
 {
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/attrmxrd.cc	2009-07-09 19:38:20.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/attrmxrd.cc	2010-09-29 18:48:05.470046691 -0400
@@ -1,3 +1,5 @@ 
+#include <cstdio>
+
 #include "attrtype.h"
 #include "attrnew.h"
 #include "attrmxls.h"
@@ -13,6 +15,8 @@ 
 #define LARGESTOTHERDATATOKEEPINMEMORY 524288
 #endif
 
+using namespace std;
+
 // Want a routine to actually read rather than just use seekg(), since otherwise
 // there is no detection of failure to skip a truncated attribute at the end
 // of the dataset
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/binval.cc	2004-11-24 13:29:25.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/binval.cc	2010-09-29 19:05:26.365048889 -0400
@@ -1,5 +1,8 @@ 
-#include <iomanip.h>
+#include <iomanip>
+#include <iostream>
 
 #include "basetype.h"
 #include "binvalc.h"
 #include "binvald.h"
+
+using namespace std;
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/charset.cc	2008-09-08 14:58:40.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/charset.cc	2010-09-29 18:32:35.152172012 -0400
@@ -1,10 +1,12 @@ 
 #include <string.h>
-//#include <iostream.h>	// for cerr
-//#include <iomanip.h>	// for cerr
+//#include <iostream>	// for cerr
+//#include <iomanip>	// for cerr
 
 #include "charset.h"
 #include "attr.h"
 
+using namespace std;
+
 SpecificCharacterSetInfo::SpecificCharacterSetInfo(void) {
 	setSpecificCharacterSet();
 }
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/dcopti.cc	2007-03-15 22:00:21.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/dcopti.cc	2010-09-29 18:50:41.215172981 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "basetype.h"
 #include "dcopt.h"
@@ -9,6 +9,8 @@ 
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
 
+using namespace std;
+
 static const char *options_input_file[] = {
 	"if",
 	"input-file",
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/dcopto.cc	2010-03-10 09:06:36.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/dcopto.cc	2010-09-29 18:58:17.202171747 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "attr.h"
 #include "attrlist.h"
@@ -12,6 +12,8 @@ 
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
 
+using namespace std;
+
 static const char *options_output_file[] = {
 	"output-file",
 	"of",
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/tagval.cc	2004-11-24 13:29:25.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/tagval.cc	2010-09-29 18:31:48.560171878 -0400
@@ -1,4 +1,4 @@ 
-#include <iomanip.h>
+#include <iomanip>
 
 #include "basetype.h"
 #include "tagvalc.h"
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/transyn.cc	2009-02-09 20:53:36.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/transyn.cc	2010-09-29 18:24:58.773046939 -0400
@@ -1,8 +1,10 @@ 
-#include <iostream.h>
+#include <iostream>
 
 #include "transyn.h"
 #include "transynd.h"
 
+using namespace std;
+
 static TransferSyntaxDictionary tsd;
 
 TransferSyntax::TransferSyntax(const char *uid)
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/uidgen.cc	2006-10-21 18:03:44.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/dctool/uidgen.cc	2010-09-29 18:32:14.513047161 -0400
@@ -1,4 +1,4 @@ 
-#include <iomanip.h>
+#include <iomanip>
 
 #ifdef CRAP
 #include <time.h>
@@ -36,6 +36,8 @@ 
 #define	UIDGEN_RAWDATA			".9"
 #define UIDGEN_IRRADIATIONEVENT	".10"
 
+using namespace std;
+
 void
 GeneratedUID::setSOPInstance()
 {
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/bnopti.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/bnopti.cc	2010-09-29 18:50:55.591172782 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "basetype.h"
 #include "endtype.h"
@@ -9,6 +9,8 @@ 
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
 
+using namespace std;
+
 static const char *options_input_file[] = {
 	"if",
 	"input-file",
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/bnopto.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/bnopto.cc	2010-09-29 18:58:41.523047456 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "basetype.h"
 #include "endtype.h"
@@ -9,6 +9,8 @@ 
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
 
+using namespace std;
+
 static const char *options_output_file[] = {
 	"of",
 	"output-file",
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/getoptns.cc	2007-11-10 09:29:41.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/getoptns.cc	2010-09-29 18:30:41.287172499 -0400
@@ -1,4 +1,4 @@ 
-#include <iomanip.h>
+#include <iomanip>
 #include <ctype.h>
 #include <string.h>
 
@@ -6,6 +6,8 @@ 
 #include "getoptns.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 // many of the get and extract methods should be a template
 // but can't figure out how to have template functions declared within
 // a class
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/ioopti.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/ioopti.cc	2010-09-29 19:10:24.855046906 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "basetype.h"
 #include "ioopt.h"
@@ -8,6 +8,8 @@ 
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
 
+using namespace std;
+
 static const char *options_input_file[] = {
 	"if",
 	"input-file",
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/ioopto.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/generic/ioopto.cc	2010-09-29 19:13:27.672172177 -0400
@@ -1,4 +1,4 @@ 
-#include <fstream.h>
+#include <fstream>
 
 #include "basetype.h"
 #include "ioopt.h"
@@ -8,6 +8,8 @@ 
 #define REPLACESTANDARDIOBUFSIZE 16384
 #endif
 
+using namespace std;
+
 static const char *options_output_file[] = {
 	"of",
 	"output-file",
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/locale/mesgtext.cc	2004-11-24 13:29:25.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/locale/mesgtext.cc	2010-09-29 18:30:26.023171721 -0400
@@ -1,9 +1,11 @@ 
 #include <string.h>
-#include <iomanip.h>
+#include <iomanip>
 
 #include "basetype.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 struct EMSGDC_Table_Entry {
 	const char *index;
 	const char *description;
--- dicom3tools_1.00.snapshot.20100815/libsrc/src/ourdisp/ourdisp.cc	2004-11-24 13:29:25.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/libsrc/src/ourdisp/ourdisp.cc	2010-09-29 18:22:00.692171972 -0400
@@ -1,11 +1,13 @@ 
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
 
 #include "basetype.h"
 #include "errclass.h"
 #include "ourdisp.h"
 #include "mesgtext.h"
 
+using namespace std;
+
 OurDisplay::OurDisplay(void)
 {
 	name = NULL;
--- dicom3tools_1.00.snapshot.20100815/libsrc/support/binval.awk	2002-06-20 11:23:25.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/support/binval.awk	2010-09-29 19:08:16.246171804 -0400
@@ -22,6 +22,10 @@ 
 		exit 1
 	}
 
+    print "#include <iostream>"
+    print "using namespace std;"
+    print ""
+
 	mode=""
 	}
 
--- dicom3tools_1.00.snapshot.20100815/libsrc/support/tagval.awk	2002-06-20 11:23:25.000000000 -0400
+++ dicom3tools_1.00.snapshot.20100815/libsrc/support/tagval.awk	2010-09-29 19:09:51.287172059 -0400
@@ -20,6 +20,10 @@ 
 		exit 1
 	}
 
+    print "#include <iostream>"
+    print "using namespace std;"
+    print ""
+
 	mode=""
 	}
 
--- dicom3tools_1.00.snapshot.20100815/support/mktime.cc	2001-11-11 09:57:50.000000000 -0500
+++ dicom3tools_1.00.snapshot.20100815/support/mktime.cc	2010-09-29 18:20:45.027172370 -0400
@@ -1,8 +1,10 @@ 
 #include <time.h>
-#include <iostream.h>
+#include <iostream>
 #include <assert.h>
 #include <stdlib.h>
 
+using namespace std;
+
 // specify string datetime (UTC) on command line
 
 // return seconds since 00:00:00 UTC, January 1, 1970