diff --git a/cde/configure.ac b/cde/configure.ac
index f0c9ea775..993e7e645 100644
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -270,12 +270,14 @@ AC_SUBST(TIRPCINC)
 AC_SUBST(TIRPCLIB)
 AC_CHECK_LIB(Xinerama, XineramaQueryScreens, ,[AC_MSG_ERROR([libXinerama not found])])
 
-dnl Setup XTOOLLIB
-XTOOLLIB=""
+dnl Setup XTOOLLIB - we do it in this specific order to avoid ordering
+dnl issues
+XTOOLLIB="$X_LIBS"
 AC_CHECK_LIB(X11, XOpenDisplay, [XTOOLLIB="-lX11"])
 AC_CHECK_LIB(Xt, XtInitialize, [XTOOLLIB="-lXt ${XTOOLLIB}"])
 AC_CHECK_LIB(ICE, IceCloseConnection, [XTOOLLIB="-lICE ${XTOOLLIB}"])
 AC_CHECK_LIB(SM, SmcOpenConnection, [XTOOLLIB="-lSM ${XTOOLLIB}"])
+AC_CHECK_LIB(Xm, XmTextSetString, [XTOOLLIB="-lXm ${XTOOLLIB}"])
 AC_SUBST([XTOOLLIB])
 
 dnl Add -DUSE_XINERAMA to SOURCE_CPP_DEFINES for now.  Eventually this
@@ -390,6 +392,8 @@ programs/dtsession/Makefile
 
 programs/dthello/Makefile
 
+programs/dtstyle/Makefile
+
 ])
 
 AC_OUTPUT
diff --git a/cde/programs/dtstyle/I18nEnv.c b/cde/programs/dtstyle/I18nEnv.c
index 987ecc577..cd26ade4a 100644
--- a/cde/programs/dtstyle/I18nEnv.c
+++ b/cde/programs/dtstyle/I18nEnv.c
@@ -50,7 +50,7 @@
 #include <X11/Xlib.h>
 #include <X11/Intrinsic.h>
 
-#include <DtHelp/LocaleXlate.h>  /* for locale equivalence between platforms */
+#include <Dt/LocaleXlate.h>  /* for locale equivalence between platforms */
 
 #include "Main.h"
 #include "I18nEnv.h"
diff --git a/cde/programs/dtstyle/Makefile.am b/cde/programs/dtstyle/Makefile.am
index 532d25f53..a794a37cb 100644
--- a/cde/programs/dtstyle/Makefile.am
+++ b/cde/programs/dtstyle/Makefile.am
@@ -2,39 +2,44 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_PROGRAMS = dtstyle
 
-noinst_PROGRAMS = Dtstyle Dtstyle.iso Backdrops Backdrops.iso Palettes \
-		  Palettes.iso
+dtstyle_CPPFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"	\
+	-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" -I../dthelp	\
+	-I$(DT_INCDIR) $(TIRPCINC) 
 
-dtstyle_CPPFLAGS = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-		 -DCDE_INSTALLATION_TOP=\"${prefix}\" -I../dthelp $(TIRPCINC)
+dtstyle_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
-dtstyle_LDADD = $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) $(LIBSVC) $(LIBTT) \
-		-lm $(XTOOLLIB) ${X_LIBS}
-
-if AIX
-dtstyle_CFLAGS += -DANSICPP -Aa -D_POSIX_SOURCE
-endif
+dtstyle_SOURCES = Main.c MainWin.c Font.c Audio.c Startup.c Mouse.c	\
+		  SaveRestore.c Backdrop.c Screen.c Keyboard.c		\
+		  ColorMain.c ColorPalette.c ColorFile.c ColorEdit.c	\
+		  Resource.c Protocol.c Dtwm.c Help.c HelpCB.c		\
+		  I18nMain.c I18nEnv.c I18nUtil.c Audio.h ColorMain.h	\
+		  Help.h Keyboard.h OWsync.h Screen.h Backdrop.h	\
+		  ColorPalette.h I18nEnv.h Main.h Protocol.h		\
+		  Startup.h ColorEdit.h Dtwm.h I18nMain.h MainWin.h	\
+		  Resource.h ColorFile.h Font.h I18nUtil.h Mouse.h	\
+		  SaveRestore.h
 
 if SOLARIS
-EXTRA_SRC = OWsync.c
+dtstyle_SOURCES += OWsync.c
 endif
 
-dtstyle_SOURCES = Main.c MainWin.c Font.c Audio.c \
-		  Startup.c Mouse.c SaveRestore.c Backdrop.c Screen.c \
-		  Keyboard.c ColorMain.c ColorPalette.c ColorFile.c \
-		  ColorEdit.c Resource.c Protocol.c Dtwm.c Help.c HelpCB.c \
-		  I18nMain.c I18nEnv.c I18nUtil.c $(EXTRA_SRC)
+LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=${prefix}
 
-SCRIPTFLAGS = -DCDE_INSTALLATION_TOP=${prefix}
+CPP_TARGETS = Dtstyle Backdrops Palettes
 
-CPPTARGET = Dtstyle
-CPPSRC = Dtstyle.src
-include $(srcdir)/include/cppfile.tmpl
+BUILT_SOURCES = $(CPP_TARGETS)
+CLEANFILES = $(CPP_TARGETS)
+
+Dtstyle: Dtstyle.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+Backdrops: Backdrops.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
+
+Palettes: Palettes.src
+	$(RM) $@
+	$(GENCPP) -P -DXCOMM=# $(LOCAL_CPP_DEFINES) $< > $@
 
-CPPTARGET = Palettes
-CPPSRC = Palettes.src
-include $(srcdir)/include/cppfile.tmpl
 
-CPPTARGET = Backdrops
-CPPSRC = Backdrops.src
-include $(srcdir)/include/cppfile.tmpl