diff --git a/src/xalanc/PlatformSupport/DoubleSupport.hpp b/src/xalanc/PlatformSupport/DoubleSupport.hpp
index 2c29e27..4e197e6 100644
--- a/src/xalanc/PlatformSupport/DoubleSupport.hpp
+++ b/src/xalanc/PlatformSupport/DoubleSupport.hpp
@@ -28,7 +28,7 @@
 #if defined(_MSC_VER)
 #include <float.h>
 #endif
-#include <math.h>
+#include <cmath>
 #include <functional>
 
 
@@ -80,7 +80,11 @@
 #if defined(_MSC_VER)
         return _isnan(theNumber) != 0;
 #elif defined(XALAN_POSIX2_AVAILABLE) && !defined(CYGWIN) && !defined(MINGW)
-        return isnan(theNumber) != 0;
+#if defined(XALAN_NO_STD_NAMESPACE)
+        return isnam(theNumber) != 0;
+#else
+        return std::isnan(theNumber) != 0;
+#endif
 #else
         return s_NaN == theNumber;
 #endif
diff --git a/xdocs/make-apiDocs.sh b/xdocs/make-apiDocs.sh
index 61f4cbc..dd23703 100755
--- a/xdocs/make-apiDocs.sh
+++ b/xdocs/make-apiDocs.sh
@@ -9,7 +9,7 @@
 # Various OS's have different ways of specifying the library path
 #
 # Solaris and Linux
-  LD_LIBRARY_PATH=/usr/local/lib
+# LD_LIBRARY_PATH=/usr/local/lib
 #
 # HP-UX
 # SHLIB_PATH=/usr/local/lib
diff --git a/xdocs/sources/make-book.sh b/xdocs/sources/make-book.sh
index 6ee3ae8..19fbb19 100755
--- a/xdocs/sources/make-book.sh
+++ b/xdocs/sources/make-book.sh
@@ -5,7 +5,7 @@
 # SET THE LIBRARY PATH FOR YOUR OPERATING SYSTEM, REQUIRED BY "Xalan" PROGRAM
 #
 #  SOLARIS AND LINUX
- export LD_LIBRARY_PATH=/usr/local/lib
+# export LD_LIBRARY_PATH=/usr/local/lib
 #
 #  AIX AND BSD
 # export LIBPATH=/usr/local/lib