diff --git a/cde/programs/dtwm/Imakefile b/cde/programs/dtwm/Imakefile
index 82a67739d..50332467c 100644
--- a/cde/programs/dtwm/Imakefile
+++ b/cde/programs/dtwm/Imakefile
@@ -9,7 +9,7 @@ MWMDEFINES = $(VFORK_DEFINE) -DLARGECURSORS -DR2_COMPAT -DOPAQUE -DSHAPE \
 	-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
 	-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
 
-DTWMDEFINES = -DWSM -DPANELIST
+DTWMDEFINES = -DWSM
 
 DEPEND_DEFINES = $(DEPENDDEFINES)
 DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
diff --git a/cde/programs/dtwm/README b/cde/programs/dtwm/README
index 0c0da5897..0fd483736 100644
--- a/cde/programs/dtwm/README
+++ b/cde/programs/dtwm/README
@@ -135,9 +135,6 @@ header file include flags, and macros (e.g. ABS).
 	HP Panacom division modification to support clients running
 	in their X terminals.
 
-    PANELIST
-	Front panel code.
-
     PARANOID
 	If enabled, the a server grab is done around a property read. 
 	(This is probably not necessary.)
diff --git a/cde/programs/dtwm/WmCDInfo.c b/cde/programs/dtwm/WmCDInfo.c
index 38cb3fbc2..81a327c45 100644
--- a/cde/programs/dtwm/WmCDInfo.c
+++ b/cde/programs/dtwm/WmCDInfo.c
@@ -185,13 +185,11 @@ unsigned int UpperBorderWidth (ClientData *pcd)
     else if (decoration & MWM_DECOR_BORDER)
     {
 	uswidth = FRAME_BORDER_WIDTH(pcd);
-#ifdef PANELIST
 	if((pcd->clientFlags & FRONT_PANEL_BOX) &&
 	   (uswidth > 0))
 	{
 	    uswidth -= 1;
 	}
-#endif /* PANELIST */
     }
     else if ((decoration & MWM_DECOR_TITLE) ||
 	     (pcd->matteWidth > 0))
diff --git a/cde/programs/dtwm/WmCDecor.c b/cde/programs/dtwm/WmCDecor.c
index 58a1cb1ed..40245f8dc 100644
--- a/cde/programs/dtwm/WmCDecor.c
+++ b/cde/programs/dtwm/WmCDecor.c
@@ -751,13 +751,11 @@ void GenerateFrameDisplayLists (ClientData *pcd)
 	}
 	else 
 	{
-#ifdef PANELIST
             if((pcd->dtwmBehaviors & DtWM_BEHAVIOR_PANEL) &&
                (pcd->clientDecoration == WM_DECOR_BORDER))
             {
                 insideBevel = 0;
             }
-#endif /* PANELIST */
 	    BevelRectangle (pcd->pclientBottomShadows, 	/* inside */
 			    pcd->pclientTopShadows, 
 			    (int)(pcd->frameInfo.lowerBorderWidth-insideBevel), 
@@ -2276,7 +2274,6 @@ ShowInactiveClientFrame (ClientData *pcd)
 void RegenerateClientFrame (ClientData *pcd)
 {
     unsigned long decor = pcd->decor;
-#ifdef PANELIST
     /* 
      * If an embedded client, there is no frame.
      */
@@ -2287,7 +2284,6 @@ void RegenerateClientFrame (ClientData *pcd)
 	    return;
 	}
     }
-#endif /* PANELIST */
 
     /* recompute frame information */
     SetFrameInfo (pcd);
diff --git a/cde/programs/dtwm/WmCEvent.c b/cde/programs/dtwm/WmCEvent.c
index 1483ff7d5..0ee0adfd3 100644
--- a/cde/programs/dtwm/WmCEvent.c
+++ b/cde/programs/dtwm/WmCEvent.c
@@ -55,9 +55,7 @@ static char rcsid[] = "$XConsortium: WmCEvent.c /main/10 1996/08/09 15:05:39 rsw
 #include "WmFunction.h"
 #include "WmIDecor.h"
 #include "WmKeyFocus.h"
-#ifdef PANELIST
 #include "WmPanelP.h"
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmMenu.h"
 #include "WmProperty.h"
@@ -339,7 +337,6 @@ Boolean WmDispatchClientEvent (XEvent *event)
 			BaseWinExposureProc (pCD);
 		    }
 		}
-#ifdef PANELIST
 		else if (pCD->clientFlags & FRONT_PANEL_BOX)
 		{
 	        /*
@@ -351,7 +348,6 @@ Boolean WmDispatchClientEvent (XEvent *event)
 		 */
 		    dispatchEvent = True;
 		}
-#endif /* PANELIST */
 	    }
 	    break;
 	}
diff --git a/cde/programs/dtwm/WmEvent.c b/cde/programs/dtwm/WmEvent.c
index b1733d0d8..66d7288c5 100644
--- a/cde/programs/dtwm/WmEvent.c
+++ b/cde/programs/dtwm/WmEvent.c
@@ -59,9 +59,7 @@ static char rcsid[] = "$XConsortium: WmEvent.c /main/7 1996/11/20 15:27:47 rswis
 #include "WmColormap.h"
 #include "WmFunction.h"
 #include "WmKeyFocus.h"
-#ifdef PANELIST
 #include "WmPanelP.h"  /* for typedef in WmManage.h */
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmMenu.h"
 #ifdef WSM
@@ -70,12 +68,10 @@ static char rcsid[] = "$XConsortium: WmEvent.c /main/7 1996/11/20 15:27:47 rswis
 #endif /* WSM */
 #include "WmWinInfo.h"
 #include "WmWinState.h"
-#ifdef PANELIST
 #include "WmResNames.h"
 #include "WmResParse.h"
 #include "WmParse.h"
 #include "WmParseP.h"
-#endif /* PANELIST */
 
 #include <Xm/RowColumnP.h> /* for MS_LastManagedMenuTime */
 extern XmMenuState _XmGetMenuState();
diff --git a/cde/programs/dtwm/WmFeedback.c b/cde/programs/dtwm/WmFeedback.c
index b15d01c98..1cc0f6849 100644
--- a/cde/programs/dtwm/WmFeedback.c
+++ b/cde/programs/dtwm/WmFeedback.c
@@ -64,9 +64,7 @@ static char rcsid[] = "$XConsortium: WmFeedback.c /main/6 1996/10/23 17:20:55 rs
 #include "WmFeedback.h"
 #include "WmFunction.h"
 #include "WmGraphics.h"
-#ifdef PANELIST
 #include "WmPanelP.h"  /* for typedef in WmManage.h */
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmColormap.h"
 #include "stdio.h"
diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c
index b2b462d64..cfed8b82e 100644
--- a/cde/programs/dtwm/WmFunction.c
+++ b/cde/programs/dtwm/WmFunction.c
@@ -57,12 +57,10 @@ static char rcsid[] = "$TOG: WmFunction.c /main/19 1998/04/20 13:00:48 mgreess $
 #include <Dt/Message.h>
 #include <Dt/Help.h>
 #endif /* WSM */
-#ifdef PANELIST
 #include <Dt/DtStrDefs.h>
 #include "WmPanelP.h"
 #include "WmSignal.h"
 #include "WmManage.h"
-#endif /* PANELIST */
 
 /*
  * include extern functions
@@ -504,7 +502,6 @@ void Do_Lower (ClientData *pCD, ClientListEntry *pStackEntry, int flags)
     Boolean bLeaderRestacked;
 #endif /* WSM */
 
-#ifdef PANELIST
     if (pCD->pECD)
     {
 	/*
@@ -514,8 +511,6 @@ void Do_Lower (ClientData *pCD, ClientListEntry *pStackEntry, int flags)
 	return;
     }
     else 
-#else /* PANELIST */
-#endif /* PANELIST */
 #ifdef WSM
     if (ClientInWorkspace(pWS, pCD)  && 
 	(!pStackEntry || ClientInWorkspace (pWS, pStackEntry->pCD)))
@@ -1012,7 +1007,6 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *event)
 	putenv(wmGD.pActiveSD->displayString);
       }
     
-#ifdef PANELIST
     if (wmGD.dtSD)
     {
 	/*
@@ -1021,7 +1015,6 @@ Boolean F_Exec (String args, ClientData *pCD, XEvent *event)
 	 */
        WmFrontPanelSetBusy (True);
     }
-#endif /* PANELIST */
 
     /*
      * Fork a process to exec a shell to run the specified command:
@@ -1240,9 +1233,7 @@ void Do_Quit_Mwm (Boolean diedOnRestart)
 		    }
 		    pNextEntry = pNextEntry->prevSibling;
 		}
-#if defined(PANELIST)
 	        UnParentControls (&wmGD.Screens[scr], False);
-#endif /* PANELIST */
 
 #ifndef WSM
 		XDeleteProperty(DISPLAY, wmGD.Screens[scr].rootWindow,
@@ -1894,14 +1885,10 @@ F_Goto_Workspace (String args, ClientData *pCD, XEvent *event)
 Boolean
 F_Help (String args, ClientData *pCD, XEvent *event)
 {
-#ifdef PANELIST
     Boolean rval;
 
     rval = WmDtHelp(args);
     return (rval);
-#endif /* PANELIST */    
-    
-
 }  /* END OF FUNCTION F_Help */
 
 
@@ -1930,7 +1917,6 @@ F_Help (String args, ClientData *pCD, XEvent *event)
 Boolean
 F_Help_Mode (String args, ClientData *pCD, XEvent *event)
 {
-#ifdef PANELIST
     /*
      * Help mode event processing interferes
      * with slide up windows. Don't continue
@@ -1941,8 +1927,6 @@ F_Help_Mode (String args, ClientData *pCD, XEvent *event)
 	(void) WmDtHelpMode();
     }
     return (False);
-#endif /* PANELIST */    
-
 }  /* END OF FUNCTION F_Help_Mode */
 
 #endif /* WSM */
@@ -2105,8 +2089,6 @@ Boolean F_Prev_Key (String args, ClientData *pCD, XEvent *event)
 
 } /* END OF FUNCTION F_Prev_Key */
 
-#ifdef PANELIST
-
 /***********************<->*************************************
  *
  *  F_Post_FpMenu (args, pCD, event)
@@ -2322,7 +2304,6 @@ F_Push_Recall (String args, ClientData *pCD, XEvent *event)
     return (True);
 
 } /* END OF FUNCTION F_Push_Recall */
-#endif /* PANELIST */
 
 
 /*************************************<->*************************************
@@ -2702,7 +2683,6 @@ Boolean F_Normalize (String args, ClientData *pCD, XEvent *event)
 
 Boolean F_Normalize_And_Raise (String args, ClientData *pCD, XEvent *event)
 {
-#ifdef PANELIST
     WmScreenData 	*pSD;
     WmWorkspaceData 	*pWS;
 
@@ -2728,7 +2708,7 @@ Boolean F_Normalize_And_Raise (String args, ClientData *pCD, XEvent *event)
 	    return (False);
 	}
     }
-#endif /* PANELIST */
+
     if (pCD)
     {
         if (pCD->clientState == MINIMIZED_STATE)
@@ -3143,7 +3123,6 @@ Boolean F_Kill (String args, ClientData *pCD, XEvent *event)
 	Boolean do_save_yourself =
 		pCD->protocolFlags & PROTOCOL_WM_SAVE_YOURSELF;
 
-#ifdef PANELIST
 	if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL)
 	{
 	    Widget 		wPanel;
@@ -3172,9 +3151,7 @@ Boolean F_Kill (String args, ClientData *pCD, XEvent *event)
 		IconBoxPopUp (pCD->pSD->pActiveWS, False);
 	    }
 	}
-	else
-#endif /* PANELIST */
-	if (!do_delete_window && !do_save_yourself)
+	else if (!do_delete_window && !do_save_yourself)
 	{
 	    XKillClient (DISPLAY, pCD->client);
 	}
@@ -3490,9 +3467,7 @@ void RestartWm (long startupFlags)
 		}
 		pNextEntry = pNextEntry->prevSibling;
 	    }
-#if defined(PANELIST)
 	    UnParentControls (&wmGD.Screens[scr], True);
-#endif /* PANELIST */
 	}
 	
     }
@@ -3640,8 +3615,6 @@ void DeFrameClient (ClientData *pCD)
 
 } /* END OF FUNCTION DeFrameClient */
 
-#if defined(PANELIST)
-
 /******************************<->*************************************
  *
  *  F_Toggle_Front_Panel (args, pCD, event)
@@ -3739,7 +3712,6 @@ F_Version (String args, ClientData *pCD, XEvent *event)
     return (True);
 
 }  /* END OF FUNCTION F_Version */
-#endif /* PANELIST */
 
 
 /******************************<->*************************************
@@ -3973,7 +3945,6 @@ void Do_Raise (ClientData *pCD, ClientListEntry *pStackEntry, int flags)
     Boolean bLeaderRestacked;
 #endif /* WSM */
 
-#ifdef PANELIST
     if (pCD->pECD)
     {
 	/*
@@ -3983,8 +3954,6 @@ void Do_Raise (ClientData *pCD, ClientListEntry *pStackEntry, int flags)
 	return;
     }
     else 
-#else /* PANELIST */
-#endif /* PANELIST */
 #ifdef WSM
     if (ClientInWorkspace(pWS, pCD)  && 
 	(!pStackEntry || ClientInWorkspace (pWS, pStackEntry->pCD)))
diff --git a/cde/programs/dtwm/WmFunction.h b/cde/programs/dtwm/WmFunction.h
index 4ed963b75..b36b3bdc0 100644
--- a/cde/programs/dtwm/WmFunction.h
+++ b/cde/programs/dtwm/WmFunction.h
@@ -69,10 +69,8 @@ extern Boolean F_Normalize_And_Raise (String args, ClientData *pCD,
 				      XEvent *event);
 extern Boolean F_Pack_Icons (String args, ClientData *pCD, XEvent *event);
 extern Boolean F_Post_SMenu (String args, ClientData *pCD, XEvent *event);
-#ifdef PANELIST
 extern Boolean F_Post_FpMenu (String args, ClientData *pCD, XEvent *event);
 extern Boolean F_Push_Recall (String args, ClientData *pCD, XEvent *event);
-#endif /* PANELIST */
 extern Boolean F_Kill (String args, ClientData *pCD, XEvent *event);
 extern Boolean F_Refresh (String args, ClientData *pCD, XEvent *event);
 extern Boolean F_Resize (String args, ClientData *pCD, XEvent *event);
@@ -99,11 +97,9 @@ extern Boolean F_Set_Context (String args, ClientData *pCD, XEvent *event);
 extern void Do_Set_Behavior (Boolean dummy);
 extern Boolean F_Title (String args, ClientData *pCD, XEvent *event);
 extern Boolean F_Screen (String args, ClientData *pCD, XEvent *event);
-#if defined(PANELIST)
 extern Boolean F_Toggle_Front_Panel (String args, ClientData *pCD, 
 				     XEvent *event);
 extern Boolean F_Version (String args, ClientData *pCD, XEvent *event);
-#endif /* PANELIST */
 #ifdef WSM
 extern Boolean F_Next_Workspace (String args, ClientData *pCD, XEvent *event);
 extern Boolean F_Prev_Workspace (String args, ClientData *pCD, XEvent *event);
@@ -121,7 +117,6 @@ extern Time GetFunctionTimestamp (XButtonEvent *pEvent);
 extern void ReBorderClient (ClientData *pCD, Boolean reMapClient);
 extern void ClearDirtyStackEntry (ClientData *pCD);	/* Fix for 5325 */
 
-#ifdef PANELIST
 
 typedef struct _WmPushRecallArg {
     int ixReg;
@@ -129,5 +124,3 @@ typedef struct _WmPushRecallArg {
     void *pArgs;
 } WmPushRecallArg;
 
-
-#endif /* PANELIST */
diff --git a/cde/programs/dtwm/WmGlobal.h b/cde/programs/dtwm/WmGlobal.h
index bfe795fb7..bb03e1268 100644
--- a/cde/programs/dtwm/WmGlobal.h
+++ b/cde/programs/dtwm/WmGlobal.h
@@ -66,9 +66,7 @@
 #include <Dt/Wsm.h>
 #include <Dt/WsmP.h>
 #include "WmParse.h"
-#ifdef PANELIST
 #include <Dt/Action.h>
-#endif /* PANELIST */
 #endif /* WSM */
 
 #if defined(sun) && defined(ALLPLANES)
@@ -347,20 +345,16 @@ extern Pixel		FPselectcolor;
 #define WM_DECOR_RESIZE		(WM_DECOR_RESIZEH)
 #define WM_DECOR_ALL		(WM_DECOR_TITLEBAR | WM_DECOR_RESIZEH)
 
-#ifdef PANELIST
 #define WM_DECOR_PANEL_DEFAULT	WM_DECOR_BORDER
-#endif /* PANELIST */
 
 /* icon box definitions */
 #define ICON_BOX_FUNCTIONS	(MWM_FUNC_RESIZE | MWM_FUNC_MOVE |\
 				 MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE)
 
-#ifdef PANELIST
 /* accessory panel definitions */
 #define WM_FUNC_PANEL_DEFAULT	(MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE)
 #define WM_FUNC_SUBPANEL_DEFAULT (MWM_FUNC_MOVE | MWM_FUNC_MINIMIZE|\
 				MWM_FUNC_CLOSE)
-#endif /* PANELIST */
 #ifdef WSM
 /* workspace controller definitions */
 #define CONTROL_BOX_FUNCTIONS	(MWM_FUNC_MOVE)
@@ -730,7 +724,6 @@ typedef struct _WsPresenceData
 typedef struct _WsPresenceData *PtrWsPresenceData;
 
 
-#ifdef PANELIST
 /*
  * Specific data for top level help dialog 
  */
@@ -751,7 +744,6 @@ typedef struct _WsDtHelpData
 } WsDtHelpData;
 
 typedef struct _WsDtHelpData *PtrWsDtHelpData;
-#endif /*  PANELIST */
 
 
 /*************************************<->*************************************
@@ -1284,9 +1276,7 @@ typedef struct _WmScreenData
     Widget	utmShell;		/* DrawingArea used for UTM */
 #endif /* !defined(WSM) || defined(MWM_QATS_PROTOCOL) */
     Widget      confirmboxW[4];
-#ifdef PANELIST
     Widget	wPanelist;		/* panel object */
-#endif /* PANELIST */
 #ifdef WSM
     WsPresenceData	presence;	/* workspace presence dialog*/
     Widget	switcherW;		/* workspace switcher */
@@ -1300,12 +1290,10 @@ typedef struct _WmScreenData
 #ifdef WSM
     int displayResolutionType;
 #endif /* WSM */
-#ifdef PANELIST
     struct _WmFpEmbeddedClientData  *pECD; /* clients living in front panel */
     int		numEmbeddedClients;
     struct _WmFpPushRecallClientData  *pPRCD; /* push_recall clients */
     int		numPushRecallClients;
-#endif /* PANELIST */
 
     /* wm state info: */
 
@@ -1410,11 +1398,9 @@ typedef struct _WmScreenData
     int		transientDecoration;		/* resource */
     int		transientFunctions;		/* resource */
     Boolean	useIconBox;			/* resource */
-#ifdef PANELIST
     int		subpanelDecoration;		/* resource */
     String      subpanelResources;              /*to restore subpanels */
     Boolean	iconBoxControl;			/* FP control for icon box */
-#endif /* PANELIST */
     Boolean     moveOpaque;                     /* move window not outlines */
 
 #ifdef WSM
@@ -1567,7 +1553,6 @@ typedef struct _WmBackdropData *PtrBackdropData;
 
 #define DEFAULT_BACKDROP_DIR CDE_INSTALLATION_TOP "/backdrops"
 
-#ifdef PANELIST
 /*
  * direction for slide-out panels
  */
@@ -1605,7 +1590,6 @@ typedef struct _WmActionArg {
     String	  szExecParms;
 } WmActionArg;
 
-#endif /* PANELIST */
 #endif /* WSM */
  
 
@@ -1722,10 +1706,8 @@ typedef struct _ClientData
     long	focusPriority;
     unsigned long clientID;
     int		wmUnmapCount;
-#ifdef PANELIST
     struct _WmFpEmbeddedClientData  *pECD; /* embedded client data */
     struct _WmFpPushRecallClientData  *pPRCD; /* embedded client data */
-#endif /* PANELIST */
 #ifdef WSM
     Atom *	paInitialProperties;	/* initial window properties */
     int		numInitialProperties;	/* number of initial properties */
@@ -1907,10 +1889,8 @@ typedef struct _ClientData
     long	dtwmFunctions;		/* _DT_WM_HINTS */
     long	dtwmBehaviors;		/* _DT_WM_HINTS */	
     Window	attachWindow;		/* _DT_WM_HINTS */
-#ifdef PANELIST
     SlideDirection	slideDirection;	/* slide-up direction */
     SlideOutRec	*pSOR;			/* slide-out record */
-#endif /* PANELIST */
 #endif /* WSM */
 #ifndef NO_SHAPE
     short       wShaped;                /* this window has a bounding shape */
@@ -1967,10 +1947,8 @@ typedef struct _ClientData *PtrClientData;
 #define ICON_BOX                        (1L << 11)  /* one of our icon boxes */
 #define CONFIRM_BOX                     (1L << 12)  /* a confirmation box */
 
-#ifdef PANELIST
 #define FRONT_PANEL_BOX                 (1L << 14)  /* a DT 3.0 front panel */
 #define GOT_DT_WM_HINTS		(1L << 15)
-#endif /* PANELIST */
 #ifdef WSM
 #define SM_LAUNCHED                     (1L << 17) /* launched by dtsession */
 #endif /* WSM */
@@ -2300,9 +2278,7 @@ typedef struct _WmGlobalData
     Boolean	systemButtonClick;		/* resource */
     Boolean	systemButtonClick2;		/* resource */
     Boolean	useLargeCursors;
-#if  defined(PANELIST)
     Boolean	useFrontPanel;			/* resource */
-#endif /* PANELIST */
 #ifdef WSM
     String      helpDirectory;		        /* resource */
     Window	requestContextWin;		/* for WmRequest f.fcns */
@@ -2311,10 +2287,8 @@ typedef struct _WmGlobalData
     Boolean     dtLite;                        /* resource */
     Boolean     blinkOnExec;                    /* resource */
 #endif /* MINIMAL_DT */
-#ifdef PANELIST
     WmScreenData *dtSD; /* screen for front panel */
     int         iSlideUpsInProgress;
-#endif /*PANELIST  */
     Boolean	waitForClicks;			/* resource */
     FrameStyle	frameStyle;			/* resource */
 #ifdef WSM
diff --git a/cde/programs/dtwm/WmHelp.c b/cde/programs/dtwm/WmHelp.c
index c66a2160e..0ff23ed74 100644
--- a/cde/programs/dtwm/WmHelp.c
+++ b/cde/programs/dtwm/WmHelp.c
@@ -48,9 +48,7 @@ static char rcsid[] = ""
 #include "WmHelp.h"
 #include "WmCDecor.h"
 #include "WmResParse.h"
-#ifdef PANELIST
 #include "WmPanelP.h"
-#endif /* PANELIST */
 #include "WmResNames.h"
 #include "WmWrkspace.h"
 #include "DataBaseLoad.h"
@@ -2782,9 +2780,7 @@ wmDtErrorDialog(
     unsigned int mask;
     Dimension dWidth, dHeight;
     Position x, y;
-#ifdef PANELIST
     WmPanelistObject  pPanelist;
-#endif /* PANELIST */
 
     xmsMessage = 
 	    XmStringCreateLocalized (sMessage);
diff --git a/cde/programs/dtwm/WmIBitmap.h b/cde/programs/dtwm/WmIBitmap.h
index f26fafa45..502a5d99c 100644
--- a/cde/programs/dtwm/WmIBitmap.h
+++ b/cde/programs/dtwm/WmIBitmap.h
@@ -217,7 +217,6 @@ static unsigned char slant2_bits[] = {
 #endif /* MWM_NEED_SLANT2 */
 
 
-#ifdef PANELIST
 #ifdef DTWM_NEED_FNTPL
 #define fntpl_i_bm_width 50
 #define fntpl_i_bm_height 50
@@ -256,7 +255,7 @@ static unsigned char fntpl_i_bm_bits[] = {
    0x00, 0x00};
 #endif /* DTWM_NEED_FNTPL */
 
-#endif /* PANELIST */
+
 #ifdef WSM
 /*
  * Backdrop bitmap patterns
@@ -300,7 +299,6 @@ static unsigned char bits6_bits[] = {
 #endif /* DTWM_NEED_BACKBITS */
 
 #endif /* WSM */
-#ifdef PANELIST
 /*
  *
  *  Used to define the small hourglass and mask used to indicate
@@ -326,7 +324,6 @@ static unsigned char time16m_bits[] = {
    0xfe, 0x1f, 0xff, 0x3f, 0xff, 0x3f};
 #endif  /* DTWM_NEED_TIME16 */
 
-#endif /* PANELIST */
 #ifdef WSM
 /****************************   eof    ***************************/
 #endif /* WSM */
diff --git a/cde/programs/dtwm/WmIDecor.c b/cde/programs/dtwm/WmIDecor.c
index 79e2a0139..52c28f579 100644
--- a/cde/programs/dtwm/WmIDecor.c
+++ b/cde/programs/dtwm/WmIDecor.c
@@ -227,12 +227,8 @@ Boolean MakeIcon (WmWorkspaceData *pWS, ClientData *pcd)
      * Don't adjust the icon for the icon box itself
      */
 
-#ifdef PANELIST
     if (pWS->pIconBox && (pWS->pIconBox->pCD_iconBox != pcd) &&
 	!(pcd->clientFlags & FRONT_PANEL_BOX))
-#else /* PANELIST */
-    if (pWS->pIconBox && (pWS->pIconBox->pCD_iconBox != pcd))
-#endif /* PANELIST */
     {
 	xOffset = IB_MARGIN_WIDTH;
 	yOffset = IB_MARGIN_HEIGHT;
@@ -870,13 +866,9 @@ void DrawIconTitle (ClientData *pcd)
 
     /* get appropriate GCs */
 #ifdef WSM
-#ifdef PANELIST
     if ((ACTIVE_PSD->useIconBox && 
 	!((pcd->dtwmBehaviors & (DtWM_BEHAVIOR_PANEL)) ||
           (pcd->clientFlags & CLIENT_WM_CLIENTS))) ||
-#else /* PANELIST */
-    if ((ACTIVE_PSD->useIconBox && !(pcd->clientFlags & CLIENT_WM_CLIENTS)) || 
-#endif /* PANELIST */
 #else
     if ((ACTIVE_PSD->useIconBox && !(pcd->clientFlags & ICON_BOX)) || 
 #endif /* WSM */
@@ -1519,10 +1511,8 @@ void ReparentIconWindow (ClientData *pcd, int xOffset, int yOffset)
     XWindowChanges windowChanges;
     unsigned int mask;
 
-#ifdef PANELIST
     if (!pcd->pECD)
     {
-#endif /* PANELIST */
     /*
      * Check if window size is too big
      */
@@ -1590,9 +1580,7 @@ void ReparentIconWindow (ClientData *pcd, int xOffset, int yOffset)
     /*
      * Map the icon window when the icon frame is mapped.
      */
-#ifdef PANELIST
     } /* END if (!pcd->pECD) */
-#endif /* PANELIST */
 } /* END OF FUNCTION ReparentIconWindow */
 
 
diff --git a/cde/programs/dtwm/WmIPC.c b/cde/programs/dtwm/WmIPC.c
index 39b74c6cb..ba810cd6e 100644
--- a/cde/programs/dtwm/WmIPC.c
+++ b/cde/programs/dtwm/WmIPC.c
@@ -428,12 +428,10 @@ dtReadyNotification( void )
 void 
 WmStopWaiting( void )
 {
-#ifdef PANELIST 
      if (wmGD.dtSD)
      {
 	 WmFrontPanelSetBusy (False);
      }
-#endif /* PANELIST */
 } /* END OF FUNCTION WmStopWaiting */
 
 
@@ -646,7 +644,6 @@ NoticeMsgCB(Tt_message m, Tt_pattern p)
 	/* CDExc21081 */
 	tt_message_destroy(m);
     }
-#ifdef PANELIST 
     else if (!strcmp(op, "DtActivity_Beginning")) {
 	if (wmGD.dtSD) {
 	   WmFrontPanelSetBusy (True);
@@ -655,7 +652,6 @@ NoticeMsgCB(Tt_message m, Tt_pattern p)
 	/* CDExc21081 */
 	tt_message_destroy(m);
     }
-#endif /* PANELIST */
     else if (!strcmp(op, "DtTypes_Reloaded")) {
 	/*
 	 * Blink busy light during reload.
diff --git a/cde/programs/dtwm/WmIconBox.c b/cde/programs/dtwm/WmIconBox.c
index 166f0ddd6..f9face3cd 100644
--- a/cde/programs/dtwm/WmIconBox.c
+++ b/cde/programs/dtwm/WmIconBox.c
@@ -88,9 +88,7 @@ static char rcsid[] = "$TOG: WmIconBox.c /main/7 1999/05/20 16:35:12 mgreess $"
 #include "WmIDecor.h"
 #include "WmIPlace.h"
 #include "WmImage.h"
-#ifdef PANELIST
 #include "WmPanelP.h"  /* for typedef in WmManage.h */
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmMenu.h"
 #include "WmResParse.h"
@@ -1784,8 +1782,6 @@ void UnmapIconBoxes (WmWorkspaceData *pWS)
 } /* END OF FUNCTION UnmapIconBoxes */
 #endif /* WSM */
 
-#if defined(PANELIST)
-
 /******************************<->*************************************
  *
  *  IconBoxShowing ()
@@ -1810,30 +1806,16 @@ void UnmapIconBoxes (WmWorkspaceData *pWS)
  ******************************<->***********************************/
 
     
-#ifdef PANELIST
 Boolean
 IconBoxShowing (WmWorkspaceData *pWS)
-#else /* PANELIST */
-Boolean
-IconBoxShowing (WmWorkspaceData *pWS, ControlWindowStruct *pCW)
-#endif /* PANELIST */
 {
     Boolean rval = False;
     
-#ifdef PANELIST
     if (pWS->pIconBox &&
 	ClientInWorkspace (pWS, pWS->pIconBox->pCD_iconBox))
     {
 	rval = True;
     }
-#else /* PANELIST */
-    if (pWS->pIconBox &&
-	ClientInWorkspace (pWS, pWS->pIconBox->pCD_iconBox) &&
-	(pCW->pWsStatus[wsIndex].wsClientStatus == CLIENT_WINDOW_OPEN))
-    {
-	rval = True;
-    }
-#endif /* PANELIST */
 
     return (rval);
     
@@ -1864,14 +1846,8 @@ IconBoxShowing (WmWorkspaceData *pWS, ControlWindowStruct *pCW)
  * 
  ******************************<->***********************************/
     
-#ifdef PANELIST
 void
 IconBoxPopUp (WmWorkspaceData *pWS, Boolean up)
-#else /* PANELIST */
-void
-IconBoxPopUp (WmWorkspaceData *pWS, 
-    ControlWindowStruct *pCW, Boolean up)
-#endif /* PANELIST */
 {
     
     IconBoxData *pibd;
@@ -1907,7 +1883,6 @@ IconBoxPopUp (WmWorkspaceData *pWS,
     }
     
 } /* END OF FUNCTION IconBoxPopUp */
-#endif /* PANELIST */
 
 
 
diff --git a/cde/programs/dtwm/WmIconBox.h b/cde/programs/dtwm/WmIconBox.h
index 9d4fd36b4..f8f7c2ec2 100644
--- a/cde/programs/dtwm/WmIconBox.h
+++ b/cde/programs/dtwm/WmIconBox.h
@@ -61,13 +61,8 @@ extern void IconScrollVisibleCallback (Widget w, caddr_t client_data,
 #endif
 extern void IconActivateCallback (Widget w, caddr_t client_data, 
 				  XmAnyCallbackStruct *call_data);
-#ifdef PANELIST
 extern void IconBoxPopUp (WmWorkspaceData *pWS, Boolean up);
 extern Boolean IconBoxShowing (WmWorkspaceData *pWS);
-#else /* PANELIST */
-extern void IconBoxPopUp (WmWorkspaceData *pWS, ControlWindowStruct *pCW, Boolean up);
-extern Boolean IconBoxShowing (WmWorkspaceData *pWS, ControlWindowStruct *pCW);
-#endif /* PANELIST */
 extern Boolean IconVisible (ClientData *pCD);
 extern IconInfo *InsertIconInfo (IconBoxData *pIBD, ClientData *pCD, 
 				 Widget theWidget);
diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c
index 42b2bd689..e0d5657ca 100644
--- a/cde/programs/dtwm/WmInitWs.c
+++ b/cde/programs/dtwm/WmInitWs.c
@@ -49,10 +49,8 @@ static char rcsid[] = "$TOG: WmInitWs.c /main/18 1999/09/20 15:18:22 mgreess $"
 #include "WmHelp.h"
 #endif /* WSM */
 #include "WmICCC.h"
-#ifdef PANELIST
 #define DTWM_NEED_FNTPL
 #include "WmIBitmap.h"
-#endif /* PANELIST */
 #ifndef NO_OL_COMPAT
 #include "WmOL.h"
 #endif /* NO_OL_COMPAT */
@@ -115,9 +113,7 @@ typedef struct
 #include "WmIPlace.h"
 #include "WmIconBox.h"
 #include "WmKeyFocus.h"
-#ifdef PANELIST
 #include "WmPanelP.h"  /* for typedef in WmManage.h */
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmMenu.h"
 #ifdef WSM
@@ -163,9 +159,6 @@ Boolean VirtKeys4DIN(Display *dpy);
 #define UNSPECIFIED_SCREEN_NAME		"fbk"
 char        **dpy2Argv;    /* copy  for second display */
 int           dpy2Argc;
-#ifndef PANELIST
-WmScreenData *dtSD;       /* for the "DT screen" of the display */
-#endif /* PANELIST */
 #endif  /* WSM */
 /*
  * Global Variables:
@@ -440,12 +433,8 @@ void InitWmGlobal (int argc, char *argv [], char *environ [])
 
     wmGD.errorFlag = False;
 #ifdef WSM
-#ifndef PANELIST
-    dtSD = NULL; 
-#else /* PANELIST  */
     wmGD.dtSD = NULL;
     wmGD.iSlideUpsInProgress = 0;
-#endif /*PANELIST  */
 #endif  /* WSM */
 
     SetupWmSignalHandlers (0); /* dummy paramater */
@@ -1027,14 +1016,8 @@ void InitWmGlobal (int argc, char *argv [], char *environ [])
 	     * Process the window manager resource description file (.mwmrc):
 	     */
 
-#ifdef PANELIST
 	    ProcessWmFile (pSD, False /* not nested */);
 
-#else /* PANELIST */
-	    ProcessWmFile (pSD);
-#endif /* PANELIST */
-
-
 	    /*
 	     * Setup default resources for the system menu and key bindings:
 	     */
@@ -1062,13 +1045,11 @@ void InitWmGlobal (int argc, char *argv [], char *environ [])
 	}
 
     }
-#ifdef PANELIST
     /*
      * Remove any temp config file we created if we needed to
      * convert DT 2.0 syntax to DT 3.0
      */
     DeleteTempConfigFileIfAny();
-#endif /* PANELIST */
 #ifdef WSM
     /*
      * Point second display's resource data base
@@ -1189,7 +1170,6 @@ XFlush (DISPLAY);
 
                 /* MapWorkspaceBox (); */
 
-#ifdef PANELIST
 		/*
 		 * Allocate front panel widgets
 		 */
@@ -1240,7 +1220,6 @@ XFlush (DISPLAY);
 		    ScanForPushRecallClients (pSD);
 		    ScanForEmbeddedClients (pSD);
 		}
-#endif /* PANELIST */
 		
 		RestoreHelpDialogs(pSD);
 #else /* WSM */
@@ -1390,14 +1369,12 @@ InitWmScreen (WmScreenData *pSD, int sNum)
     pSD->woE = (Window) 0L;
     pSD->woW = (Window) 0L;
 #endif /* WSM */
-#ifdef PANELIST
     pSD->wPanelist = NULL;
     pSD->pECD = NULL;
     pSD->numPushRecallClients = 0;
     pSD->numEmbeddedClients = 0;
     pSD->pPRCD = NULL;
     pSD->iconBoxControl = False;
-#endif /* PANELIST */
 #ifdef WSM
     pSD->displayResolutionType = _DtGetDisplayResolution(DISPLAY, sNum);
 
diff --git a/cde/programs/dtwm/WmManage.c b/cde/programs/dtwm/WmManage.c
index c2232643c..9989181fe 100644
--- a/cde/programs/dtwm/WmManage.c
+++ b/cde/programs/dtwm/WmManage.c
@@ -56,11 +56,9 @@ static char rcsid[] = "$TOG: WmManage.c /main/11 1998/01/12 16:45:48 cshi $"
 #include "WmIconBox.h"
 #include "WmImage.h"
 #include "WmKeyFocus.h"
-#ifdef PANELIST
 #include "WmPanelP.h"	/* typedef needed in WmManage.h */
 #include <Dt/Message.h>
 #include "WmIPC.h"
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmMenu.h"
 #include "WmProperty.h"
@@ -80,8 +78,6 @@ static char rcsid[] = "$TOG: WmManage.c /main/11 1998/01/12 16:45:48 cshi $"
  * Function Declarations:
  */
 
-#ifdef PANELIST
-
 Boolean IsEmbeddedClient (
     ClientData *pCD, 
     WmFpEmbeddedClientData **ppECD);
@@ -102,8 +98,6 @@ static void ForceSubpanelWMState(Window win);
 static void ReManageWindow (ClientData *pCD);
 static void CheckPushRecallClient (ClientData *pCD);
 
-#endif /* PANELIST */
-
 
 /*
  * Global Variables:
@@ -331,9 +325,7 @@ ManageWindow (WmScreenData *pSD, Window clientWindow, long manageFlags)
 #ifdef WSM
     WmWorkspaceData *pwsi;
 #endif /* WSM */
-#ifdef PANELIST 
     WmFpEmbeddedClientData *pECD;
-#endif /* PANELIST */
 
     /*
      * Get client information including window attributes and window
@@ -347,8 +339,6 @@ ManageWindow (WmScreenData *pSD, Window clientWindow, long manageFlags)
 	return;
     }
 
-
-#ifdef PANELIST
     /*
      *  Handle case of transients that derive from embedded clients.
      */
@@ -403,7 +393,7 @@ ManageWindow (WmScreenData *pSD, Window clientWindow, long manageFlags)
 	    pCD->transientLeader->pAccessPanel->pCD_accessPanel;
     }
 #endif 
-#endif /* PANELIST */
+
 #ifdef WSM
     if (pCD->inputMode == MWM_INPUT_SYSTEM_MODAL)
     {
@@ -829,9 +819,7 @@ ManageWindow (WmScreenData *pSD, Window clientWindow, long manageFlags)
     DiscardInitialPropertyList (pCD);
 
 #endif /* WSM */
-#ifdef PANELIST
     CheckPushRecallClient (pCD);
-#endif /* PANELIST */
 
 } /* END OF FUNCTION ManageWindow */
 
@@ -856,7 +844,6 @@ ManageWindow (WmScreenData *pSD, Window clientWindow, long manageFlags)
 
 void UnManageWindow (ClientData *pCD)
 {
-#ifdef PANELIST
     if (pCD->pECD)
     {
 	WmFpEmbeddedClientData *pECD;
@@ -896,7 +883,7 @@ void UnManageWindow (ClientData *pCD)
 	}
 	pCD->pPRCD = NULL;
     }
-#endif /* PANELIST */
+
     /*
      * Withdraw all the transient children of this window.
      */
@@ -1779,8 +1766,7 @@ void ReManageDialog (WmScreenData *pSD, Widget dialogboxW)
 
 } /* END OF FUNCTION ReManageDialog */
 
-#ifdef PANELIST
-
+
 /*************************************<->*************************************
  *
  *  RegisterEmbeddedClients (wPanelist, pECD, count)
@@ -3034,4 +3020,4 @@ RegisterIconBoxControl (Widget wPanelist)
 
 } /* END OF FUNCTION RegisterIconBoxControl */
 
-#endif /* PANELIST */
+
diff --git a/cde/programs/dtwm/WmManage.h b/cde/programs/dtwm/WmManage.h
index cf7019d42..45dcbf875 100644
--- a/cde/programs/dtwm/WmManage.h
+++ b/cde/programs/dtwm/WmManage.h
@@ -42,7 +42,6 @@ extern void FreeClientFrame (ClientData *pCD);
 extern void FreeIcon (ClientData *pCD);
 extern void WithdrawDialog (Widget dialogboxW);
 extern void ReManageDialog (WmScreenData *pSD, Widget dialogboxW);
-#ifdef PANELIST
 extern void RegisterEmbeddedClients (
 	Widget wPanelist, 
 	WmFpEmbeddedClientList pECD, 
@@ -63,4 +62,3 @@ extern Boolean ReparentEmbeddedClient (
 	unsigned int height);
 extern void ScanForEmbeddedClients (WmScreenData *pSD);
 extern void ScanForPushRecallClients (WmScreenData *pSD);
-#endif /* PANELIST */
diff --git a/cde/programs/dtwm/WmMenu.c b/cde/programs/dtwm/WmMenu.c
index 36e6aad85..181c74c8c 100644
--- a/cde/programs/dtwm/WmMenu.c
+++ b/cde/programs/dtwm/WmMenu.c
@@ -519,7 +519,6 @@ DuplicateMenuItems (MenuItem *menuItems)
 	if ((curMenuItem->wmFunction == F_Send_Msg)
 #ifdef WSM
 	    || (curMenuItem->wmFunction == F_Set_Context)
-# ifdef PANELIST
 	    /*
 	     * NOTE: For now, in dtwm this function is used only
 	     * to copy the FrontPanel menu.  So, we know that
@@ -530,7 +529,6 @@ DuplicateMenuItems (MenuItem *menuItems)
 	     * the WmActionArg.  11/20/96
 	     */
 	    || (curMenuItem->wmFunction == F_Action)
-# endif /* PANELIST */
 #endif /* WSM */
 	    )
 	  newMenuItem->wmFuncArgs = curMenuItem->wmFuncArgs;
diff --git a/cde/programs/dtwm/WmPresence.c b/cde/programs/dtwm/WmPresence.c
index ff7b85001..8f0d510ae 100644
--- a/cde/programs/dtwm/WmPresence.c
+++ b/cde/programs/dtwm/WmPresence.c
@@ -53,9 +53,6 @@ static char rcsid[] = "$XConsortium: WmPresence.c /main/7 1996/10/23 17:24:56 rs
 #include <Xm/List.h>
 #include <Xm/SeparatoG.h>
 #include <Xm/ToggleB.h>
-#ifndef  PANELIST
-#include <Dt/Help.h>
-#endif /* PANELIST */
 #include <errno.h>
 #include <signal.h>
 #include <stdio.h>
@@ -130,9 +127,7 @@ static Dimension wspCharWidth (
 #include "WmCDecor.h"
 #include "WmCDInfo.h"
 #include "WmIconBox.h"
-#ifdef PANELIST
 #include "WmPanelP.h"  /* for typedef in WmManage.h */
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmResParse.h"
 #include "WmResource.h"
@@ -203,9 +198,7 @@ MakePresenceBox(
 	 * Set the ClientData fields.
 	 */   
 	XtRealizeWidget (pPres->shellW);
-#ifdef PANELIST
 	DtWsmRemoveWorkspaceFunctions (DISPLAY1, XtWindow(pPres->shellW));
-#endif /* PANELIST */
 
 	ProcessPresenceResources (pSD);
 
@@ -547,14 +540,9 @@ wspCreateWidgets(
 	XmStringFree(tmpXmString);
 #endif
 
-#ifdef  PANELIST
 	XtAddCallback (pPres->HelpW, XmNactivateCallback, 
 		       WmDtWmTopicHelpCB, 
 		       WM_DT_WSPRESENCE_TOPIC);
-#else /* PANELIST */
-	XtAddCallback (pPres->HelpW, XmNactivateCallback, 
-		(XtCallbackProc) wspHelpCB, (XtPointer)pSD); 
-#endif /* PANELIST */
     }
 
     return(rval);
@@ -1490,46 +1478,6 @@ wspOkCB(
     wspCancelCB (buttonW, (XtPointer)pSD, call_data);
 } /* END OF FUNCTION   */
 
-
-/*************************************<->*************************************
- *
- *  static void
- *  wspHelpCB (w, client_data, call_data)
- *
- *
- *  Description:
- *  -----------
- *  Help callback.
- *
- *
- *  Inputs:
- *  ------
- *  None.
- *
- * 
- *  Outputs:
- *  -------
- *  None.
- *
- *
- *  Comments:
- *  --------
- *  None.
- * 
- *************************************<->***********************************/
-
-#ifndef	PANELIST
-static void 
-wspHelpCB(
-        Widget buttonW,
-        XtPointer client_data,
-        XtPointer call_data )
-{
-
-    DtHelpOnTopic (XtParent(buttonW), "vw_pres");
-} /* END OF FUNCTION   */
-#endif	/* PANELIST */
-
 /*************************************<->*************************************
  *
  *  static void
diff --git a/cde/programs/dtwm/WmProtocol.c b/cde/programs/dtwm/WmProtocol.c
index 051e94e33..37ecb697f 100644
--- a/cde/programs/dtwm/WmProtocol.c
+++ b/cde/programs/dtwm/WmProtocol.c
@@ -54,9 +54,7 @@ static char rcsid[] = "$TOG: WmProtocol.c /main/8 1997/06/18 17:31:34 samborn $"
 #ifndef NO_WMQUERY 
 #include "WmEvent.h"
 #endif /* NO_WMQUERY */
-#ifdef PANELIST
 #include "WmPanelP.h"
-#endif /* PANELIST */
 
 #if ((!defined(WSM)) || defined(MWM_QATS_PROTOCOL))
 # include "WmCmd.h"
@@ -339,7 +337,6 @@ void SendConfigureNotify (ClientData *pCD)
     notifyEvent.display = DISPLAY;
     notifyEvent.event = pCD->client;
     notifyEvent.window = pCD->client;
-#ifdef PANELIST
     if (pCD->pECD)
     {
 	int rootX, rootY;
@@ -362,8 +359,6 @@ void SendConfigureNotify (ClientData *pCD)
 	notifyEvent.height = pCD->clientHeight;
     }
     else
-#else /* PANELIST */
-#endif /* PANELIST */
     if (pCD->maxConfig)
     {
 	notifyEvent.x = pCD->maxX;
diff --git a/cde/programs/dtwm/WmResNames.h b/cde/programs/dtwm/WmResNames.h
index 6fc7110e5..438e384d4 100644
--- a/cde/programs/dtwm/WmResNames.h
+++ b/cde/programs/dtwm/WmResNames.h
@@ -146,17 +146,13 @@
 #define WmNshowNames			"showNames"
 #endif /* WSM */
 #define WmNstartupKeyFocus		"startupKeyFocus"
-#ifdef PANELIST
 #define WmNsubpanelDecoration		"subpanelDecoration"
 #define WmNsubpanelResources            "subpanelResources"
-#endif /* PANELIST */
 #define WmNsystemButtonClick		"wMenuButtonClick"
 #define WmNsystemButtonClick2		"wMenuButtonClick2"
 #define WmNtransientDecoration		"transientDecoration"
 #define WmNtransientFunctions		"transientFunctions"
-#ifdef PANELIST
 #define WmNuseFrontPanel		"useFrontPanel"
-#endif /* PANELIST */
 #define WmNuseIconBox			"useIconBox"
 #ifdef WSM
 #define WmNuseWindowOutline		"useWindowOutline"
@@ -357,17 +353,13 @@
 #define WmCShowNames			"ShowNames"
 #endif /* WSM */
 #define WmCStartupKeyFocus		"StartupKeyFocus"
-#ifdef PANELIST
 #define WmCSubpanelDecoration		"SubpanelDecoration"
 #define WmCSubpanelResources            "SubpanelResources"
-#endif /* PANELIST */
 #define WmCSystemButtonClick		"WMenuButtonClick"
 #define WmCSystemButtonClick2		"WMenuButtonClick2"
 #define WmCTransientDecoration		"TransientDecoration"
 #define WmCTransientFunctions		"TransientFunctions"
-#ifdef PANELIST
 #define WmCUseFrontPanel		"UseFrontPanel"
-#endif /* PANELIST */
 #define WmCUseIconBox			"UseIconBox"
 #ifdef WSM
 #define WmCUseWindowOutline		"UseWindowOutline"
@@ -520,11 +512,10 @@
 #define CRS_ACCEL		(1L << 3)
 #define CRS_ANY			(CRS_BUTTON | CRS_KEY | CRS_MENU | CRS_ACCEL)
 
-#ifdef PANELIST
 #define WmNhelpDirectory		     "helpDirectory"
 
 #define WmCHelpDirectory		     "HelpDirectory"
-#endif /* PANELIST */
+
 #ifdef WSM
 /**************************    eof  ************************/
 #endif /* WSM */
diff --git a/cde/programs/dtwm/WmResParse.c b/cde/programs/dtwm/WmResParse.c
index f9498ecc4..4e7e6c6e4 100644
--- a/cde/programs/dtwm/WmResParse.c
+++ b/cde/programs/dtwm/WmResParse.c
@@ -54,11 +54,9 @@ static char rcsid[] = "$XConsortium: WmResParse.c /main/9 1996/11/01 10:17:34 dr
 #include <Dt/Connect.h>
 #include <Tt/tt_c.h>
 #endif /* WSM */
-#ifdef PANELIST
 #include "WmParse.h"
 #include "WmParseP.h"
 #include "WmPanelP.h"
-#endif /* PANELIST */
 #include "WmResource.h"
 
 #include <codelibs/shellutils.h>    /* shellscan */
@@ -124,7 +122,6 @@ static char rcsid[] = "$XConsortium: WmResParse.c /main/9 1996/11/01 10:17:34 dr
 #ifdef MOTIF_ONE_DOT_ONE
 extern char   *getenv ();
 #endif
-#ifdef PANELIST
 # include <errno.h>
 # ifdef X_NOT_STDC_ENV
 extern int errno;
@@ -132,7 +129,6 @@ extern int errno;
 # define HOME_DT_WMRC    "/.dt/dtwmrc"
 # define LANG_DT_WMRC    "/dtwmrc"
 # define SYS_DT_WMRC     CDE_CONFIGURATION_TOP "/sys.dtwmrc"
-#endif /* PANELIST */
 
 /*
  * Global Variables And Tables:
@@ -252,16 +248,8 @@ static void ParseWmMnemonic (unsigned char **linePP, MenuItem *menuItem);
 static Boolean ParseWmAccelerator (unsigned char **linePP, MenuItem *menuItem);
 int ParseWmFunction (unsigned char **linePP, unsigned int res_spec, 
 			    WmFunction *pWmFunction);
-#ifndef PANELIST
-static Boolean ParseWmFuncMaybeStrArg (unsigned char **linePP, 
-				       WmFunction wmFunction, String *pArgs);
-#endif /* PANELIST */
 static Boolean ParseWmFuncNoArg (unsigned char **linePP, WmFunction wmFunction,
 				 String *pArgs);
-#ifndef PANELIST
-static Boolean ParseWmFuncStrArg (unsigned char **linePP, 
-				  WmFunction wmFunction, String *pArgs);
-#endif /* PANELIST */
 void FreeMenuItem (MenuItem *menuItem);
 static Boolean ParseWmFuncGrpArg (unsigned char **linePP, 
 				  WmFunction wmFunction, GroupArg *pGroup);
@@ -307,7 +295,6 @@ void ProcessCommandLine (int argc,  char *argv[]);
 static void ParseScreensArgument (int argc, char *argv[], int *pArgnum,
 				  unsigned char *lineP);
 void ProcessMotifBindings (void);
-#ifdef PANELIST
 static void ParseIncludeSet (WmScreenData *pSD, unsigned char *lineP);
 static void ConfigStackInit (char *pchFileName);
 static FILE *ConfigStackPush (unsigned char *pchFileName);
@@ -315,7 +302,6 @@ static void ConfigStackPop (void);
 Boolean ParseWmFuncActionArg (unsigned char **linePP, 
 				  WmFunction wmFunction, String *pArgs);
 static void PreprocessConfigFile (void);
-#endif /* PANELIST */
 
 static EventTableEntry buttonEvents[] = {
 
@@ -349,7 +335,6 @@ static EventTableEntry keyEvents[] = {
     { NULL,         0,    (Boolean(*)())NULL,    0,  FALSE}
 };
 
-#ifdef PANELIST
 typedef struct _ConfigFileStackEntry {
     char		*fileName;
     char 		*tempName;
@@ -364,7 +349,6 @@ typedef struct _ConfigFileStackEntry {
 static ConfigFileStackEntry *pConfigStack = NULL;
 static ConfigFileStackEntry *pConfigStackTop = NULL;
 
-#endif /* PANELIST */
 
 unsigned int buttonModifierMasks[] = {
     0,
@@ -396,19 +380,11 @@ typedef struct {
 
 FunctionTableEntry functionTable[] = {
 #ifdef WSM
-#ifdef PANELIST
     {"f.action",	0,
 			CRS_ANY,
 			0,
 			F_Action,
 			ParseWmFuncActionArg},
-#else /* PANELIST */
-    {"f.action",	0,
-			CRS_ANY,
-			0,
-			F_Action,
-			ParseWmFuncStrArg},
-#endif  /* PANELIST */
 #endif /* WSM */
     {"f.beep",		0,
 			CRS_ANY,
@@ -552,21 +528,12 @@ FunctionTableEntry functionTable[] = {
 			0,
 			F_Normalize,
 			ParseWmFuncNoArg},
-#ifdef PANELIST
     {"f.normalize_and_raise",
 	                F_CONTEXT_ROOT|F_CONTEXT_NORMAL,
 			CRS_ANY,
 			0,
 			F_Normalize_And_Raise,
 			ParseWmFuncMaybeStrArg},
-#else /* PANELIST */
-    {"f.normalize_and_raise",
-	                F_CONTEXT_ROOT|F_CONTEXT_NORMAL,
-			CRS_ANY,
-			0,
-			F_Normalize_And_Raise,
-			ParseWmFuncNoArg},
-#endif /* PANELIST */
 #ifdef WSM
     {"f.occupy_all", F_CONTEXT_ICONBOX|F_CONTEXT_ROOT,
 			CRS_ANY,
@@ -708,7 +675,6 @@ FunctionTableEntry functionTable[] = {
 			0,
 			F_Title,
 			ParseWmFuncNoArg},
-#if defined(PANELIST)
     {"f.toggle_frontpanel", 0,
 			CRS_ANY,
 			0,
@@ -720,7 +686,6 @@ FunctionTableEntry functionTable[] = {
 			0,
 			F_Version,
 			ParseWmFuncNoArg},
-#endif /* PANELIST */
 #ifdef WSM
 
 #ifdef OLD
@@ -1878,7 +1843,6 @@ void SyncModifierStrings(void)
 #define MENU_SPEC	"menu"
 #define BUTTON_SPEC	"buttons"
 #define KEY_SPEC	"keys"
-#ifdef PANELIST
 #define FRONT_PANEL_SPEC DTWM_FP_PANEL_OLD
 #define DROP_EFFECTS_SPEC   DTWM_FP_DROP_EFFECTS
 #define PANEL_SPEC	DTWM_FP_PANEL
@@ -1890,19 +1854,14 @@ void SyncModifierStrings(void)
 
 void ProcessWmFile (WmScreenData *pSD, Boolean bNested)
 
-#else /* PANELIST */
-void ProcessWmFile (WmScreenData *pSD)
-#endif /* PANELIST */
 {
     unsigned char *lineP;
     unsigned char *string;
     unsigned int   n;
     MenuSpec      *menuSpec;
-#ifdef PANELIST
 
     if (!bNested)
     {
-#endif /* PANELIST */
 
     /*
      * Initialize global data values that are set based on data in
@@ -1937,13 +1896,11 @@ void ProcessWmFile (WmScreenData *pSD)
 	lineP = line;
         ParseMenuSet (pSD, lineP);
     }
-#ifdef PANELIST
     if (wmGD.useFrontPanel &&  !wmGD.dtSD &&
 	(XDefaultScreen (wmGD.display) == pSD->screen))
     {
         wmGD.dtSD = pSD;  /* only one per display */
     }
-#endif /* PANELIST */
 
     /*
      * Find and associate a stream with the window manager resource 
@@ -1957,9 +1914,7 @@ void ProcessWmFile (WmScreenData *pSD)
 	return;
     }
 
-#ifdef PANELIST 
     }  /* end if (!bNested) */
-#endif /* PANELIST */
     /*
      * Parse the information in the configuration file.
      * If there are more than MAXLINE characters on a line the excess are
@@ -1989,12 +1944,10 @@ void ProcessWmFile (WmScreenData *pSD)
 	{
 	    ParseKeySet (pSD, lineP);
 	}
-#ifdef PANELIST
         else if (!strcmp ((char *)string, INCLUDE_SPEC))
         {
             ParseIncludeSet (pSD, lineP);
         }
-#endif /* PANELIST */
     }
 
     fclose (cfileP);
@@ -2104,9 +2057,7 @@ FILE *FopenConfigFile (void)
 #ifndef MOTIF_ONE_DOT_ONE
     char *homeDir = XmeGetHomeDirName();
 #endif
-#ifdef PANELIST
     Boolean stackPushed;
-#endif /* PANELIST */
 
     /*
      * Get the LANG environment variable
@@ -2142,7 +2093,6 @@ FILE *FopenConfigFile (void)
      * Use the LANG variable if set and .mwmrc is in $HOME/$LANG/.mwmrc  
      */
 
-#ifdef PANELIST
     if (pConfigStackTop && pConfigStackTop->tempName)
     {
 	fileP = fopen (pConfigStackTop->tempName, "r");
@@ -2151,7 +2101,7 @@ FILE *FopenConfigFile (void)
     stackPushed = (pConfigStackTop && (pConfigStackTop != pConfigStack));
     fileP = NULL;
     cfileName[0] = '\0';
-#endif /* PANELIST */
+
     if ((wmGD.configFile != NULL) && (wmGD.configFile[0] != '\0'))
     /* pointer to nonNULL string */
     {
@@ -2175,9 +2125,6 @@ FILE *FopenConfigFile (void)
 		    XtFree(LANG); 
 		    LANG = NULL; 
 		}
-#ifndef PANELIST
-		return (fileP);
-#endif /* PANELIST */
 	    }
 	    else
 	    {
@@ -2197,9 +2144,6 @@ FILE *FopenConfigFile (void)
 		      XtFree(LANG);
 		      LANG = NULL;
 		  }
-#ifndef PANELIST
-		  return (fileP);
-#endif /* PANELIST */
 		}
 	    }
 
@@ -2208,7 +2152,6 @@ FILE *FopenConfigFile (void)
 	else
 	/* relative to current directory or absolute */
 	{
-#ifdef PANELIST
 	    char *pch;
 
             pch = (char *) GetNetworkFileName (wmGD.configFile);
@@ -2221,7 +2164,6 @@ FILE *FopenConfigFile (void)
   
   	  if ((fileP == NULL) && !stackPushed)
 	  {
-#endif  /* PANELIST  */
             if ((fileP = fopen (wmGD.configFile, "r")) != NULL)
 	      {
 		if (LANG != NULL) {
@@ -2230,19 +2172,16 @@ FILE *FopenConfigFile (void)
 		}
 		return(fileP);
 	      }
-#ifdef PANELIST 
 	  }
 	  else if ((fileP == NULL) && stackPushed)
 	  {
 		strcpy (cfileName, wmGD.configFile);
 	  }
-#endif /* PANELIST */
 	}
     }
-#ifdef PANELIST 
+
   if ((fileP == NULL) && !stackPushed)
   {
-#endif /* PANELIST */
 
     /*
      * The configFile resource didn't do it for us.
@@ -2308,9 +2247,6 @@ FILE *FopenConfigFile (void)
 	    XtFree(LANG);
 	    LANG = NULL;
 	}
-#ifndef PANELIST
-        return (fileP);
-#endif /* PANELIST */
     }
     else
     {
@@ -2346,12 +2282,8 @@ FILE *FopenConfigFile (void)
 	      XtFree(LANG);
 	      LANG = NULL;
 	  }
-#ifndef PANELIST
-	  return (fileP);
-#endif /* PANELIST */
 	}
     }
-#ifdef PANELIST
   }
 
 #define DTLIBDIR  CDE_INSTALLATION_TOP
@@ -2385,7 +2317,6 @@ FILE *FopenConfigFile (void)
 
   if ((fileP == NULL) && !stackPushed)
   {
-#endif /* PANELIST */
 
 #ifndef LIBDIR
 #define LIBDIR "/usr/lib/X11"
@@ -2420,26 +2351,17 @@ FILE *FopenConfigFile (void)
 	{
 	  XtFree(LANG);
 	  LANG = NULL;
-#ifndef PANELIST
-	  return (fileP);
-#endif /* PANELIST */
 	}
     }
 
-#ifdef PANELIST
     if ((fileP == NULL) && !stackPushed)
     {
-#endif /* PANELIST */
 #ifdef WSM
     if (MwmBehavior)
     {
 	strcpy(cfileName, LIBDIR);
 	strncat(cfileName, SLASH_MWMRC, MAXWMPATH - strlen(cfileName));
-#ifdef PANELIST
 	fileP = fopen (cfileName, "r");
-#else /* PANELIST */
-	return (fopen (cfileName, "r"));
-#endif /* PANELIST */
     }
     else
     {
@@ -2447,11 +2369,7 @@ FILE *FopenConfigFile (void)
 	strncat(cfileName, RC_DEFAULT_CONFIG_SUBDIR, 
 					MAXWMPATH - strlen(cfileName));
 	strncat(cfileName, SLASH_DT_WMRC, MAXWMPATH - strlen(cfileName));
-#ifdef PANELIST
 	fileP = fopen (cfileName, "r");
-#else /* PANELIST */
-	return (fopen (cfileName, "r"));
-#endif /* PANELIST */
     }
 #else /* WSM */
     /*
@@ -2465,14 +2383,9 @@ FILE *FopenConfigFile (void)
        XtFree(LANG);
        LANG = NULL;
     }
-#ifdef PANELIST
     strcpy(cfileName, cfileName);
     fileP = fopen (cfileName, "r");
-#else /* PANELIST */
-    return (fopen (cfileName, "r"));
-#endif /* PANELIST */
 #endif /* WSM */
-#ifdef PANELIST
     }
   }
 
@@ -2528,7 +2441,6 @@ FILE *FopenConfigFile (void)
 	LANG = NULL;
     }
     return (fileP);
-#endif /* PANELIST */
 
 } /* END OF FUNCTION FopenConfigFile */
 
@@ -2941,7 +2853,6 @@ static MenuItem *ParseMenuItems (WmScreenData *pSD
 
 	menuItem->greyedContext = functionTable[ix].greyedContext;
 	menuItem->mgtMask = functionTable[ix].mgtMask;
-#ifdef PANELIST
         if ((menuItem->wmFunction == F_Toggle_Front_Panel) &&
 	    ((wmGD.useFrontPanel == False) ||
 	     (wmGD.dtSD != pSD)))
@@ -2954,7 +2865,6 @@ static MenuItem *ParseMenuItems (WmScreenData *pSD
 				       F_SUBCONTEXT_IB_WICON 	| 
 				       F_SUBCONTEXT_IB_IICON);
 	}
-#endif /* PANELIST */
 
         /* 
 	 * Apply the function argument parser.
@@ -3927,9 +3837,6 @@ int ParseWmFunction (unsigned char **linePP, unsigned int res_spec,
  * 
  *************************************<->***********************************/
 
-#ifndef PANELIST
-static
-#endif 
 Boolean ParseWmFuncMaybeStrArg (unsigned char **linePP, 
 				       WmFunction wmFunction, String *pArgs)
 {
@@ -3944,7 +3851,6 @@ Boolean ParseWmFuncMaybeStrArg (unsigned char **linePP,
 	return (ParseWmFuncStrArg (linePP, wmFunction, pArgs));
     }
 */
-#ifdef PANELIST
 #if 0
     else if (*lineP == '"' && *(lineP+1) == '-')
     {
@@ -3953,7 +3859,6 @@ Boolean ParseWmFuncMaybeStrArg (unsigned char **linePP,
 	return (ParseWmFuncStrArg (linePP, wmFunction, pArgs));
     }
 #endif
-#endif /* PANELIST */
     if ((len = strlen ((char *)string)) != 0)
     {
 	if ((*pArgs = (String)XtMalloc (len + 1)) == NULL)
@@ -4047,9 +3952,6 @@ static Boolean ParseWmFuncNoArg (unsigned char **linePP, WmFunction wmFunction,
  * 
  *************************************<->***********************************/
 
-#ifndef PANELIST
-static
-#endif
 Boolean ParseWmFuncStrArg (unsigned char **linePP, 
 				  WmFunction wmFunction, String *pArgs)
 {
@@ -5296,425 +5198,7 @@ GetNextLine (void)
 } /* END OF FUNCTION GetNextLine */
 #endif /* WSM */
 
-#ifndef PANELIST
-
-#ifdef WSM
-/*************************************<->*************************************
- *
- *  GetStringC (linePP, SmBehavior)
- *
- *
- *  Description:
- *  -----------
- *  Returns the next quoted or whitespace-terminated nonquoted string in the
- *  line buffer.
- *  Additional functionality added to GetString in that anything in a
- *  quoted string is considered sacred and nothing will be stripped from
- *  the middle of a quoted string.
- *
- *
- *  Inputs:
- *  ------
- *  linePP =  pointer to current line buffer pointer.
- *  SmBehavior = flag that enables parsing session manager hints
- *               if True.
- *
- * 
- *  Outputs:
- *  -------
- *  linePP =  pointer to revised line buffer pointer.
- *  Return =  string 
- *
- *
- *  Comments:
- *  --------
- *  May alter the line buffer contents.
- *  Handles quoted strings and characters, removing trailing whitespace from
- *  quoted strings.
- *  Returns NULL string if the line is empty or is a comment.
- *  Code stolen from dtmwm.
- * 
- *************************************<->***********************************/
-#else /* WSM */
-/*************************************<->*************************************
- *
- *  GetString (linePP)
- *
- *
- *  Description:
- *  -----------
- *  Returns the next quoted or whitespace-terminated nonquoted string in the
- *  line buffer.
- *
- *
- *  Inputs:
- *  ------
- *  linePP =  pointer to current line buffer pointer.
- *
- * 
- *  Outputs:
- *  -------
- *  linePP =  pointer to revised line buffer pointer.
- *  Return =  string 
- *
- *
- *  Comments:
- *  --------
- *  May alter the line buffer contents.
- *  Handles quoted strings and characters, removing trailing whitespace from
- *  quoted strings.
- *  Returns NULL string if the line is empty or is a comment.
- * 
- *************************************<->***********************************/
-#endif /* WSM */
 
-#ifdef WSM
-unsigned char *GetStringC (unsigned char **linePP, Boolean SmBehavior)
-#else /* WSM */
-unsigned char *GetString (unsigned char **linePP)
-#endif /* WSM */
-{
-    unsigned char *lineP = *linePP;
-    unsigned char *endP;
-    unsigned char *curP;
-    unsigned char *lnwsP;
-#ifdef WSM
-    unsigned int  level = 0, checkLev, i, quoteLevel[10];
-#endif /* WSM */
-#ifndef NO_MULTIBYTE
-    int            chlen;
-
-    /* get rid of leading white space */
-    ScanWhitespace (&lineP);
-
-    /*
-     * Return NULL if line is empty, a comment, or invalid.
-     */
-#ifdef WSM
-    if (
-	*lineP == '\0' ||
-	((chlen = mblen ((char *)lineP, MB_CUR_MAX)) < 1) ||
-        ((chlen == 1) && ((*lineP == '!') || 
-			  ((!SmBehavior) && (*lineP == '#'))))
-       )
-#else /* WSM */
-    if (
-	*lineP == '\0' ||
-	((chlen = mblen ((char *)lineP, MB_CUR_MAX)) < 1) ||
-        ((chlen > 0) && ((*lineP == '!') || (*lineP == '#')))
-       )
-#endif /* WSM */
-    {
-        *linePP = lineP;
-        return (NULL);
-    }
-
-    if ((chlen == 1) && (*lineP == '"'))
-    /* Quoted string */
-    {
-#ifdef WSM
-	quoteLevel[level] = 1;	
-#endif /* WSM */
-	/*
-	 * Start beyond double quote and find the end of the quoted string.
-	 * '\' quotes the next character.
-	 * Otherwise,  matching double quote or NULL terminates the string.
-	 *
-	 * We use lnwsP to point to the last non-whitespace character in the
-	 * quoted string.  When we have found the end of the quoted string,
-	 * increment lnwsP and if lnwsP < endP, write NULL into *lnwsP.
-	 * This removes any trailing whitespace without overwriting the 
-	 * matching quote, needed later.  If the quoted string was all 
-	 * whitespace, then this will write a NULL at the beginning of the 
-	 * string that will be returned -- OK.
-	 */
-	lnwsP = lineP++;                /* lnwsP points to first '"' */
-	curP = endP = lineP;            /* other pointers point beyond */
-
-        while ((*endP = *curP) &&
-               ((chlen = mblen ((char *)curP, MB_CUR_MAX)) > 0) &&
-	       ((chlen > 1) || (*curP != '"')))
-	/* Haven't found matching quote yet.
-	 * First byte of next character has been copied to endP.
-	 */
-        {
-	    curP++;
-	    if ((chlen == 1) && (*endP == '\\') && 
-		((chlen = mblen ((char *)curP, MB_CUR_MAX)) > 0))
-	    /* character quote:
-	     * copy first byte of quoted nonNULL character down.
-	     * point curP to next byte
-	     */
-	    {
-#ifdef WSM
-		if (SmBehavior)
-		{
-		    /*
-		     * Check to see if this is a quoted quote - if it is
-		     * strip off a level - if not - it's sacred leave it alone
-		     */
-		    checkLev = PeekAhead((curP - 1), quoteLevel[level]);
-		    if(checkLev > 0)
-		    {
-			if(quoteLevel[level] <= checkLev)
-			{
-			    level--;
-			}
-			else
-			{
-			    level++;
-			    quoteLevel[level] = checkLev;
-			}
-			
-			for(i = 0;i < (checkLev - 2);i++)
-			{
-			    *endP++ = *curP++;curP++;
-			}
-			*endP = *curP++;
-		    }
-		}
-		else 
-		{
-#endif /* WSM */
-		*endP = *curP++;
-#ifdef WSM
-		}
-#endif /* WSM */
-            }
-
-	    if (chlen == 1)
-	    /* Singlebyte character:  character copy finished. */
-	    {
-	        if (isspace (*endP))
-	        /* whitespace character:  leave lnwsP unchanged. */
-	        {
-	            endP++;
-	        }
-	        else
-	        /* non-whitespace character:  point lnwsP to it. */
-	        {
-	            lnwsP = endP++;
-	        }
-	    }
-	    else if (chlen > 1)
-	    /* Multibyte (nonwhitespace) character:  point lnwsP to it.
-	     * Finish character byte copy.
-	     */
-	    {
-	        lnwsP = endP++;
-		while (--chlen)
-		{
-		    *endP++ = *curP++;
-		    lnwsP++;
-		}
-	    }
-        }
-#else
-
-    /* get rid of leading white space */
-    ScanWhitespace (&lineP);
-
-#ifdef WSM
-    /* Return NULL if line is empty, whitespace, or begins with a comment. */
-    if ((lineP == NULL || *lineP == '\0') ||
-	(!SmBehavior && (*lineP == '#')))
-#else /* WSM */
-    /* Return NULL if line is empty, whitespace, or begins with a comment. */
-    if ((lineP == NULL) || (*lineP == '\0') || (*lineP == '#'))
-#endif /* WSM */
-    {
-        *linePP = lineP;
-        return (NULL);
-    }
-
-    if (*lineP == '"')
-    /* Quoted string */
-    {
-#ifdef WSM
-	quoteLevel[level] = 1;	
-#endif /* WSM */
-	/*
-	 * Start beyond double quote and find the end of the quoted string.
-	 * '\' quotes the next character.
-	 * Otherwise,  matching double quote or NULL terminates the string.
-	 *
-	 * We use lnwsP to point to the last non-whitespace character in the
-	 * quoted string.  When we have found the end of the quoted string,
-	 * increment lnwsP and if lnwsP < endP, write NULL into *lnwsP.
-	 * This removes any trailing whitespace without overwriting the 
-	 * matching quote, needed later.  If the quoted string was all 
-	 * whitespace, then this will write a NULL at the beginning of the 
-	 * string that will be returned -- OK.
-	 */
-	lnwsP = lineP++;                /* lnwsP points to first '"' */
-	curP = endP = lineP;            /* other pointers point beyond */
-
-        while ((*endP = *curP) && (*endP != '"'))
-	/* haven't found matching quote yet */
-        {
-	    /* point curP to next character */
-	    curP++;
-	    if ((*endP == '\\') && (*curP != '\0'))
-	    /* shift quoted nonNULL character down and curP ahead */
-	    {
-#ifdef WSM
-		if (SmBehavior)
-		{
-		    /*
-		     * Check to see if this is a quoted quote - if it is
-		     * strip off a level - if not - it's sacred leave it alone
-		     */
-		    checkLev = PeekAhead((curP - 1), quoteLevel[level]);
-		    if(checkLev > 0)
-		    {
-			if(quoteLevel[level] <= checkLev)
-			{
-			    level--;
-			}
-			else
-			{
-			    level++;
-			    quoteLevel[level] = checkLev;
-			}
-			
-			for(i = 0;i < (checkLev - 2);i++)
-			{
-			    *endP++ = *curP++;curP++;
-			}
-			*endP = *curP++;
-		    }
-		}
-		else 
-		{
-#endif /* WSM */
-		*endP = *curP++;
-#ifdef WSM
-		}
-#endif /* WSM */
-            }
-	    if (isspace (*endP))
-	    /* whitespace character:  leave lnwsP unchanged. */
-	    {
-	        endP++;
-	    }
-	    else
-	    /* non-whitespace character:  point lnwsP to it. */
-	    {
-	        lnwsP = endP++;
-	    }
-        }
-#endif
-
-	/*
-	 *  Found matching quote or NULL.  
-	 *  NULL out any trailing whitespace.
-	 */
-
-	lnwsP++;
-	if (lnwsP < endP)
-        {
-	    *lnwsP = '\0';
-        }
-    }
-
-    else
-    /* Unquoted string */
-    {
-        /* 
-	 * Find the end of the nonquoted string.
-	 * '\' quotes the next character.
-	 * Otherwise,  whitespace, end-of-line, or '#' terminates the string.
-	 */
-        curP = endP = lineP;
-
-#ifndef NO_MULTIBYTE
-#ifdef WSM
-        while ((*endP = *curP) &&
-               ((chlen = mblen ((char *)curP, MB_CUR_MAX)) > 0) &&
-               ((chlen > 1) || (!isspace (*curP) && 
-			        (SmBehavior || (*curP != '#')))))
-#else /* WSM */
-        while ((*endP = *curP) &&
-               ((chlen = mblen ((char *)curP, MB_CUR_MAX)) > 0) &&
-               ((chlen > 1) || (!isspace (*curP) && (*curP != '#'))))
-#endif /* WSM */
-	/* Haven't found whitespace or '#' yet.
-	 * First byte of next character has been copied to endP.
-	 */
-        {
-	    curP++;
-	    if ((chlen == 1) && (*endP == '\\') && 
-		((chlen = mblen ((char *)curP, MB_CUR_MAX)) > 0))
-	    /* character quote:
-	     * copy first byte of quoted nonNULL character down.
-	     * point curP to next byte
-	     */
-	    {
-		*endP = *curP++;
-            }
-	    endP++;
-	    if (chlen > 1)
-	    /* Multibyte character:  finish character copy. */
-	    {
-		while (--chlen)
-		{
-		    *endP++ = *curP++;
-		}
-	    }
-        }
-#else
-#ifdef WSM
-        while ((*endP = *curP) && !isspace (*endP) && 
-					(SmBehavior || (*endP != '#')))
-#else /* WSM */
-        while ((*endP = *curP) && !isspace (*endP) && (*endP != '#'))
-#endif /* WSM */
-        {
-	    /* point curP to next character */
-	    curP++;
-	    if ((*endP == '\\') && (*curP != '\0'))
-	    /* shift quoted nonNULL character down and curP ahead */
-	    {
-		*endP = *curP++;
-            }
-	    endP++;
-        }
-#endif
-    }
-
-    /*
-     * Three cases for *endP:
-     *   '#' --> write NULL over # and point to NULL
-     *   whitespace or
-     *     matching quote -> write end-of-line over char and point beyond
-     *   NULL -> point to NULL 
-     */
-
-#ifdef WSM
-    if (!SmBehavior && (*endP == '#'))
-#else /* WSM */
-    if (*endP == '#')
-#endif /* WSM */
-    {
-	*endP = '\0';       /* write '\0' over '#' */
-	*linePP = endP;     /* point to '\0' */
-    }
-    else if (*endP != '\0')
-    {
-	*endP = '\0';       /* write NULL over terminator */
-	*linePP = ++curP;   /* point beyond terminator */
-    }
-    else
-    {
-	*linePP = endP;
-    }
-    return ((unsigned char *)lineP);
-
-} /* END OF FUNCTION GetString */
-#endif /* PANELIST */
-
-
-
 /*************************************<->*************************************
  *
  *  ParseBtnEvent (linePP, eventType, button, state, fClick)
@@ -7333,8 +6817,7 @@ void ProcessMotifBindings (void)
 #endif
 } /* END OF FUNCTION ProcessMotifBindings */
 
-#ifdef PANELIST
-
+
 /*************************************<->*************************************
  *
  *  void
@@ -7989,7 +7472,6 @@ Boolean ParseWmFuncActionArg (unsigned char **linePP,
 } /* END OF FUNCTION ParseWmFuncActionArg */
 
 
-#endif /* PANELIST */
 #ifdef WSM
 
 /*************************************<->*************************************
diff --git a/cde/programs/dtwm/WmResParse.h b/cde/programs/dtwm/WmResParse.h
index 769f0e7a1..a3323152c 100644
--- a/cde/programs/dtwm/WmResParse.h
+++ b/cde/programs/dtwm/WmResParse.h
@@ -34,11 +34,7 @@
 #include <stdio.h>
 
 
-#ifdef PANELIST
 extern void            ProcessWmFile (WmScreenData *pSD, Boolean bNested);
-#else /* PANELIST */
-extern void ProcessWmFile (WmScreenData *pSD);
-#endif /* PANELIST */
 extern void ProcessCommandLine (int argc,  char *argv[]);
 extern void ProcessMotifBindings (void);
 #ifdef WSM
@@ -104,7 +100,6 @@ extern void            ScanWhitespace(unsigned char  **linePP);
 #endif /* not WSM */
 extern void            ToLower (unsigned char  *string);
 extern void		SyncModifierStrings(void);
-#ifdef PANELIST
 extern void DeleteTempConfigFileIfAny (void);
 extern Boolean ParseWmFunctionArg (
 		unsigned char **linePP,
@@ -119,7 +114,6 @@ extern Boolean ParseWmFuncStrArg (unsigned char **linePP,
 				       WmFunction wmFunction, String *pArgs);
 extern Boolean ParseWmFuncActionArg (unsigned char **linePP, 
 				  WmFunction wmFunction, String *pArgs);
-#endif /* PANELIST */
 #ifdef WSM
 #define ToLower(s)		(_DtWmParseToLower (s))
 #define GetNextLine()		(_DtWmParseNextLine (wmGD.pWmPB))
diff --git a/cde/programs/dtwm/WmResource.c b/cde/programs/dtwm/WmResource.c
index 4408ba73a..99be382f7 100644
--- a/cde/programs/dtwm/WmResource.c
+++ b/cde/programs/dtwm/WmResource.c
@@ -1009,7 +1009,6 @@ XtResource wmGlobalResources[] =
 	XtRImmediate,
 	(XtPointer)True
     },
-#if defined(PANELIST)
     {
 	WmNuseFrontPanel,
 	WmCUseFrontPanel,
@@ -1019,7 +1018,6 @@ XtResource wmGlobalResources[] =
 	XtRImmediate,
 	(XtPointer)True
     },
-#endif /* PANELIST */
 #ifdef WSM
     {
 	WmNhelpDirectory,
@@ -1464,7 +1462,6 @@ XtResource wmScreenResources[] =
 	(XtPointer)(WM_FUNC_ALL & ~(MWM_FUNC_MAXIMIZE | MWM_FUNC_MINIMIZE))
     },
 
-#ifdef PANELIST
     {
 	WmNsubpanelDecoration,
 	WmCSubpanelDecoration,
@@ -1484,7 +1481,6 @@ XtResource wmScreenResources[] =
 	XtRString,
 	(XtPointer)NULL
     },
-#endif /* PANELIST */
 
     {
 	WmNuseIconBox,
@@ -3263,9 +3259,7 @@ SetStdGlobalResourceValues (void)
     wmGD.startupKeyFocus = True;
     wmGD.systemButtonClick = True;
     wmGD.systemButtonClick2 = True;
-#if defined(PANELIST)
     wmGD.useFrontPanel=False;
-#endif /* PANELIST */
 
 } /* END OF FUNCTION SetStdGlobalResourceValues */
 
diff --git a/cde/programs/dtwm/WmWinConf.c b/cde/programs/dtwm/WmWinConf.c
index 47874a4ff..0b655b4be 100644
--- a/cde/programs/dtwm/WmWinConf.c
+++ b/cde/programs/dtwm/WmWinConf.c
@@ -2172,13 +2172,11 @@ void ProcessNewConfiguration (ClientData *pCD, int x, int y, unsigned int width,
             }
 	}
 	SetFrameInfo (pCD);
-#ifdef PANELIST
 	if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL)
 	{
 	    /* turn off subpanel behavior if moved */
 	    pCD->dtwmBehaviors &= ~DtWM_BEHAVIOR_SUBPANEL;
 	}
-#endif /* PANELIST */
     }
 
     /*
diff --git a/cde/programs/dtwm/WmWinInfo.c b/cde/programs/dtwm/WmWinInfo.c
index 9fa21da03..bf0e330c5 100644
--- a/cde/programs/dtwm/WmWinInfo.c
+++ b/cde/programs/dtwm/WmWinInfo.c
@@ -49,9 +49,7 @@ static char rcsid[] = "$TOG: WmWinInfo.c /main/18 1999/02/04 15:17:25 mgreess $"
 
 #include <Xm/Xm.h>
 #include <locale.h>
-#ifdef PANELIST
 #include "WmPanelP.h"
-#endif /* PANELIST */
 
 #define makemult(a, b) ((b==1) ? (a) : (((int)((a) / (b))) * (b)) )
 
@@ -82,10 +80,8 @@ static char rcsid[] = "$TOG: WmWinInfo.c /main/18 1999/02/04 15:17:25 mgreess $"
 #include "WmXSMP.h"
 #include "WmMultiHead.h"
 
-#ifdef PANELIST
 static void AdjustSlideOutGeometry (ClientData *pCD);
 static void FixSubpanelEmbeddedClientGeometry (ClientData *pCD);
-#endif /* PANELIST */
 
 #ifndef NO_MESSAGE_CATALOG
 # define LOCALE_MSG GETMESSAGE(70, 7, "[XmbTextPropertyToTextList]:\n     Locale (%.100s) not supported. (Check $LANG).")
@@ -161,11 +157,9 @@ GetClientInfo (WmScreenData *pSD, Window clientWindow, long manageFlags)
     pCD->pIconBox = NULL;
 #endif /* WSM */
     pCD->thisIconBox = NULL;
-#ifdef PANELIST
     pCD->pECD = NULL;
     pCD->pPRCD = NULL;
     pCD->pSOR = NULL;
-#endif /* PANELIST */
     pCD->wmUnmapCount = 0;
     pCD->transientFor = (Window)0L;
     pCD->transientLeader = NULL;
@@ -655,7 +649,6 @@ int i;
 #ifdef WSM
 	    pCD->dtwmFunctions &= ~DtWM_FUNCTION_OCCUPY_WS;
 #endif /* WSM */
-#ifdef PANELIST
 	    if (wmGD.useFrontPanel && pCD->pSD->iconBoxControl) 
 	    { 
 		/*
@@ -665,8 +658,6 @@ int i;
 		pCD->clientFunctions &= ~MWM_FUNC_MINIMIZE;
 		pCD->clientFunctions |= MWM_FUNC_CLOSE;
 	    }
-#else /* PANELIST */
-#endif /* PANELIST */
         }
 
 
@@ -2371,12 +2362,8 @@ ProcessWmWindowTitle (ClientData *pCD, Boolean firstTime)
      * If this is a tear-off menu, then make sure title text is not clipped
      */
 
-#ifdef PANELIST
     if ((pCD->window_status & MWM_TEAROFF_WINDOW) ||
         (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL))
-#else /* PANELIST */
-    if (pCD->window_status & MWM_TEAROFF_WINDOW)
-#endif /* PANELIST */
     {
 	unsigned int boxdim = TitleBarHeight (pCD);
 	unsigned long decor = pCD->decor;
@@ -2392,9 +2379,7 @@ ProcessWmWindowTitle (ClientData *pCD, Boolean firstTime)
 	 * Calculations derived from GetTextBox() and GetFramePartInfo()
 	 */
 	minWidth = XmStringWidth(fontList, pCD->clientTitle) +
-#ifdef PANELIST
 	    ((pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL) ? 4 : 0) +
-#endif /* PANELIST */
 			    ((decor & MWM_DECOR_MENU) ? boxdim : 0) +
 			    ((decor & MWM_DECOR_MINIMIZE) ? boxdim : 0) +
 			    ((decor & MWM_DECOR_MAXIMIZE) ? boxdim : 0) +
@@ -2405,19 +2390,15 @@ ProcessWmWindowTitle (ClientData *pCD, Boolean firstTime)
 	{
 	    pCD->minWidth = minWidth;
 	}
-#ifdef PANELIST
 	if ((pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL) &&
             (pCD->clientWidth < pCD->minWidth))
 	{
 	    FixSubpanelEmbeddedClientGeometry (pCD);
 	}
-#endif /* PANELIST */
     }
 
 } /* END OF FUNCTION ProcessWmWindowTitle */
 
-#ifdef PANELIST
-
 /*************************************<->*************************************
  *
  *  FixSubpanelEmbeddedClientGeometry ( pCD )
@@ -2506,9 +2487,7 @@ FixSubpanelEmbeddedClientGeometry (ClientData *pCD)
     }
 } /* END OF FUNCTION FixEmbeddedClientGeometry */
 
-#endif /* PANELIST */
 
-
 /*************************************<->*************************************
  *
  *  ProcessWmIconTitle (pCD, firstTime)
@@ -3058,7 +3037,6 @@ InitClientPlacement (ClientData *pCD, long manageFlags)
 
 
 #ifdef WSM
-#ifdef PANELIST
     if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL)
     {
 	if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUB_RESTORED)
@@ -3071,7 +3049,6 @@ InitClientPlacement (ClientData *pCD, long manageFlags)
 	}
     }
     else
-#endif /* PANELIST */
 #endif /* WSM */
     if (((wmGD.positionOnScreen) && !interactivelyPlaced) &&
 	(!(pCD->clientFlags & (SM_X | SM_Y))))
@@ -3128,8 +3105,6 @@ InitClientPlacement (ClientData *pCD, long manageFlags)
 
 } /* END OF FUNCTION InitClientPlacement */
 
-#ifdef PANELIST
-
 /******************************<->*************************************
  *
  * void AdjustSlideOutGeometry (pCD)
@@ -3217,9 +3192,7 @@ AdjustSlideOutGeometry ( ClientData *pCD)
 	SetFrameInfo (pCD);
     }
 }
-#endif  /* PANELIST */
 
-
 /*************************************<->*************************************
  *
  *  PlaceFrameOnScreen (pCD, pX, pY, w, h)
@@ -4011,7 +3984,6 @@ ProcessMwmHints (ClientData *pCD)
 	{
 	    pCD->clientFunctions = WM_FUNC_ALL;
 	}
-#ifdef PANELIST
         if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL)
 	{
 	    pCD->clientFunctions &= WM_FUNC_SUBPANEL_DEFAULT;   
@@ -4022,7 +3994,6 @@ ProcessMwmHints (ClientData *pCD)
 	    pCD->clientFunctions &= WM_FUNC_PANEL_DEFAULT;   
 	    pCD->dtwmFunctions &= ~DtWM_FUNCTION_OCCUPY_WS;
 	}
-#endif /* PANELIST */
     }
 
     if (pCD->clientDecoration & WM_DECOR_DEFAULT)
@@ -4035,7 +4006,6 @@ ProcessMwmHints (ClientData *pCD)
 	{
 	    pCD->clientDecoration = WM_DECOR_ALL;
 	}
-#ifdef PANELIST
         if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL)
 	{
 	    pCD->clientDecoration = pCD->pSD->subpanelDecoration;
@@ -4044,7 +4014,6 @@ ProcessMwmHints (ClientData *pCD)
 	{
 	    pCD->clientDecoration &= WM_DECOR_PANEL_DEFAULT;   
 	}
-#endif /* PANELIST */
     }
 
 
diff --git a/cde/programs/dtwm/WmWinState.c b/cde/programs/dtwm/WmWinState.c
index 3e55a06cb..6350ef4f0 100644
--- a/cde/programs/dtwm/WmWinState.c
+++ b/cde/programs/dtwm/WmWinState.c
@@ -56,9 +56,7 @@ static char rcsid[] = "$XConsortium: WmWinState.c /main/6 1996/06/20 09:39:39 rs
 #include "WmIPlace.h"
 #include "WmIconBox.h"
 #include "WmKeyFocus.h"
-#ifdef PANELIST
 #include "WmPanelP.h"  /* for typedef in WmManage.h */
-#endif /* PANELIST */
 #include "WmManage.h"
 #include "WmProperty.h"
 #include "WmWinInfo.h"
@@ -74,9 +72,7 @@ static char rcsid[] = "$XConsortium: WmWinState.c /main/6 1996/06/20 09:39:39 rs
 
 #include "WmMultiHead.h"
 #include "WmWinState.h"
-#ifdef PANELIST
 static void SlideWindowOut (ClientData *pCD);
-#endif /* PANELIST */
 static void UnmapClients (ClientData *pCD, unsigned int event_mask);
 static void SetupWindowStateWithEventMask (ClientData *pCD, int newState, Time setTime, unsigned int event_mask);
 
@@ -217,9 +213,7 @@ void SetClientStateWithEventMask (ClientData *pCD, int newState, Time setTime, u
 #ifdef WSM
 	    XMapWindow (DISPLAY, pCD->client);
 	    XMapWindow (DISPLAY, pCD->clientFrameWin);
-#if defined(PANELIST)
             WmStopWaiting();   /* in WmIPC.c */
-#endif /* PANELIST */
 #endif /* WSM */
 	    break;
 	}
@@ -569,7 +563,6 @@ static void SetupWindowStateWithEventMask (ClientData *pCD, int newState,
 	if ( (!(pCD->clientFlags & ICON_BOX)) || 
 	     ((pCD->clientFlags & ICON_BOX) && (!(firstTime))) )
 	{
-#ifdef PANELIST
 	  if ((currentState == WITHDRAWN_STATE) && 
 	      (pCD->dtwmBehaviors & DtWM_BEHAVIOR_SUBPANEL) &&
 	      !(pCD->transientChildren))
@@ -587,7 +580,6 @@ static void SetupWindowStateWithEventMask (ClientData *pCD, int newState,
 	      }
 	  }
 	  else
-#endif /* PANELIST */
 	    MapClientWindows (pCD);
 	}
 
@@ -839,8 +831,6 @@ void SetClientWMState (ClientData *pCD, int wmState, int mwmState)
 
 } /* END OF FUNCTION SetClientWMState */
 
-#ifdef PANELIST
-
 #define SLIDE_UP_PERCENTAGE	5
 #define SLIDE_UP_DIVISOR	(100/SLIDE_UP_PERCENTAGE)
 #define SLIDE_UP_INTERVAL	15
@@ -1307,7 +1297,6 @@ SlideSubpanelBackIn (ClientData *pCD, Widget wSubpanel)
     }
 
 } /* END OF FUNCTION SlideOutWindow */
-#endif /* PANELIST */
 
 
 /*************************************<->*************************************
diff --git a/cde/programs/dtwm/WmWinState.h b/cde/programs/dtwm/WmWinState.h
index 724706191..db9f24447 100644
--- a/cde/programs/dtwm/WmWinState.h
+++ b/cde/programs/dtwm/WmWinState.h
@@ -40,6 +40,4 @@ extern void ShowIconForMinimizedClient (WmWorkspaceData *pWS, ClientData *pCD);
 #ifdef WSM
 extern void ShowAllIconsForMinimizedClient (ClientData *pCD);
 #endif /* WSM */
-#ifdef PANELIST
 extern void SlideSubpanelBackIn (ClientData *pCD, Widget wSubpanel);
-#endif /* PANELIST */
diff --git a/cde/programs/dtwm/WmWrkspace.c b/cde/programs/dtwm/WmWrkspace.c
index e9147e384..b9a1163f3 100644
--- a/cde/programs/dtwm/WmWrkspace.c
+++ b/cde/programs/dtwm/WmWrkspace.c
@@ -50,9 +50,7 @@ static char rcsid[] = "$XConsortium: WmWrkspace.c /main/7 1996/10/23 17:26:33 rs
 #include <Dt/DtP.h>
 #include <Dt/WsmM.h>
 #include <stdio.h>
-#ifdef PANELIST
 #include "WmPanelP.h"
-#endif /* PANELIST */
 #include "WmIPC.h"		/* must be after DtP.h */
 #ifdef WSM
 #include "WmPresence.h"
@@ -262,8 +260,6 @@ ChangeToWorkspace(
 
 } /* END OF FUNCTION ChangeToWorkspace */
 
-#ifdef PANELIST
-
 /******************************<->*************************************
  *
  *  ChangeWorkspaceTitle (pWS, pchTitle)
@@ -328,7 +324,6 @@ ChangeWorkspaceTitle(
     dtSendWorkspaceModifyNotification(pWS->pSD, pWS->id, DtWSM_REASON_TITLE);
 
 } /* END OF FUNCTION ChangeWorkspaceTitle */
-#endif /* PANELIST */
 
 
 /*************************************<->*************************************
@@ -864,9 +859,7 @@ ProcessDtWmHints (ClientData *pCD)
 #ifdef HP_VUE
     Atom	propertyVUE;
 #endif /* HP_VUE */
-#ifdef PANELIST
     long	saveFunctions;
-#endif /* PANELIST */
 
     /*
      * Retrieve the _DT_WM_HINTS property if it exists.
@@ -919,7 +912,6 @@ ProcessDtWmHints (ClientData *pCD)
 
 	XFree ((char*)pHints);
     }
-#ifdef PANELIST
 
     if (pCD->dtwmBehaviors & DtWM_BEHAVIOR_PANEL)
     {
@@ -932,7 +924,6 @@ ProcessDtWmHints (ClientData *pCD)
 	pCD->dtwmFunctions = saveFunctions;
 	pCD->clientFlags |= FRONT_PANEL_BOX ;
     }
-#endif /* PANELIST */
 } /* END OF ProcessDtWmHints */
 
 
@@ -2355,7 +2346,6 @@ RemoveSubtreeFromWorkspaces(
 }   /* END OF FUNCTION RemoveSubtreeFromWorkspaces */
 
 
-#ifdef PANELIST
 
 /******************************<->*************************************
  *
@@ -2414,7 +2404,6 @@ GetListOfOccupiedWorkspaces(
     return(pLocalIDs);
 
 }   /* END OF FUNCTION GetListOfOccupiedWorkspaces */
-#endif /* PANELIST */
 
 
 /******************************<->*************************************
@@ -3429,9 +3418,7 @@ void
 SaveResources( WmScreenData *pSD)
 {
     int wsCnt;
-#ifdef PANELIST
     WmPanelistObject  pPanelist;
-#endif /* PANELIST */
 
     if(pSD)
     {
@@ -3442,7 +3429,6 @@ SaveResources( WmScreenData *pSD)
 				    WM_RES_WORKSPACE_COUNT));
 	}
 
-#ifdef PANELIST
 	pPanelist = (WmPanelistObject) pSD->wPanelist;
 	if (pPanelist && O_Shell(pPanelist))
 	{
@@ -3455,7 +3441,6 @@ SaveResources( WmScreenData *pSD)
 	    
 	    WmFrontPanelSessionSaveData();
 	}
-#endif /*  PANELIST */
 
 
 
@@ -3515,11 +3500,9 @@ SaveWorkspaceResources(
     Dimension clientWidth;
     Dimension clientHeight;
     int xoff, yoff;
-#ifdef PANELIST
     WmPanelistObject  pPanelist = (WmPanelistObject) pWS->pSD->wPanelist;
     ClientData *pCD_Panel ;
     char tmpBuffer[MAXWMPATH+1];
-#endif /* PANELIST */
     int iLen;
 
     /* allocate initial data space */
@@ -3678,7 +3661,6 @@ SaveWorkspaceResources(
 	AddStringToResourceData (buffer, &data, &cum_len);
     }
 
-#ifdef PANELIST
     if ((flags & WM_RES_FP_POSITION) &&
 	(O_Shell(pPanelist)) && 
         (!wmGD.useStandardBehavior) &&
@@ -3791,7 +3773,6 @@ SaveWorkspaceResources(
 
 	AddStringToResourceData (buffer, &data, &cum_len);
     }
-#endif /* PANELIST */
 
     if ((flags & WM_RES_ICONBOX_GEOMETRY) &&
         (!wmGD.useStandardBehavior))
diff --git a/cde/programs/dtwm/WmWrkspace.h b/cde/programs/dtwm/WmWrkspace.h
index fe901bbb0..823ea68ce 100644
--- a/cde/programs/dtwm/WmWrkspace.h
+++ b/cde/programs/dtwm/WmWrkspace.h
@@ -115,11 +115,9 @@ extern void RemoveSubtreeFromWorkspaces(
                         ClientData *pCD,
                         WorkspaceID *pIDs,
                         unsigned int numIDs) ;
-#ifdef PANELIST
 extern WorkspaceID * GetListOfOccupiedWorkspaces( 
 			ClientData *pCD,
                         int *numIDs) ;
-#endif /* PANELIST */
 extern void HonorAbsentMapBehavior(
 			ClientData *pCD) ;
 extern void RemoveClientFromWorkspaces( 
@@ -188,12 +186,10 @@ extern void AddStringToResourceData(
                         char *string,
                         char **pdata,
                         int *plen) ;
-#ifdef PANELIST
 extern void SetCurrentWorkspaceButton(
 			WmScreenData *pSD);
 extern void SetFrontPanelTitle( 
 			WmScreenData *pSD);
-#endif /* PANELIST */
 
 /********    End Public Function Declarations    ********/
 #endif /* WSM */