--- rxvt-unicode/src/menubar.C	2004/03/01 01:06:46	1.11
+++ rxvt-unicode/src/menubar.C	2004/03/06 00:05:01	1.13
@@ -24,8 +24,7 @@
 
 #include "../config.h"		/* NECESSARY */
 
-#include <stdlib.h>
-#include <wchar.h>
+#include <cstdlib>
 
 #include "rxvt.h"		/* NECESSARY */
 #ifdef MENUBAR
@@ -1410,7 +1409,7 @@
   time (&t);
 
   fprintf (fp,
-          "# " APL_SUBCLASS " (%s)  Pid: %u\n# Date: %s\n\n",
+          "# " RESCLASS " (%s)  Pid: %u\n# Date: %s\n\n",
           rs[Rs_name], (unsigned int)getpid (), ctime (&t));
 
   /* dump in reverse order */
@@ -1757,7 +1756,7 @@
                 /* enough space to hold the results */
                 char            buffer[32];
 
-                sprintf (buffer, "/tmp/" APL_SUBCLASS "-%u",
+                sprintf (buffer, "/tmp/" RESCLASS "-%u",
                         (unsigned int)getpid ());
 
                 if ((fp = fopen (buffer, "wb")) != NULL)