diff --git a/cde/programs/dtpad/dtpad.c b/cde/programs/dtpad/dtpad.c
index 12779a29c..aecdb54f1 100644
--- a/cde/programs/dtpad/dtpad.c
+++ b/cde/programs/dtpad/dtpad.c
@@ -57,6 +57,8 @@
 #include "signal.h"
 #include "X11/Xutil.h"
 #include <X11/StringDefs.h>
+#include <Dt/HourGlass.h>
+#include <Dt/Wsm.h>
 
 #ifndef NO_MESSAGE_CATALOG
 # define TRUE 1
diff --git a/cde/programs/dtpad/fileCB.c b/cde/programs/dtpad/fileCB.c
index ee43126aa..b75677971 100644
--- a/cde/programs/dtpad/fileCB.c
+++ b/cde/programs/dtpad/fileCB.c
@@ -58,6 +58,7 @@
 **********************************<+>*************************************/
 #include <Dt/DtpadM.h>
 #include <Dt/Action.h>
+#include <Dt/HourGlass.h>
 
 #include <Xm/XmPrivate.h> /* _XmStringUngenerate */
 
@@ -65,6 +66,9 @@
 
 extern int numActivePads;  /* declared in main.c */
 
+void TTfailPendingSave(Editor *pPad);
+void SetSaveAsDirAndFile(Editor *pPad);
+
 
 /************************************************************************
  *			Forward Declarations
diff --git a/cde/programs/dtpad/fileIo.c b/cde/programs/dtpad/fileIo.c
index bf1450aa8..a7904af4d 100644
--- a/cde/programs/dtpad/fileIo.c
+++ b/cde/programs/dtpad/fileIo.c
@@ -57,6 +57,7 @@
 #include <sys/wait.h>
 #include <Xm/TextF.h>
 #include <Xm/LabelG.h>
+#include <Dt/HourGlass.h>
 
 
 /************************************************************************
diff --git a/cde/programs/dtpad/main.c b/cde/programs/dtpad/main.c
index 583035042..1e485631c 100644
--- a/cde/programs/dtpad/main.c
+++ b/cde/programs/dtpad/main.c
@@ -100,6 +100,8 @@
 #include <sys/wait.h>
 #include <Xm/MwmUtil.h>
 #include <Dt/EnvControlP.h>
+#include <Dt/Lock.h>
+#include <Dt/Action.h>
 #include <Dt/DtpadM.h>
 #include <Dt/MsgCatP.h>
 #include "X11/Xutil.h"
@@ -121,6 +123,9 @@ static const char catalogName[] = "dtpad";
 # define _DTPAD_CAT_NAME catalogName
 #endif
 
+void SetWorkSpaceHints(Widget shell, char *workspaces);
+
+
 
 /************************************************************************
  *			Global Definitions
diff --git a/cde/programs/dtpad/ttMsgSupport.c b/cde/programs/dtpad/ttMsgSupport.c
index 93fad1847..54e8e857c 100644
--- a/cde/programs/dtpad/ttMsgSupport.c
+++ b/cde/programs/dtpad/ttMsgSupport.c
@@ -56,9 +56,16 @@
 **
 **************************************************************************
 **********************************<+>*************************************/
+
+/* for asprintf */
+#if defined(__linux__) || defined(CSRG_BASED)
+# define _GNU_SOURCE
+#endif
+
 #include "dtpad.h"
 #include <dirent.h>
 #include <Dt/DtpadM.h>
+#include <Dt/HourGlass.h>
 
 #define TIMEOUT_FACTOR	1000