diff -ur C:\FGCVS\tidywrap\tidyatl\StdAfx.cpp tidyatl\StdAfx.cpp
--- C:\FGCVS\tidywrap\tidyatl\StdAfx.cpp	Tue Jan 06 03:35:16 2004
+++ tidyatl\StdAfx.cpp	Mon Sep 17 11:06:36 2007
@@ -1,6 +1,9 @@
 // stdafx.cpp : source file that includes just the standard includes
 //  stdafx.pch will be the pre-compiled header
 //  stdafx.obj will contain the pre-compiled type information
+#if defined(_MSC_VER) && (_MSC_VER > 1300)
+#pragma warning(disable:4996)
+#endif   /* _MSC_VER > 1300 */
 
 #include "stdafx.h"
 
@@ -10,3 +13,5 @@
 #endif
 
 #include <atlimpl.cpp>
+
+// eof - StdAfx.cpp
diff -ur C:\FGCVS\tidywrap\tidyatl\Tidy.cpp tidyatl\Tidy.cpp
--- C:\FGCVS\tidywrap\tidyatl\Tidy.cpp	Tue Jan 06 03:35:16 2004
+++ tidyatl\Tidy.cpp	Sat Sep 15 14:51:08 2007
@@ -23,7 +23,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // DLL Entry Point
 
-void main()
+void __cdecl main()
 {
 }
 
diff -ur C:\FGCVS\tidywrap\tidyatl\Tidy.def tidyatl\Tidy.def
--- C:\FGCVS\tidywrap\tidyatl\Tidy.def	Tue Jan 06 03:35:16 2004
+++ tidyatl\Tidy.def	Thu Sep 13 17:55:27 2007
@@ -3,7 +3,7 @@
 LIBRARY      "TidyATL.DLL"
 
 EXPORTS
-	DllCanUnloadNow     @1 PRIVATE
-	DllGetClassObject   @2 PRIVATE
-	DllRegisterServer   @3 PRIVATE
-	DllUnregisterServer	@4 PRIVATE
+	DllCanUnloadNow     PRIVATE
+	DllGetClassObject   PRIVATE
+	DllRegisterServer   PRIVATE
+	DllUnregisterServer	PRIVATE
diff -ur C:\FGCVS\tidywrap\tidyatl\Tidy.idl tidyatl\Tidy.idl
--- C:\FGCVS\tidywrap\tidyatl\Tidy.idl	Tue Jan 06 03:35:16 2004
+++ tidyatl\Tidy.idl	Sat Sep 15 11:17:32 2007
@@ -93,3 +93,5 @@
 		[default, source] dispinterface ITidyDocumentEvents;
 	};
 };
+
+// eof - Tidy.idl
\ No newline at end of file
diff -ur C:\FGCVS\tidywrap\tidyatl\Tidy.rc tidyatl\Tidy.rc
--- C:\FGCVS\tidywrap\tidyatl\Tidy.rc	Tue Jan 06 03:35:16 2004
+++ tidyatl\Tidy.rc	Fri Sep 14 18:07:10 2007
@@ -40,7 +40,7 @@
 
 3 TEXTINCLUDE DISCARDABLE 
 BEGIN
-    "1 TYPELIB ""TidyATL.tlb""\r\n"
+    "1 TYPELIB ""TidyCOM.tlb""\r\n"
     "\0"
 END
 
@@ -117,7 +117,7 @@
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-1 TYPELIB "TidyATL.tlb"
+1 TYPELIB "TidyCOM.tlb"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
diff -ur C:\FGCVS\tidywrap\tidyatl\TidyDocument.cpp tidyatl\TidyDocument.cpp
--- C:\FGCVS\tidywrap\tidyatl\TidyDocument.cpp	Tue Jan 06 03:35:16 2004
+++ tidyatl\TidyDocument.cpp	Tue Sep 18 12:17:04 2007
@@ -26,7 +26,7 @@
 HRESULT CTidyDocument::FinalConstruct()
 {
   _tdoc = tidyCreate();
-  tidySetAppData( _tdoc, (uint) this );
+  tidySetAppData( _tdoc, (void *) this );
   tidySetReportFilter( _tdoc, ReportFilter );
   // tidySetErrorSink( _tdoc, NULL );
 
@@ -88,9 +88,16 @@
   TidyBuffer buf = {0};
 	assert( _tdoc != NULL );
   ctmbstr saveEnc = tidyOptGetCurrPick( _tdoc, TidyCharEncoding );
+#if   defined(UNICODE)
+  USES_CONVERSION;
+  BSTR   wEnc = _T("UTF16LE");
+  ctmbstr charStg = W2CA(wEnc);
+  tidySetCharEncoding( _tdoc, charStg );
+#else
   tidySetCharEncoding( _tdoc, _T("UTF16LE") );
-
-  tidyBufAttach( &buf, content, ::SysStringByteLen(content) );
+#endif
+  tidyBufInit( &buf );
+  tidyBufAttach( &buf, (byte *)content, ::SysStringByteLen(content) );
   *status = tidyParseBuffer( _tdoc, &buf );
   tidySetCharEncoding( _tdoc, saveEnc );
   return ( *status < 0 ? S_FALSE : S_OK );
@@ -101,7 +108,15 @@
   TidyBuffer outbuf = {0};
 	assert( _tdoc != NULL );
   ctmbstr saveEnc = tidyOptGetCurrPick( _tdoc, TidyCharEncoding );
+  tidyBufInit( &outbuf );
+#if   defined(UNICODE)
+  USES_CONVERSION;
+  BSTR   wEnc = _T("UTF16LE");
+  ctmbstr charStg = W2CA(wEnc);
+  tidySetCharEncoding( _tdoc, charStg );
+#else
   tidySetCharEncoding( _tdoc, _T("UTF16LE") );
+#endif
   int status = tidySaveBuffer( _tdoc, &outbuf );
   if ( status >= 0 )
   {