diff --git a/samples/Makefile.incl b/samples/Makefile.incl
index 962cb99b7ce722560b4e87d4806b68e275efd47f..1813abdf86db83497ddd71ebc122ac663d76b419 100644
--- a/samples/Makefile.incl
+++ b/samples/Makefile.incl
@@ -126,7 +126,7 @@ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
 MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
 MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX  -G
 PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
-EXTRA_LINK_OPTIONS=-lm -lgen -lustdio -licu-uc -licu-i18n -licu-toolutil
+EXTRA_LINK_OPTIONS=-lm -lgen 
 SHLIBSUFFIX=.so
 endif
 
diff --git a/src/Makefile.incl b/src/Makefile.incl
index c208c7af501dc05b571079c9369a6e2c29484d46..3099f2aaa03dc4324efb57f480522b030400bc8a 100644
--- a/src/Makefile.incl
+++ b/src/Makefile.incl
@@ -168,13 +168,14 @@ ifeq (${PLATFORM}, PTX)
 
 PLATFORM_CPP_COMPILER = c++
 PLATFORM_C_COMPILER = cc
-ifdef ICUROOT
-  ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen
+ifeq (${TRANSCODER}, ICU)
+  PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
+  ALLLIBS = ${LIBS} -L${ICUROOT}/lib -lm -lgen -licu-uc
 else
+  PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
   ALLLIBS = ${LIBS} -lm -lgen
 endif
 OBJ_OUT=${ALL_OBJECTS_DIR}/
-PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -D${PLATFORM}
 MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -D${PLATFORM} -G
 MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -D${PLATFORM} -G
 EXTRA_LINK_OPTIONS = -lm -lgen
diff --git a/src/util/Transcoders/Iconv/IconvTransService.cpp b/src/util/Transcoders/Iconv/IconvTransService.cpp
index 35f82ab2fd5e4b64cba9ab2679db691d299d3f97..9810a817f171a09749f6b0a367dab72a1afb1fd7 100644
--- a/src/util/Transcoders/Iconv/IconvTransService.cpp
+++ b/src/util/Transcoders/Iconv/IconvTransService.cpp
@@ -56,6 +56,10 @@
 
 /*
  * $Log$
+ * Revision 1.18  2000/06/09 23:45:02  rahulj
+ * More PTX port related changes submitted by
+ * Sumit Chawla <sumitc@us.ibm.com>.
+ *
  * Revision 1.17  2000/03/28 19:43:24  roddey
  * Fixes for signed/unsigned warnings. New work for two way transcoding
  * stuff.
@@ -138,7 +142,7 @@
 #include <util/XMLUni.hpp>
 #include "IconvTransService.hpp"
 #include <wchar.h>
-#if defined (XML_GCC)
+#if defined (XML_GCC) || defined (XML_PTX)
 #include <wctype.h>
 #endif
 #include <string.h>
diff --git a/tests/Makefile.incl b/tests/Makefile.incl
index b148fcf1a2511202509601d89391b2641dfccb2e..4cac7b2e34428fa11fc8d165a2f4168c4b0aaf0c 100644
--- a/tests/Makefile.incl
+++ b/tests/Makefile.incl
@@ -55,6 +55,10 @@
 #
 #
 # $Log$
+# Revision 1.8  2000/06/09 23:45:03  rahulj
+# More PTX port related changes submitted by
+# Sumit Chawla <sumitc@us.ibm.com>.
+#
 # Revision 1.7  2000/06/03 01:13:51  aruna1
 # Version number consolidated into single file for unix
 #
@@ -136,7 +140,7 @@ PLATFORM_COMPILE_OPTIONS = -KPIC -Kthread -DPTX
 MAKE_SHARED = ${PLATFORM_CPP_COMPILER} -DPTX -G
 MAKE_SHARED_C = ${PLATFORM_C_COMPILER} -DPTX -G
 PLATFORM_LIB_LINK_OPTIONS=-L/usr/local/lib -L${XMLINSTALL}/lib
-EXTRA_LINK_OPTIONS=-lm -lgen -licu-uc -licu-i18n -lustdio -licu-toolutil
+EXTRA_LINK_OPTIONS=-lm -lgen 
 SHLIBSUFFIX=.so
 endif