diff --git a/cde/programs/dthelp/Makefile.am b/cde/programs/dthelp/Makefile.am
index fe5465fb0..810da52f5 100644
--- a/cde/programs/dthelp/Makefile.am
+++ b/cde/programs/dthelp/Makefile.am
@@ -1,3 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = parser dthelpview dthelpdemo dthelpgen dthelpprint
+SUBDIRS = dthelpview dthelpgen dthelpdemo
+
+#NOTYET  = parser dthelpprint
diff --git a/cde/programs/dthelp/dthelpdemo/Makefile.am b/cde/programs/dthelp/dthelpdemo/Makefile.am
new file mode 100644
index 000000000..379300cf0
--- /dev/null
+++ b/cde/programs/dthelp/dthelpdemo/Makefile.am
@@ -0,0 +1,10 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+bin_PROGRAMS = dthelpdemo
+
+dthelpdemo_CPPFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
+		   -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
+
+dthelpdemo_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
+
+dthelpdemo_SOURCES = Main.c HourGlass.c HelpCache.c
diff --git a/cde/programs/dthelp/dthelpgen/Makefile.am b/cde/programs/dthelp/dthelpgen/Makefile.am
index dd7be1f44..548948758 100644
--- a/cde/programs/dthelp/dthelpgen/Makefile.am
+++ b/cde/programs/dthelp/dthelpgen/Makefile.am
@@ -4,9 +4,10 @@ bin_PROGRAMS = dthelpgen
 
 bin_SCRIPTS = dthelpgen.dtsh
 
-dthelpgen_CPPFLAGS = -I.. -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-		   -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
+dthelpgen_CPPFLAGS = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
+		   -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
+		   -I ../../../lib/DtHelp
 
-dthelpgen_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS}
+dthelpgen_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 dthelpgen_SOURCES = helpgen.c
diff --git a/cde/programs/dthelp/dthelpgen/helpgen.c b/cde/programs/dthelp/dthelpgen/helpgen.c
index 882369abb..d4cb64a1b 100644
--- a/cde/programs/dthelp/dthelpgen/helpgen.c
+++ b/cde/programs/dthelp/dthelpgen/helpgen.c
@@ -41,13 +41,13 @@
 #include <Dt/Help.h>
 #include <Dt/EnvControlP.h>
 
-#include "HelpP.h"        /* in DtHelp library */
+#include "Dt/HelpP.h"        /* in DtHelp library */
 #include "GenUtilsP.h"    /* in DtHelp library */
 #include "ObsoleteP.h"    /* in DtHelp library */
-#include "bufioI.h"       /* for AccessI.h     */
-#include "Access.h"       /* in DtHelp library */
-#include "AccessP.h"      /* in DtHelp library */
-#include "AccessI.h"      /* in DtHelp library */
+#include "DtI/bufioI.h"       /* for AccessI.h     */
+#include "DtI/Access.h"       /* in DtHelp library */
+#include "DtI/AccessP.h"      /* in DtHelp library */
+#include "DtI/AccessI.h"      /* in DtHelp library */
 #include "AccessCCDFI.h"  /* in DtHelp library */
 #include "StringFuncsI.h" /* in DtHelp library */
 
diff --git a/cde/programs/dthelp/dthelpview/Main.c b/cde/programs/dthelp/dthelpview/Main.c
index 8180dc9b4..1b6d04d94 100644
--- a/cde/programs/dthelp/dthelpview/Main.c
+++ b/cde/programs/dthelp/dthelpview/Main.c
@@ -74,7 +74,7 @@
 /* Local Includes */
 
 #include <DtI/HelposI.h>
-#include <DtI/HelpP.h>
+#include <Dt/HelpP.h>
 #include <DtI/FileUtilsI.h>
 #include "Main.h"
 #include "UtilI.h"
diff --git a/cde/programs/dthelp/dthelpview/Makefile.am b/cde/programs/dthelp/dthelpview/Makefile.am
index a6de404d0..1e51688e1 100644
--- a/cde/programs/dthelp/dthelpview/Makefile.am
+++ b/cde/programs/dthelp/dthelpview/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = dthelpview
 
 dthelpview_CFLAGS = -D_BMS
 
-dthelpview_LDADD = $(LIBHELP) $(LIBSVC) $(LIBTT) $(XTOOLLIB) ${X_LIBS}
+dthelpview_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 dthelpview_SOURCES = Main.c ManPage.c Util.c
diff --git a/cde/programs/dthelp/dthelpview/Util.c b/cde/programs/dthelp/dthelpview/Util.c
index b5608d975..c8c7c7da3 100644
--- a/cde/programs/dthelp/dthelpview/Util.c
+++ b/cde/programs/dthelp/dthelpview/Util.c
@@ -58,7 +58,7 @@
 #include <Xm/Text.h>
 
 #include <Dt/Help.h>
-#include <DtI/HelpP.h>
+#include <Dt/HelpP.h>
 #include <Dt/HelpDialog.h>
 #include <Dt/HelpQuickD.h>