diff --git a/cde/programs/nsgmls/CmdLineApp.C b/cde/programs/nsgmls/CmdLineApp.C
index b2f74684f..4ba7cbcbc 100644
--- a/cde/programs/nsgmls/CmdLineApp.C
+++ b/cde/programs/nsgmls/CmdLineApp.C
@@ -58,7 +58,7 @@
 
 #include "ConsoleOutput.h"
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #include <fstream>
 using namespace std;
@@ -292,7 +292,7 @@ Boolean CmdLineApp::openFilebufWrite(filebuf &file,
     return 0;
   return file.attach(fd) != 0;
 #else
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   return file.open(filename, ios::out|ios::trunc) != 0;
 #else
   return file.open(filename, ios::out|ios::trunc|IOS_BINARY) != 0;
diff --git a/cde/programs/nsgmls/CmdLineApp.h b/cde/programs/nsgmls/CmdLineApp.h
index 98f57736d..45d505f13 100644
--- a/cde/programs/nsgmls/CmdLineApp.h
+++ b/cde/programs/nsgmls/CmdLineApp.h
@@ -43,7 +43,7 @@
 #include <stddef.h>
 #endif
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <fstream>
 using namespace std;
 #else
diff --git a/cde/programs/nsgmls/CodingSystem.C b/cde/programs/nsgmls/CodingSystem.C
index ad7935a76..6f9e52074 100644
--- a/cde/programs/nsgmls/CodingSystem.C
+++ b/cde/programs/nsgmls/CodingSystem.C
@@ -33,7 +33,7 @@
 #ifdef SP_SHORT_HEADERS
 #include <strstrea.h>
 #else
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <strstream>
 #else
 #include <strstream.h>
@@ -82,7 +82,7 @@ String<char> OutputCodingSystem::convertOut(const StringC &str) const
   encoder->output(copy.data(), copy.size(), &stream);
   delete encoder;
   char *s = stream.str();
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   String<char> result(s, stream.pcount());
 #else
   String<char> result(s, stream.out_waiting());
diff --git a/cde/programs/nsgmls/CodingSystem.h b/cde/programs/nsgmls/CodingSystem.h
index e073ae5cf..62adbd0cc 100644
--- a/cde/programs/nsgmls/CodingSystem.h
+++ b/cde/programs/nsgmls/CodingSystem.h
@@ -41,7 +41,7 @@
 
 #include <stddef.h>
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <streambuf>
 using namespace std;
 #else
diff --git a/cde/programs/nsgmls/OutputCharStream.C b/cde/programs/nsgmls/OutputCharStream.C
index fd1f75846..1739437a3 100644
--- a/cde/programs/nsgmls/OutputCharStream.C
+++ b/cde/programs/nsgmls/OutputCharStream.C
@@ -28,7 +28,7 @@
 #include "OutputCharStream.h"
 #include "CodingSystem.h"
 #include "macros.h"
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #else
 #include <iostream.h>
@@ -148,7 +148,7 @@ void IosOutputCharStream::flush()
     encoder_->output(buf_, ptr_ - buf_, byteStream_);
     ptr_ = buf_;
   }
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   byteStream_->pubsync();
 #else
   byteStream_->sync();
diff --git a/cde/programs/nsgmls/OutputCharStream.h b/cde/programs/nsgmls/OutputCharStream.h
index 15088bb48..7551bfd7c 100644
--- a/cde/programs/nsgmls/OutputCharStream.h
+++ b/cde/programs/nsgmls/OutputCharStream.h
@@ -33,7 +33,7 @@
 #include "Owner.h"
 #include "CodingSystem.h"
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <streambuf>
 using namespace std;
 #else
diff --git a/cde/programs/nsgmls/config.h b/cde/programs/nsgmls/config.h
index 7859a9c42..2f7bcc907 100644
--- a/cde/programs/nsgmls/config.h
+++ b/cde/programs/nsgmls/config.h
@@ -32,7 +32,7 @@
 
 #ifdef __GNUG__
 // It's not missing, but it pulls in libg++
-#if !defined(linux)
+#if !defined(linux) && !defined(CSRG_BASED)
 #define SP_NEW_H_MISSING
 // set_new_handler() has to be declared extern "C"
 #define SP_SET_NEW_HANDLER_EXTERN_C
diff --git a/cde/programs/nsgmls/entmgr_inst.m4 b/cde/programs/nsgmls/entmgr_inst.m4
index 79a9784d7..20002a844 100644
--- a/cde/programs/nsgmls/entmgr_inst.m4
+++ b/cde/programs/nsgmls/entmgr_inst.m4
@@ -61,7 +61,6 @@ __instantiate(`RangeMapIter<WideChar,UnivChar>')
 __instantiate(`RangeMap<WideChar,UnivChar>')
 __instantiate(Vector<InputSourceOriginNamedCharRef>)
 __instantiate(Vector<StringC>)
-__instantiate(Vector<String<EquivCode> >)
 __instantiate(Owner<ExternalInfo>)
 __instantiate(ISet<Char>)
 __instantiate(Vector<ISetRange<Char> >)
@@ -71,16 +70,11 @@ __instantiate(ISetIter<WideChar>)
 __instantiate(Vector<ISetRange<WideChar> >)
 __instantiate(SubstTable<Char>)
 __instantiate(SharedXcharMap<PackedBoolean>)
-__instantiate(SharedXcharMap<unsigned char>)
 __instantiate(SharedXcharMap<EquivCode>)
-__instantiate(String<EquivCode>)
 __instantiate(String<SyntaxChar>)
 __instantiate(XcharMap<PackedBoolean>)
-__instantiate(XcharMap<unsigned char>)
 __instantiate(XcharMap<EquivCode>)
 __instantiate(Vector<char>)
-__instantiate(Vector<PackedBoolean>)
-__instantiate(SubstTable<Char>)
 
 #ifdef SP_NAMESPACE
 }
diff --git a/cde/programs/nsgmls/nsgmls.C b/cde/programs/nsgmls/nsgmls.C
index c1ec86085..f9490f21e 100644
--- a/cde/programs/nsgmls/nsgmls.C
+++ b/cde/programs/nsgmls/nsgmls.C
@@ -38,7 +38,7 @@
 #include "sptchar.h"
 #include "macros.h"
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <iostream>
 #include <fstream>
 #else
@@ -84,7 +84,7 @@ public:
 		    const AppChar *filename,
 		    const StringC &filenameStr,
 		    const OutputCodingSystem *,
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 		    ::Messenger *messenger);
 #else
 		    Messenger *messenger);
@@ -94,7 +94,7 @@ public:
   void truncateOutput();
   void allLinkTypesActivated();
 private:
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
   ::Messenger *messenger_;
 #else
   Messenger *messenger_;
@@ -248,7 +248,7 @@ XRastEventHandler::XRastEventHandler(SgmlParser *parser,
 				     const AppChar *filename,
 				     const StringC &filenameStr,
 				     const OutputCodingSystem *codingSystem,
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 				     ::Messenger *messenger)
 #else
 				     ::Messenger *messenger)
diff --git a/cde/programs/nsgmls/xnew.h b/cde/programs/nsgmls/xnew.h
index caffae69d..96596397f 100644
--- a/cde/programs/nsgmls/xnew.h
+++ b/cde/programs/nsgmls/xnew.h
@@ -39,7 +39,7 @@ void set_new_handler(VFP);
 
 #else /* not SP_NEW_H_MISSING */
 
-#if defined(linux)
+#if defined(linux) || defined(CSRG_BASED)
 #include <new>
 #else
 #include <new.h>