diff -crN libdap-3.7.8/AISDatabaseParser.h libdap-3.7.8-fix/AISDatabaseParser.h
*** libdap-3.7.8/AISDatabaseParser.h	2007-05-15 02:41:27.000000000 +0900
--- libdap-3.7.8-fix/AISDatabaseParser.h	2011-03-28 16:45:05.655721062 +0900
***************
*** 26,32 ****
  #ifndef ais_database_parser_h
  #define ais_database_parser_h
  
! #include <string>
  
  #include <libxml/parserInternals.h>
  
--- 26,32 ----
  #ifndef ais_database_parser_h
  #define ais_database_parser_h
  
! #include <cstring>
  
  #include <libxml/parserInternals.h>
  
diff -crN libdap-3.7.8/AISMerge.h libdap-3.7.8-fix/AISMerge.h
*** libdap-3.7.8/AISMerge.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/AISMerge.h	2011-03-28 16:45:05.661720783 +0900
***************
*** 28,34 ****
  #ifndef ais_merge_h
  #define ais_merge_h
  
! #include <string>
  
  #ifndef _das_h
  #include "DAS.h"
--- 28,34 ----
  #ifndef ais_merge_h
  #define ais_merge_h
  
! #include <cstring>
  
  #ifndef _das_h
  #include "DAS.h"
diff -crN libdap-3.7.8/AISResources.h libdap-3.7.8-fix/AISResources.h
*** libdap-3.7.8/AISResources.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/AISResources.h	2011-03-28 16:45:05.665721342 +0900
***************
*** 26,32 ****
  #ifndef ais_resources_h
  #define ais_resources_h
  
! #include <string>
  #include <iostream>
  #include <vector>
  #include <map>
--- 26,32 ----
  #ifndef ais_resources_h
  #define ais_resources_h
  
! #include <cstring>
  #include <iostream>
  #include <vector>
  #include <map>
diff -crN libdap-3.7.8/AlarmHandler.h libdap-3.7.8-fix/AlarmHandler.h
*** libdap-3.7.8/AlarmHandler.h	2007-06-09 07:59:46.000000000 +0900
--- libdap-3.7.8-fix/AlarmHandler.h	2011-03-28 16:45:05.668720643 +0900
***************
*** 28,34 ****
  
  #include <stdio.h>
  
! #include <string>
  
  #include "EventHandler.h"
  
--- 28,34 ----
  
  #include <stdio.h>
  
! #include <cstring>
  
  #include "EventHandler.h"
  
diff -crN libdap-3.7.8/Array.h libdap-3.7.8-fix/Array.h
*** libdap-3.7.8/Array.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/Array.h	2011-03-28 16:45:05.672720992 +0900
***************
*** 38,44 ****
  #define _array_h 1
  
  
! #include <string>
  
  #include <vector>
  
--- 38,44 ----
  #define _array_h 1
  
  
! #include <cstring>
  
  #include <vector>
  
diff -crN libdap-3.7.8/ArrayGeoConstraint.h libdap-3.7.8-fix/ArrayGeoConstraint.h
*** libdap-3.7.8/ArrayGeoConstraint.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/ArrayGeoConstraint.h	2011-03-28 16:45:05.675721062 +0900
***************
*** 26,32 ****
  #ifndef _array_geo_constraint_h
  #define _array_geo_constraint_h 1
  
! #include <string>
  #include <sstream>
  #include <set>
  
--- 26,32 ----
  #ifndef _array_geo_constraint_h
  #define _array_geo_constraint_h 1
  
! #include <cstring>
  #include <sstream>
  #include <set>
  
diff -crN libdap-3.7.8/AttrTable.h libdap-3.7.8-fix/AttrTable.h
*** libdap-3.7.8/AttrTable.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/AttrTable.h	2011-03-28 16:45:05.679720853 +0900
***************
*** 35,41 ****
  #define _attrtable_h 1
  
  
! #include <string>
  #include <vector>
  
  #ifndef _error_h
--- 35,41 ----
  #define _attrtable_h 1
  
  
! #include <cstring>
  #include <vector>
  
  #ifndef _error_h
diff -crN libdap-3.7.8/BaseType.cc libdap-3.7.8-fix/BaseType.cc
*** libdap-3.7.8/BaseType.cc	2007-05-13 06:32:21.000000000 +0900
--- libdap-3.7.8-fix/BaseType.cc	2011-03-28 16:45:05.980720364 +0900
***************
*** 38,44 ****
  #include <stdio.h>  // for stdin and stdout
  
  #include <sstream>
! #include <string>
  
  // #define DODS_DEBUG
  
--- 38,44 ----
  #include <stdio.h>  // for stdin and stdout
  
  #include <sstream>
! #include <cstring>
  
  // #define DODS_DEBUG
  
diff -crN libdap-3.7.8/BaseType.h libdap-3.7.8-fix/BaseType.h
*** libdap-3.7.8/BaseType.h	2007-05-11 01:09:07.000000000 +0900
--- libdap-3.7.8-fix/BaseType.h	2011-03-28 16:45:05.682720923 +0900
***************
*** 57,63 ****
  #include <vector>
  #include <stack>
  #include <iostream>
! #include <string>
  
  #ifndef _attrtable_h
  #include "AttrTable.h"
--- 57,63 ----
  #include <vector>
  #include <stack>
  #include <iostream>
! #include <cstring>
  
  #ifndef _attrtable_h
  #include "AttrTable.h"
diff -crN libdap-3.7.8/BaseTypeFactory.cc libdap-3.7.8-fix/BaseTypeFactory.cc
*** libdap-3.7.8/BaseTypeFactory.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/BaseTypeFactory.cc	2011-03-28 16:45:05.983720713 +0900
***************
*** 24,30 ****
  // You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
  
  
! #include <string>
  
  #include "Byte.h"
  #include "Int16.h"
--- 24,30 ----
  // You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
  
  
! #include <cstring>
  
  #include "Byte.h"
  #include "Int16.h"
diff -crN libdap-3.7.8/BaseTypeFactory.h libdap-3.7.8-fix/BaseTypeFactory.h
*** libdap-3.7.8/BaseTypeFactory.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/BaseTypeFactory.h	2011-03-28 16:45:05.686721481 +0900
***************
*** 26,32 ****
  #ifndef base_type_factory_h
  #define base_type_factory_h
  
! #include <string>
  
  // Class declarations; Make sure to include the corresponding headers in the
  // implementation file.
--- 26,32 ----
  #ifndef base_type_factory_h
  #define base_type_factory_h
  
! #include <cstring>
  
  // Class declarations; Make sure to include the corresponding headers in the
  // implementation file.
diff -crN libdap-3.7.8/Connect.h libdap-3.7.8-fix/Connect.h
*** libdap-3.7.8/Connect.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/Connect.h	2011-03-28 16:45:05.696721132 +0900
***************
*** 58,64 ****
  
  #include <stdio.h>
  
! #include <string>
  
  #ifndef _das_h
  #include "DAS.h"
--- 58,64 ----
  
  #include <stdio.h>
  
! #include <cstring>
  
  #ifndef _das_h
  #include "DAS.h"
diff -crN libdap-3.7.8/Constructor.cc libdap-3.7.8-fix/Constructor.cc
*** libdap-3.7.8/Constructor.cc	2007-06-05 07:08:57.000000000 +0900
--- libdap-3.7.8-fix/Constructor.cc	2011-03-28 16:45:05.999720573 +0900
***************
*** 32,38 ****
  
  #include "config.h"
  
! #include <string>
  #include <algorithm>
  #include <functional>
  
--- 32,38 ----
  
  #include "config.h"
  
! #include <cstring>
  #include <algorithm>
  #include <functional>
  
diff -crN libdap-3.7.8/DAS.cc libdap-3.7.8-fix/DAS.cc
*** libdap-3.7.8/DAS.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/DAS.cc	2011-03-28 16:45:06.003721551 +0900
***************
*** 49,55 ****
  #endif
  
  #include <iostream>
! #include <string>
  
  #include "DAS.h"  // follows pragma since DAS.h is interface
  #include "Error.h"
--- 49,55 ----
  #endif
  
  #include <iostream>
! #include <cstring>
  
  #include "DAS.h"  // follows pragma since DAS.h is interface
  #include "Error.h"
diff -crN libdap-3.7.8/DAS.h libdap-3.7.8-fix/DAS.h
*** libdap-3.7.8/DAS.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/DAS.h	2011-03-28 16:45:05.707720923 +0900
***************
*** 40,46 ****
  
  #include <stdio.h>
  
! #include <string>
  #include <iostream>
  
  //#include "Pix.h"
--- 40,46 ----
  
  #include <stdio.h>
  
! #include <cstring>
  #include <iostream>
  
  //#include "Pix.h"
diff -crN libdap-3.7.8/DDS.h libdap-3.7.8-fix/DDS.h
*** libdap-3.7.8/DDS.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/DDS.h	2011-03-28 16:45:05.710720923 +0900
***************
*** 40,46 ****
  #include <stdio.h>
  
  #include <iostream>
! #include <string>
  #include <vector>
  
  //#include "Pix.h"
--- 40,46 ----
  #include <stdio.h>
  
  #include <iostream>
! #include <cstring>
  #include <vector>
  
  //#include "Pix.h"
diff -crN libdap-3.7.8/DDXParser.h libdap-3.7.8-fix/DDXParser.h
*** libdap-3.7.8/DDXParser.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/DDXParser.h	2011-03-28 16:45:05.716720853 +0900
***************
*** 26,32 ****
  #ifndef ddx_parser_h
  #define ddx_parser_h
  
! #include <string>
  #include <map>
  #include <stack>
  
--- 26,32 ----
  #ifndef ddx_parser_h
  #define ddx_parser_h
  
! #include <cstring>
  #include <map>
  #include <stack>
  
diff -crN libdap-3.7.8/DODSFilter.cc libdap-3.7.8-fix/DODSFilter.cc
*** libdap-3.7.8/DODSFilter.cc	2007-06-27 06:42:26.000000000 +0900
--- libdap-3.7.8-fix/DODSFilter.cc	2011-03-28 16:45:06.015721062 +0900
***************
*** 52,58 ****
  #endif
  
  #include <iostream>
! #include <string>
  #include <algorithm>
  
  #include <GetOpt.h>
--- 52,58 ----
  #endif
  
  #include <iostream>
! #include <cstring>
  #include <algorithm>
  
  #include <GetOpt.h>
diff -crN libdap-3.7.8/DODSFilter.h libdap-3.7.8-fix/DODSFilter.h
*** libdap-3.7.8/DODSFilter.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/DODSFilter.h	2011-03-28 16:45:05.719721481 +0900
***************
*** 37,43 ****
  #include <sys/types.h>
  #include <sys/stat.h>
  
! #include <string>
  
  #ifndef _das_h
  #include "DAS.h"
--- 37,43 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  
! #include <cstring>
  
  #ifndef _das_h
  #include "DAS.h"
diff -crN libdap-3.7.8/DapIndent.h libdap-3.7.8-fix/DapIndent.h
*** libdap-3.7.8/DapIndent.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/DapIndent.h	2011-03-28 16:45:05.723720992 +0900
***************
*** 36,42 ****
  #ifndef I_DapIndent_h
  #define I_DapIndent_h 1
  
! #include <string>
  #include <iostream>
  
  using std::string ;
--- 36,42 ----
  #ifndef I_DapIndent_h
  #define I_DapIndent_h 1
  
! #include <cstring>
  #include <iostream>
  
  using std::string ;
diff -crN libdap-3.7.8/DataDDS.cc libdap-3.7.8-fix/DataDDS.cc
*** libdap-3.7.8/DataDDS.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/DataDDS.cc	2011-03-28 16:45:06.022721062 +0900
***************
*** 41,47 ****
  
  #include <iostream>
  #include <sstream>
! #include <string>
  
  #include "DataDDS.h"
  #include "debug.h"
--- 41,47 ----
  
  #include <iostream>
  #include <sstream>
! #include <cstring>
  
  #include "DataDDS.h"
  #include "debug.h"
diff -crN libdap-3.7.8/DataDDS.h libdap-3.7.8-fix/DataDDS.h
*** libdap-3.7.8/DataDDS.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/DataDDS.h	2011-03-28 16:45:05.730720853 +0900
***************
*** 39,45 ****
  #define _datadds_h 1
  
  #include <iostream>
! #include <string>
  
  #ifndef _dds_h
  #include "DDS.h"
--- 39,45 ----
  #define _datadds_h 1
  
  #include <iostream>
! #include <cstring>
  
  #ifndef _dds_h
  #include "DDS.h"
diff -crN libdap-3.7.8/Error.h libdap-3.7.8-fix/Error.h
*** libdap-3.7.8/Error.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/Error.h	2011-03-28 16:45:05.737721062 +0900
***************
*** 40,46 ****
  #include <stdio.h>  // For FILE *
  
  #include <iostream>
! #include <string>
  
  using std::cout;
  using std::string;
--- 40,46 ----
  #include <stdio.h>  // For FILE *
  
  #include <iostream>
! #include <cstring>
  
  using std::cout;
  using std::string;
diff -crN libdap-3.7.8/GSEClause.h libdap-3.7.8-fix/GSEClause.h
*** libdap-3.7.8/GSEClause.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/GSEClause.h	2011-03-28 16:45:05.753728186 +0900
***************
*** 35,41 ****
  #define _gseclause_h 1
  
  
! #include <string>
  #include <sstream>
  
  #ifndef _basetype_h
--- 35,41 ----
  #define _gseclause_h 1
  
  
! #include <cstring>
  #include <sstream>
  
  #ifndef _basetype_h
diff -crN libdap-3.7.8/GeoConstraint.cc libdap-3.7.8-fix/GeoConstraint.cc
*** libdap-3.7.8/GeoConstraint.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/GeoConstraint.cc	2011-03-28 16:45:45.022720433 +0900
***************
*** 37,45 ****
  
  #include <iostream>
  #include <sstream>
- #ifdef WIN32
  #include <algorithm>  //  for find_if
- #endif
  
  //#define DODS_DEBUG2
  
--- 37,43 ----
diff -crN libdap-3.7.8/GeoConstraint.h libdap-3.7.8-fix/GeoConstraint.h
*** libdap-3.7.8/GeoConstraint.h	2007-06-09 07:59:46.000000000 +0900
--- libdap-3.7.8-fix/GeoConstraint.h	2011-03-28 16:45:05.757730491 +0900
***************
*** 26,32 ****
  #ifndef _geo_constraint_h
  #define _geo_constraint_h 1
  
! #include <string>
  #include <sstream>
  #include <set>
  
--- 26,32 ----
  #ifndef _geo_constraint_h
  #define _geo_constraint_h 1
  
! #include <cstring>
  #include <sstream>
  #include <set>
  
diff -crN libdap-3.7.8/GridGeoConstraint.h libdap-3.7.8-fix/GridGeoConstraint.h
*** libdap-3.7.8/GridGeoConstraint.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/GridGeoConstraint.h	2011-03-28 16:45:05.764727558 +0900
***************
*** 26,32 ****
  #ifndef _grid_geo_constraint_h
  #define _grid_geo_constraint_h 1
  
! #include <string>
  #include <sstream>
  #include <set>
  
--- 26,32 ----
  #ifndef _grid_geo_constraint_h
  #define _grid_geo_constraint_h 1
  
! #include <cstring>
  #include <sstream>
  #include <set>
  
diff -crN libdap-3.7.8/HTTPCache.cc libdap-3.7.8-fix/HTTPCache.cc
*** libdap-3.7.8/HTTPCache.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/HTTPCache.cc	2011-03-28 16:45:31.495598421 +0900
***************
*** 27,32 ****
--- 27,33 ----
  
  #include <stdio.h>
  #include <pthread.h>
+ #include <limits.h>
  
  #include <iostream>
  #include <sstream>
diff -crN libdap-3.7.8/HTTPCache.h libdap-3.7.8-fix/HTTPCache.h
*** libdap-3.7.8/HTTPCache.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/HTTPCache.h	2011-03-28 16:45:05.767720992 +0900
***************
*** 37,43 ****
  #include <unistd.h>
  #endif
  
! #include <string>
  #include <vector>
  #include <map>
  
--- 37,43 ----
  #include <unistd.h>
  #endif
  
! #include <cstring>
  #include <vector>
  #include <map>
  
diff -crN libdap-3.7.8/HTTPConnect.cc libdap-3.7.8-fix/HTTPConnect.cc
*** libdap-3.7.8/HTTPConnect.cc	2007-06-27 04:37:30.000000000 +0900
--- libdap-3.7.8-fix/HTTPConnect.cc	2011-03-28 16:45:06.058720643 +0900
***************
*** 38,44 ****
  #include <unistd.h>
  #endif
  
! #include <string>
  #include <vector>
  #include <functional>
  #include <algorithm>
--- 38,44 ----
  #include <unistd.h>
  #endif
  
! #include <cstring>
  #include <vector>
  #include <functional>
  #include <algorithm>
diff -crN libdap-3.7.8/HTTPConnect.h libdap-3.7.8-fix/HTTPConnect.h
*** libdap-3.7.8/HTTPConnect.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/HTTPConnect.h	2011-03-28 16:45:05.780721202 +0900
***************
*** 29,35 ****
  
  #include <stdio.h>
  
! #include <string>
  
  #include <curl/curl.h>
  #include <curl/types.h>
--- 29,35 ----
  
  #include <stdio.h>
  
! #include <cstring>
  
  #include <curl/curl.h>
  #include <curl/types.h>
diff -crN libdap-3.7.8/HTTPResponse.h libdap-3.7.8-fix/HTTPResponse.h
*** libdap-3.7.8/HTTPResponse.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/HTTPResponse.h	2011-03-28 16:45:05.783720713 +0900
***************
*** 28,34 ****
  
  #include <stdio.h>
  
! #include <string>
  #include <iostream>
  #include <algorithm>
  #include <iterator>
--- 28,34 ----
  
  #include <stdio.h>
  
! #include <cstring>
  #include <iostream>
  #include <algorithm>
  #include <iterator>
diff -crN libdap-3.7.8/InternalErr.cc libdap-3.7.8-fix/InternalErr.cc
*** libdap-3.7.8/InternalErr.cc	2007-06-27 04:37:30.000000000 +0900
--- libdap-3.7.8-fix/InternalErr.cc	2011-03-28 16:45:06.068720713 +0900
***************
*** 40,46 ****
  
  #include <stdio.h>
  
! #include <string>
  #include <sstream>
  
  #include "InternalErr.h"
--- 40,46 ----
  
  #include <stdio.h>
  
! #include <cstring>
  #include <sstream>
  
  #include "InternalErr.h"
diff -crN libdap-3.7.8/InternalErr.h libdap-3.7.8-fix/InternalErr.h
*** libdap-3.7.8/InternalErr.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/InternalErr.h	2011-03-28 16:45:05.794720992 +0900
***************
*** 39,45 ****
  
  #include <stdio.h>  // For FILE *
  
! #include <string>
  
  #ifndef _error_h
  #include "Error.h"
--- 39,45 ----
  
  #include <stdio.h>  // For FILE *
  
! #include <cstring>
  
  #ifndef _error_h
  #include "Error.h"
diff -crN libdap-3.7.8/OPeNDAPDir.h libdap-3.7.8-fix/OPeNDAPDir.h
*** libdap-3.7.8/OPeNDAPDir.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/OPeNDAPDir.h	2011-03-28 16:45:05.797721342 +0900
***************
*** 34,40 ****
  #define I_OPeNDAPDir_h
  
  #include <list>
! #include <string>
  
  using std::list ;
  using std::string ;
--- 34,40 ----
  #define I_OPeNDAPDir_h
  
  #include <list>
! #include <cstring>
  
  using std::list ;
  using std::string ;
diff -crN libdap-3.7.8/OPeNDAPFile.h libdap-3.7.8-fix/OPeNDAPFile.h
*** libdap-3.7.8/OPeNDAPFile.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/OPeNDAPFile.h	2011-03-28 16:45:19.038595626 +0900
***************
*** 3,8 ****
--- 3,9 ----
  #ifndef I_OPeNDAPFile_h
  #define I_OPeNDAPFile_h
  
+ #include <cstring>
  #include <string>
  
  using std::string ;
diff -crN libdap-3.7.8/PassiveUrl.h libdap-3.7.8-fix/PassiveUrl.h
*** libdap-3.7.8/PassiveUrl.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/PassiveUrl.h	2011-03-28 16:45:05.848720853 +0900
***************
*** 39,45 ****
  
  #include "PassiveStr.h"
  #include "dods-limits.h"
! #include <string>
  
  /** @brief Holds an Internet address (URL).
  
--- 39,45 ----
  
  #include "PassiveStr.h"
  #include "dods-limits.h"
! #include <cstring>
  
  /** @brief Holds an Internet address (URL).
  
diff -crN libdap-3.7.8/RCReader.h libdap-3.7.8-fix/RCReader.h
*** libdap-3.7.8/RCReader.h	2007-06-09 07:59:46.000000000 +0900
--- libdap-3.7.8-fix/RCReader.h	2011-03-28 16:45:05.855727488 +0900
***************
*** 33,39 ****
  #define _rc_reader_h_
  
  #include <iostream>
! #include <string>
  
  #include "Error.h"
  #include "util.h"
--- 33,39 ----
  #define _rc_reader_h_
  
  #include <iostream>
! #include <cstring>
  
  #include "Error.h"
  #include "util.h"
diff -crN libdap-3.7.8/Resource.h libdap-3.7.8-fix/Resource.h
*** libdap-3.7.8/Resource.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/Resource.h	2011-03-28 16:45:05.862727139 +0900
***************
*** 26,32 ****
  #ifndef resource_h
  #define resource_h
  
! #include <string>
  #include <iostream>
  
  #ifndef _error_h
--- 26,32 ----
  #ifndef resource_h
  #define resource_h
  
! #include <cstring>
  #include <iostream>
  
  #ifndef _error_h
diff -crN libdap-3.7.8/ResponseTooBigErr.cc libdap-3.7.8-fix/ResponseTooBigErr.cc
*** libdap-3.7.8/ResponseTooBigErr.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/ResponseTooBigErr.cc	2011-03-28 16:45:06.126721342 +0900
***************
*** 30,36 ****
      {"$Id: ResponseTooBigErr.cc 16088 2007-03-28 21:42:19Z jimg $"
      };
  
! #include <string>
  
  #include "ResponseTooBigErr.h"
  
--- 30,36 ----
      {"$Id: ResponseTooBigErr.cc 16088 2007-03-28 21:42:19Z jimg $"
      };
  
! #include <cstring>
  
  #include "ResponseTooBigErr.h"
  
diff -crN libdap-3.7.8/ResponseTooBigErr.h libdap-3.7.8-fix/ResponseTooBigErr.h
*** libdap-3.7.8/ResponseTooBigErr.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/ResponseTooBigErr.h	2011-03-28 16:45:05.869721062 +0900
***************
*** 27,33 ****
  #define _response_too_big_err_h 1
  
  
! #include <string>
  
  #ifndef _error_h
  #include "Error.h"
--- 27,33 ----
  #define _response_too_big_err_h 1
  
  
! #include <cstring>
  
  #ifndef _error_h
  #include "Error.h"
diff -crN libdap-3.7.8/Sequence.cc libdap-3.7.8-fix/Sequence.cc
*** libdap-3.7.8/Sequence.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/Sequence.cc	2011-03-28 16:45:06.130721342 +0900
***************
*** 36,42 ****
  #include "config.h"
  
  #include <algorithm>
! #include <string>
  #include <sstream>
  
  //#define DODS_DEBUG
--- 36,42 ----
  #include "config.h"
  
  #include <algorithm>
! #include <cstring>
  #include <sstream>
  
  //#define DODS_DEBUG
diff -crN libdap-3.7.8/SignalHandlerRegisteredErr.h libdap-3.7.8-fix/SignalHandlerRegisteredErr.h
*** libdap-3.7.8/SignalHandlerRegisteredErr.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/SignalHandlerRegisteredErr.h	2011-03-28 16:45:05.878720364 +0900
***************
*** 26,32 ****
  #ifndef _signal_handler_registered_err_h
  #define _signal_handler_registered_err_h 1
  
! #include <string>
  
  #ifndef _error_h
  #include "Error.h"
--- 26,32 ----
  #ifndef _signal_handler_registered_err_h
  #define _signal_handler_registered_err_h 1
  
! #include <cstring>
  
  #ifndef _error_h
  #include "Error.h"
diff -crN libdap-3.7.8/Str.h libdap-3.7.8-fix/Str.h
*** libdap-3.7.8/Str.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/Str.h	2011-03-28 16:45:05.884721062 +0900
***************
*** 47,53 ****
  #include <rpc/xdr.h>
  #endif
  
! #include <string>
  
  #include "dods-limits.h"
  #include "BaseType.h"
--- 47,53 ----
  #include <rpc/xdr.h>
  #endif
  
! #include <cstring>
  
  #include "dods-limits.h"
  #include "BaseType.h"
diff -crN libdap-3.7.8/Url.h libdap-3.7.8-fix/Url.h
*** libdap-3.7.8/Url.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/Url.h	2011-03-28 16:45:05.896721132 +0900
***************
*** 37,43 ****
  #define _url_h 1
  
  
! #include <string>
  
  #ifndef _dods_limits_h
  #include "dods-limits.h"
--- 37,43 ----
  #define _url_h 1
  
  
! #include <cstring>
  
  #ifndef _dods_limits_h
  #include "dods-limits.h"
diff -crN libdap-3.7.8/ce_expr.lex libdap-3.7.8-fix/ce_expr.lex
*** libdap-3.7.8/ce_expr.lex	2007-05-18 08:15:40.000000000 +0900
--- libdap-3.7.8-fix/ce_expr.lex	2011-03-28 16:45:06.244723158 +0900
***************
*** 53,59 ****
  #include <string.h>
  #include <assert.h>
  
! #include <string>
  
  #ifndef YY_PROTO
  #define YY_PROTO(proto) proto
--- 53,59 ----
  #include <string.h>
  #include <assert.h>
  
! #include <cstring>
  
  #ifndef YY_PROTO
  #define YY_PROTO(proto) proto
diff -crN libdap-3.7.8/ce_expr.tab.cc libdap-3.7.8-fix/ce_expr.tab.cc
*** libdap-3.7.8/ce_expr.tab.cc	2007-06-05 07:08:57.000000000 +0900
--- libdap-3.7.8-fix/ce_expr.tab.cc	2011-03-28 16:45:06.161721411 +0900
***************
*** 112,118 ****
  #include <string.h>
  #include <assert.h>
  
! #include <string>
  
  #include "debug.h"
  #include "escaping.h"
--- 112,118 ----
  #include <string.h>
  #include <assert.h>
  
! #include <cstring>
  
  #include "debug.h"
  #include "escaping.h"
diff -crN libdap-3.7.8/ce_expr.y libdap-3.7.8-fix/ce_expr.y
*** libdap-3.7.8/ce_expr.y	2007-05-18 08:15:40.000000000 +0900
--- libdap-3.7.8-fix/ce_expr.y	2011-03-28 16:45:06.259721202 +0900
***************
*** 49,55 ****
  #include <string.h>
  #include <assert.h>
  
! #include <string>
  
  #include "debug.h"
  #include "escaping.h"
--- 49,55 ----
  #include <string.h>
  #include <assert.h>
  
! #include <cstring>
  
  #include "debug.h"
  #include "escaping.h"
diff -crN libdap-3.7.8/cgi_util.cc libdap-3.7.8-fix/cgi_util.cc
*** libdap-3.7.8/cgi_util.cc	2007-06-05 07:08:57.000000000 +0900
--- libdap-3.7.8-fix/cgi_util.cc	2011-03-28 16:45:06.170721202 +0900
***************
*** 68,74 ****
  #include <iostream>
  #include <sstream>
  #include <fstream>
! #include <string>
  
  #include "cgi_util.h"
  #include "util.h"  // This supplies flush_stream for WIN32.
--- 68,74 ----
  #include <iostream>
  #include <sstream>
  #include <fstream>
! #include <cstring>
  
  #include "cgi_util.h"
  #include "util.h"  // This supplies flush_stream for WIN32.
diff -crN libdap-3.7.8/das.tab.cc libdap-3.7.8-fix/das.tab.cc
*** libdap-3.7.8/das.tab.cc	2007-06-05 07:08:57.000000000 +0900
--- libdap-3.7.8-fix/das.tab.cc	2011-03-28 16:45:06.175721062 +0900
***************
*** 117,123 ****
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <string>
  
  #include <vector>
  
--- 117,123 ----
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <cstring>
  
  #include <vector>
  
diff -crN libdap-3.7.8/das.y libdap-3.7.8-fix/das.y
*** libdap-3.7.8/das.y	2007-05-18 08:15:40.000000000 +0900
--- libdap-3.7.8-fix/das.y	2011-03-28 16:45:06.263721481 +0900
***************
*** 47,53 ****
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <string>
  
  #include <vector>
  
--- 47,53 ----
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <cstring>
  
  #include <vector>
  
diff -crN libdap-3.7.8/escaping.cc libdap-3.7.8-fix/escaping.cc
*** libdap-3.7.8/escaping.cc	2007-06-22 02:52:13.000000000 +0900
--- libdap-3.7.8-fix/escaping.cc	2011-03-28 16:45:06.189722110 +0900
***************
*** 59,65 ****
  #include <ctype.h>
  
  #include <iomanip>
! #include <string>
  #include <sstream>
  
  #include "GNURegex.h"
--- 59,65 ----
  #include <ctype.h>
  
  #include <iomanip>
! #include <cstring>
  #include <sstream>
  
  #include "GNURegex.h"
diff -crN libdap-3.7.8/escaping.h libdap-3.7.8-fix/escaping.h
*** libdap-3.7.8/escaping.h	2007-05-18 08:08:48.000000000 +0900
--- libdap-3.7.8-fix/escaping.h	2011-03-28 16:45:05.936720783 +0900
***************
*** 34,40 ****
  #ifndef _escaping_h
  #define _escaping_h
  
! #include <string>
  
  using std::string;
  
--- 34,40 ----
  #ifndef _escaping_h
  #define _escaping_h
  
! #include <cstring>
  
  using std::string;
  
diff -crN libdap-3.7.8/expr.h libdap-3.7.8-fix/expr.h
*** libdap-3.7.8/expr.h	2007-06-09 07:59:46.000000000 +0900
--- libdap-3.7.8-fix/expr.h	2011-03-28 16:45:05.939720643 +0900
***************
*** 36,42 ****
  #ifndef _expr_h
  #define _expr_h
  
! #include <string>
  #include <vector>
  
  #ifndef _basetype_h
--- 36,42 ----
  #ifndef _expr_h
  #define _expr_h
  
! #include <cstring>
  #include <vector>
  
  #ifndef _basetype_h
diff -crN libdap-3.7.8/getdap.cc libdap-3.7.8-fix/getdap.cc
*** libdap-3.7.8/getdap.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/getdap.cc	2011-03-28 16:45:06.193721342 +0900
***************
*** 46,52 ****
  #endif
  
  #include <GetOpt.h>
! #include <string>
  
  #include "AISConnect.h"
  #include "Response.h"
--- 46,52 ----
  #endif
  
  #include <GetOpt.h>
! #include <cstring>
  
  #include "AISConnect.h"
  #include "Response.h"
diff -crN libdap-3.7.8/gse.lex libdap-3.7.8-fix/gse.lex
*** libdap-3.7.8/gse.lex	2007-05-18 08:15:40.000000000 +0900
--- libdap-3.7.8-fix/gse.lex	2011-03-28 16:45:06.253720992 +0900
***************
*** 46,52 ****
  
  static char rcsid[] not_used = {"$Id: gse.lex 16519 2007-05-17 23:15:40Z jimg $"};
  
! #include <string>
  #include <string.h>
  
  #include "Error.h"
--- 46,52 ----
  
  static char rcsid[] not_used = {"$Id: gse.lex 16519 2007-05-17 23:15:40Z jimg $"};
  
! #include <cstring>
  #include <string.h>
  
  #include "Error.h"
diff -crN libdap-3.7.8/lex.ce_expr.cc libdap-3.7.8-fix/lex.ce_expr.cc
*** libdap-3.7.8/lex.ce_expr.cc	2007-06-05 07:08:57.000000000 +0900
--- libdap-3.7.8-fix/lex.ce_expr.cc	2011-03-28 16:45:06.207721272 +0900
***************
*** 468,474 ****
  #include <string.h>
  #include <assert.h>
  
! #include <string>
  
  #ifndef YY_PROTO
  #define YY_PROTO(proto) proto
--- 468,474 ----
  #include <string.h>
  #include <assert.h>
  
! #include <cstring>
  
  #ifndef YY_PROTO
  #define YY_PROTO(proto) proto
diff -crN libdap-3.7.8/lex.gse_.cc libdap-3.7.8-fix/lex.gse_.cc
*** libdap-3.7.8/lex.gse_.cc	2007-06-05 07:08:57.000000000 +0900
--- libdap-3.7.8-fix/lex.gse_.cc	2011-03-28 16:45:06.225720853 +0900
***************
*** 453,459 ****
  
  static char rcsid[] not_used = {"$Id: lex.gse_.cc 16612 2007-06-04 22:08:57Z jimg $"};
  
! #include <string>
  #include <string.h>
  
  #include "Error.h"
--- 453,459 ----
  
  static char rcsid[] not_used = {"$Id: lex.gse_.cc 16612 2007-06-04 22:08:57Z jimg $"};
  
! #include <cstring>
  #include <string.h>
  
  #include "Error.h"
diff -crN libdap-3.7.8/util.cc libdap-3.7.8-fix/util.cc
*** libdap-3.7.8/util.cc	2007-06-23 03:56:39.000000000 +0900
--- libdap-3.7.8-fix/util.cc	2011-03-28 16:45:06.232721551 +0900
***************
*** 60,66 ****
  #include <sys/types.h>
  #include <sys/stat.h>
  
! #include <string>
  #include <sstream>
  #include <vector>
  #include <algorithm>
--- 60,66 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  
! #include <cstring>
  #include <sstream>
  #include <vector>
  #include <algorithm>
diff -crN libdap-3.7.8/util_mit.cc libdap-3.7.8-fix/util_mit.cc
*** libdap-3.7.8/util_mit.cc	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/util_mit.cc	2011-03-28 16:45:06.235721831 +0900
***************
*** 35,41 ****
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <string>
  #include <ctype.h>
  
  #ifndef TM_IN_SYS_TIME
--- 35,41 ----
  
  #include <stdio.h>
  #include <stdlib.h>
! #include <cstring>
  #include <ctype.h>
  
  #ifndef TM_IN_SYS_TIME
diff -crN libdap-3.7.8/util_mit.h libdap-3.7.8-fix/util_mit.h
*** libdap-3.7.8/util_mit.h	2007-03-29 06:42:19.000000000 +0900
--- libdap-3.7.8-fix/util_mit.h	2011-03-28 16:45:05.954721900 +0900
***************
*** 23,29 ****
  //
  // You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
  
! #include <string>
  
  using std::string;
  
--- 23,29 ----
  //
  // You can contact OPeNDAP, Inc. at PO Box 112, Saunderstown, RI. 02874-0112.
  
! #include <cstring>
  
  using std::string;