--- rxvt-unicode/src/main.C	2005/02/13 11:07:57	1.135
+++ rxvt-unicode/src/main.C	2005/02/16 21:37:10	1.139
@@ -32,7 +32,6 @@
 
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
-#include "main.intpro"          /* PROTOS for internal routines */
 
 #include <csignal>
 #include <cstring>
@@ -255,7 +254,11 @@
 #endif
       delete TermWin.drawable;
       // destroy all windows
-      if (TermWin.parent[0])
+      if (TermWin.parent[0]
+#if ENABLE_FRILLS
+          && !rs[Rs_embed]
+#endif
+          )
         XDestroyWindow (disp, TermWin.parent[0]);
     }
 
@@ -588,7 +591,6 @@
   return p;
 }
 
-/* INTPROTO */
 void           *
 rxvt_calloc (size_t number, size_t size)
 {
@@ -600,7 +602,6 @@
   return p;
 }
 
-/* INTPROTO */
 void           *
 rxvt_realloc (void *ptr, size_t size)
 {
@@ -714,16 +715,19 @@
       parsed_geometry = 1;
       if (rs[Rs_geometry])
         flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
+
       if (flags & WidthValue)
         {
           TermWin.ncol = BOUND_POSITIVE_INT16 (w);
           szHint.flags |= USSize;
         }
+
       if (flags & HeightValue)
         {
           TermWin.nrow = BOUND_POSITIVE_INT16 (h);
           szHint.flags |= USSize;
         }
+
       if (flags & XValue)
         {
           szHint.x = x;
@@ -734,6 +738,7 @@
               szHint.win_gravity = NorthEastGravity;
             }
         }
+
       if (flags & YValue)
         {
           szHint.y = y;