diff --git a/cde/programs/dtstyle/Audio.c b/cde/programs/dtstyle/Audio.c
index f8c32ea35..c22522247 100644
--- a/cde/programs/dtstyle/Audio.c
+++ b/cde/programs/dtstyle/Audio.c
@@ -58,6 +58,7 @@
 
 #include <Dt/Message.h>
 #include <Dt/HourGlass.h>
+#include <Dt/Wsm.h>
 
 #include "Help.h"
 #include "Main.h"
diff --git a/cde/programs/dtstyle/Backdrop.c b/cde/programs/dtstyle/Backdrop.c
index 5dfdd1f87..42ab5bddb 100644
--- a/cde/programs/dtstyle/Backdrop.c
+++ b/cde/programs/dtstyle/Backdrop.c
@@ -72,6 +72,7 @@
 #include <Dt/HourGlass.h>
 #include <Dt/Wsm.h>
 #include <Dt/UserMsg.h>
+#include <Dt/WsmP.h>
 
 #include "Help.h"
 #include "Main.h"
@@ -81,6 +82,7 @@
 /* include extern functions              */
 /*+++++++++++++++++++++++++++++++++++++++*/
 #include "Backdrop.h"
+#include "Dtwm.h"
 
 
 /*+++++++++++++++++++++++++++++++++++++++*/
@@ -1233,13 +1235,13 @@ saveBackdrop(
         x -= vendorExt->vendor.xOffset;
         y -= vendorExt->vendor.yOffset;
 
-        sprintf(bufr, "%s*backdropsDialog.x: %d\n", bufr, x);
-        sprintf(bufr, "%s*backdropsDialog.y: %d\n", bufr, y);
-        sprintf(bufr, "%s*backdropsDialog.width: %d\n", bufr, width);
-        sprintf(bufr, "%s*backdropsDialog.height: %d\n", bufr, height);
-        sprintf(bufr, "%s*backdropsDialog.selectedItemNum: %d\n", bufr, 
+        snprintf(bufr, 1024, "%s*backdropsDialog.x: %d\n", bufr, x);
+        snprintf(bufr, 1024, "%s*backdropsDialog.y: %d\n", bufr, y);
+        snprintf(bufr, 1024, "%s*backdropsDialog.width: %d\n", bufr, width);
+        snprintf(bufr, 1024, "%s*backdropsDialog.height: %d\n", bufr, height);
+        snprintf(bufr, 1024, "%s*backdropsDialog.selectedItemNum: %d\n", bufr,
                 backdrops.selected);
-        sprintf(bufr, "%s*backdropsDialog.selectedItem: %s\n", bufr, 
+        snprintf(bufr, 1024, "%s*backdropsDialog.selectedItem: %s\n", bufr,
                 backdrops.bitmapNames[backdrops.selected]);
         if(-1 == write (fd, bufr, strlen(bufr))) {
 			perror(strerror(errno));
diff --git a/cde/programs/dtstyle/ColorEdit.c b/cde/programs/dtstyle/ColorEdit.c
index 41140738e..bc90c1d7c 100644
--- a/cde/programs/dtstyle/ColorEdit.c
+++ b/cde/programs/dtstyle/ColorEdit.c
@@ -60,6 +60,8 @@
 #include <Dt/DialogBox.h>
 #include <Dt/TitleBox.h>
 
+#include <Dt/Wsm.h>
+
 #include <Dt/UserMsg.h>
 
 #include "Help.h"
diff --git a/cde/programs/dtstyle/ColorFile.c b/cde/programs/dtstyle/ColorFile.c
index a20703730..b638f5045 100644
--- a/cde/programs/dtstyle/ColorFile.c
+++ b/cde/programs/dtstyle/ColorFile.c
@@ -196,11 +196,7 @@ void
 ReadPalette(
         char *directory,
         char *in_filename,
-#if NeedWidePrototypes
         int length )
-#else
-        short length )
-#endif
 {
    char *filename;
    int  i, fd, nbytes;
diff --git a/cde/programs/dtstyle/ColorFile.h b/cde/programs/dtstyle/ColorFile.h
index fb839cc95..6c90e3ca9 100644
--- a/cde/programs/dtstyle/ColorFile.h
+++ b/cde/programs/dtstyle/ColorFile.h
@@ -32,7 +32,7 @@
  **  file
  **
  **
- **  (c) Copyright Hewlett-Packard Company, 1990.  
+ **  (c) Copyright Hewlett-Packard Company, 1990.
  **
  **
  **
@@ -44,20 +44,16 @@
 /* External variables */
 
 #define DT_PAL_DIR  "/.dt/palettes/"
-/* 
-extern char *DT_PAL_DIR = "/.dt/palettes/"; 
+/*
+extern char *DT_PAL_DIR = "/.dt/palettes/";
 */
 
 /* External Interface */
 
 
-extern void ReadPalette( char *directory, 
+extern void ReadPalette( char *directory,
 			 char *in_filename,
-#if NeedWidePrototypes
 			 int length );
-#else
-			 short length );
-#endif
 extern void AddSystemPath( void );
 extern void AddDirectories( char *text );
 extern void AddHomePath( void );
@@ -72,6 +68,10 @@ extern void restoreBackdrop( Widget shell, XrmDatabase db) ;
 extern void saveBackdrop( int fd) ;
 extern void CheckFileType( void );
 
+extern void ReadInPalettes(char *text);
+int WriteOutPalette(char *paletteName);
+Boolean RemovePalette(void);
+int WriteOutDesc(palette *tmp_palette);
 
 #endif /* _colorfile_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/cde/programs/dtstyle/ColorMain.c b/cde/programs/dtstyle/ColorMain.c
index 05b4b4c10..bfe900831 100644
--- a/cde/programs/dtstyle/ColorMain.c
+++ b/cde/programs/dtstyle/ColorMain.c
@@ -70,6 +70,7 @@
 #include <Dt/TitleBox.h>
 
 #include <Dt/HourGlass.h>
+#include <Dt/Wsm.h>
 
 #include "Help.h"
 #include "Main.h"
@@ -77,6 +78,7 @@
 #include "ColorMain.h"
 #include "ColorFile.h"
 #include "ColorEdit.h"
+#include "ColorPalette.h"
 
 #ifdef sun
 #include "OWsync.h"
@@ -87,6 +89,8 @@
 /*+++++++++++++++++++++++++++++++++++++++*/
 
 
+
+
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* Local #defines                        */
 /*+++++++++++++++++++++++++++++++++++++++*/
diff --git a/cde/programs/dtstyle/Dtwm.c b/cde/programs/dtstyle/Dtwm.c
index a9d62f987..f9c5aebdb 100644
--- a/cde/programs/dtstyle/Dtwm.c
+++ b/cde/programs/dtstyle/Dtwm.c
@@ -76,6 +76,10 @@
 /*+++++++++++++++++++++++++++++++++++++++*/
 #include "Dtwm.h"
 
+// DtUtil1/WmRestart.c
+int _DtWmRestartNoConfirm (Display *display, Window root);
+
+
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* Local #defines                        */
 /*+++++++++++++++++++++++++++++++++++++++*/
diff --git a/cde/programs/dtstyle/Dtwm.h b/cde/programs/dtstyle/Dtwm.h
index f8c549539..47b7985ea 100644
--- a/cde/programs/dtstyle/Dtwm.h
+++ b/cde/programs/dtstyle/Dtwm.h
@@ -38,8 +38,8 @@
  **
  ****************************************************************************
  ************************************<+>*************************************/
-#ifndef _screen_h
-#define _screen_h
+#ifndef _dtwm_h
+#define _dtwm_h
 
 /* External Interface */
 
@@ -49,5 +49,5 @@ extern void restoreDtwm( Widget shell, XrmDatabase db) ;
 extern void saveDtwm( int fd) ;
 
 
-#endif /* _screen_h */
+#endif /* _dtwm_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/cde/programs/dtstyle/Font.c b/cde/programs/dtstyle/Font.c
index ff509de62..c4ea13dd0 100644
--- a/cde/programs/dtstyle/Font.c
+++ b/cde/programs/dtstyle/Font.c
@@ -64,11 +64,14 @@
 #include <Dt/Message.h>
 #include <Dt/SessionM.h>
 #include <Dt/HourGlass.h>
-
+#include <Dt/Wsm.h>
+#include <Dt/GetDispRes.h>
 #include <string.h>
 #include <errno.h>
 #include "Help.h"
 #include "Main.h"
+#include "Resource.h"
+#include "Protocol.h"
 #include "SaveRestore.h"
 
 /*+++++++++++++++++++++++++++++++++++++++*/
diff --git a/cde/programs/dtstyle/Help.c b/cde/programs/dtstyle/Help.c
index c57eac3aa..42fbd19bd 100644
--- a/cde/programs/dtstyle/Help.c
+++ b/cde/programs/dtstyle/Help.c
@@ -50,6 +50,8 @@
 #include <Dt/Help.h>
 #include <Dt/HelpDialog.h>
 
+#include <Dt/Wsm.h>
+
 #include "Main.h"
 #include "Help.h"
 
diff --git a/cde/programs/dtstyle/Help.h b/cde/programs/dtstyle/Help.h
index ade69454d..459b4d275 100644
--- a/cde/programs/dtstyle/Help.h
+++ b/cde/programs/dtstyle/Help.h
@@ -232,6 +232,13 @@ extern void HelpCloseCB(
                             Widget w,
                             caddr_t client_data,
                             caddr_t call_data ) ;
+extern void Help(
+    char *helpVolume,
+    char *locationId);
+
+extern void DisplayHelp(
+    char *helpVolume,
+    char *locationId);
 
 
 #endif /*  _font_h */
diff --git a/cde/programs/dtstyle/I18nMain.c b/cde/programs/dtstyle/I18nMain.c
index b468ee179..5e52a2582 100644
--- a/cde/programs/dtstyle/I18nMain.c
+++ b/cde/programs/dtstyle/I18nMain.c
@@ -59,6 +59,8 @@
 #include <Xm/SeparatoG.h>
 #include <Xm/VendorSEP.h>
 #include <Xm/MessageB.h>
+#include <Xm/ComboBox.h>
+#include <Xm/List.h>
 
 #include <Dt/DialogBox.h>
 #include <Dt/Icon.h>
diff --git a/cde/programs/dtstyle/I18nUtil.c b/cde/programs/dtstyle/I18nUtil.c
index 853f05c33..884504538 100644
--- a/cde/programs/dtstyle/I18nUtil.c
+++ b/cde/programs/dtstyle/I18nUtil.c
@@ -26,7 +26,7 @@
  * (c) Copyright 1996 Hewlett-Packard Company.
  * (c) Copyright 1996 International Business Machines Corp.
  * (c) Copyright 1996 Sun Microsystems, Inc.
- * (c) Copyright 1996 Novell, Inc. 
+ * (c) Copyright 1996 Novell, Inc.
  * (c) Copyright 1996 FUJITSU LIMITED.
  * (c) Copyright 1996 Hitachi.
  */
@@ -68,7 +68,7 @@ static char *trim_line (char * );
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* Internal Variables                    */
 /*+++++++++++++++++++++++++++++++++++++++*/
- 
+
 	/* ********  file reading  ******** */
 
 static int	tag_line_num = 0;
@@ -86,7 +86,7 @@ void	start_tag_line(
 	tag_linebuf[0] = 0;
 	tag_file = fname;
     } else {
-	if (tag_linebuf) 
+	if (tag_linebuf)
 	    XtFree(tag_linebuf);
 	tag_linebuf = tag_file = 0;
     }
@@ -95,7 +95,7 @@ void	start_tag_line(
 
 int	read_tag_line(
     FILE	*fp,
-    char	**tagp, 
+    char	**tagp,
     char        **valp
 )
 {
@@ -137,7 +137,7 @@ trim_line(
     return ptr;		/* return lastp > ptr ? ptr : NULL; */
 }
 
-int	
+int
 str_to_int(
     char *ptr,
     int  *val
@@ -155,7 +155,7 @@ str_to_int(
 }
 
 
-Bool	
+Bool
 str_to_bool(
     char  *ptr,
     Bool  def_val
@@ -184,4 +184,3 @@ str_to_bool(
     }
     return def_val;
 }
-
diff --git a/cde/programs/dtstyle/I18nUtil.h b/cde/programs/dtstyle/I18nUtil.h
index caaa5f202..97a8cf449 100644
--- a/cde/programs/dtstyle/I18nUtil.h
+++ b/cde/programs/dtstyle/I18nUtil.h
@@ -69,5 +69,13 @@
 	for ((p)++; *(p) && !is_white(*(p)); (p)++) ; *(p)++ = 0; skip_white(p)
 
 
+void start_tag_line(char  *fname);
+int read_tag_line(FILE *fp, char **tagp, char **valp);
+int str_to_int(char *ptr, int  *val);
+
+
+
+
+
 #endif /* _i18nUtil_h */
 /* DON'T ADD ANYTHING AFTER THIS #endif */
diff --git a/cde/programs/dtstyle/Keyboard.c b/cde/programs/dtstyle/Keyboard.c
index 84c177c03..c67c4cb53 100644
--- a/cde/programs/dtstyle/Keyboard.c
+++ b/cde/programs/dtstyle/Keyboard.c
@@ -60,6 +60,7 @@
 
 #include <Dt/Message.h>
 #include <Dt/HourGlass.h>
+#include <Dt/Wsm.h>
 
 #include "Help.h"
 #include "Main.h"
diff --git a/cde/programs/dtstyle/Main.c b/cde/programs/dtstyle/Main.c
index 9349c1951..20f8d1e0c 100644
--- a/cde/programs/dtstyle/Main.c
+++ b/cde/programs/dtstyle/Main.c
@@ -69,6 +69,7 @@
 #include <Xm/XmP.h>
 #include <Xm/MessageB.h>
 
+#include <Dt/Dt.h>
 #include <Dt/GetDispRes.h>
 #include <Dt/EnvControlP.h>
 #include <Dt/Message.h>
@@ -77,12 +78,19 @@
 #include <Dt/Wsm.h>
 #include <Dt/DtNlUtils.h>
 #include <Dt/DtosP.h>
+#include <Dt/Lock.h>
 
 #include "MainWin.h"
 #include "ColorMain.h"
 #include "ColorFile.h"
 #include "Resource.h"
 #include "Protocol.h"
+#include "SaveRestore.h"
+#include "ColorPalette.h"
+
+void loadDatabase(void); // ColorMain.c
+void ListenForWorkspaceChange(void); // Protocol.c
+
 
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* include extern functions              */
diff --git a/cde/programs/dtstyle/MainWin.c b/cde/programs/dtstyle/MainWin.c
index a49e4478c..9bab52b84 100644
--- a/cde/programs/dtstyle/MainWin.c
+++ b/cde/programs/dtstyle/MainWin.c
@@ -72,8 +72,18 @@
 
 #include <Dt/HourGlass.h>
 #include <Dt/UserMsg.h>
-    
+
 #include "Main.h"
+#include "ColorMain.h"
+#include "Backdrop.h"
+#include "Keyboard.h"
+#include "Mouse.h"
+#include "Audio.h"
+#include "Screen.h"
+#include "Dtwm.h"
+#include "Startup.h"
+#include "I18nMain.h"
+
 #include "Help.h"
 #include "SaveRestore.h"
 
diff --git a/cde/programs/dtstyle/Mouse.c b/cde/programs/dtstyle/Mouse.c
index 24875d93b..13eb5de5b 100644
--- a/cde/programs/dtstyle/Mouse.c
+++ b/cde/programs/dtstyle/Mouse.c
@@ -59,6 +59,8 @@
 #include <Dt/SessionM.h>
 #include <Dt/HourGlass.h>
 #include <Dt/UserMsg.h>
+#include <Dt/Wsm.h>
+#include <Dt/Session.h>
 
 #include "Help.h"
 #include "Main.h"
@@ -68,6 +70,8 @@
 /* include extern functions              */
 /*+++++++++++++++++++++++++++++++++++++++*/
 #include "Mouse.h"
+#include "Protocol.h"
+
 
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* Local #defines                        */
diff --git a/cde/programs/dtstyle/Protocol.c b/cde/programs/dtstyle/Protocol.c
index 783ce6436..591320eb4 100644
--- a/cde/programs/dtstyle/Protocol.c
+++ b/cde/programs/dtstyle/Protocol.c
@@ -64,6 +64,7 @@
 #include "MainWin.h"
 #include "SaveRestore.h"
 #include "Main.h"
+#include "Backdrop.h"
 
 #include <Dt/Message.h>
 #include <Dt/UserMsg.h>
diff --git a/cde/programs/dtstyle/Protocol.h b/cde/programs/dtstyle/Protocol.h
index 96605b9ec..fc72790c0 100644
--- a/cde/programs/dtstyle/Protocol.h
+++ b/cde/programs/dtstyle/Protocol.h
@@ -91,6 +91,10 @@ extern void SmNewFontSettings(
 
 extern void SmNewPreeditSettings( 
                                 char *preeditResourceString) ;
+extern void SmDefaultPointerSettings(void);
+void SmNewSaverTime(int saverTime);
+void SmNewSaverSettings(int saverTime, int lockTime, int cycleTime,
+                        char *selsaversList);
 
 
 #endif /* _protocol_h */
diff --git a/cde/programs/dtstyle/SaveRestore.c b/cde/programs/dtstyle/SaveRestore.c
index d5ed72e1a..0eb590c7f 100644
--- a/cde/programs/dtstyle/SaveRestore.c
+++ b/cde/programs/dtstyle/SaveRestore.c
@@ -62,6 +62,7 @@
 
 #include <Dt/HourGlass.h>
 #include <Dt/UserMsg.h>
+#include <Dt/Session.h>
 
 #include "Main.h"
 
@@ -69,6 +70,9 @@
 /* include extern functions              */
 /*+++++++++++++++++++++++++++++++++++++++*/
 #include "SaveRestore.h"
+#include "Protocol.h"
+#include "Dtwm.h"
+#include "MainWin.h"
 
 /*+++++++++++++++++++++++++++++++++++++++*/
 /* Local #defines                        */
diff --git a/cde/programs/dtstyle/Screen.c b/cde/programs/dtstyle/Screen.c
index 0061edec9..0a429d82c 100644
--- a/cde/programs/dtstyle/Screen.c
+++ b/cde/programs/dtstyle/Screen.c
@@ -72,6 +72,8 @@
 #include <Dt/TitleBox.h>
 #include <Dt/Message.h>
 #include <Dt/HourGlass.h>
+#include <Dt/Wsm.h>
+#include <Dt/GetDispRes.h>
 
 #include "Help.h"
 #include "Main.h"
diff --git a/cde/programs/dtstyle/Startup.c b/cde/programs/dtstyle/Startup.c
index ce99c831a..f1e028590 100644
--- a/cde/programs/dtstyle/Startup.c
+++ b/cde/programs/dtstyle/Startup.c
@@ -63,6 +63,7 @@
 
 #include <Dt/Message.h>
 #include <Dt/HourGlass.h>
+#include <Dt/Wsm.h>
 
 #include "Help.h"
 #include "Main.h"