--- rxvt-unicode/src/rxvt.h	2012/01/19 13:33:43	1.466
+++ rxvt-unicode/src/rxvt.h	2012/02/04 21:47:06	1.468
@@ -26,8 +26,6 @@
 // stdlib.h might provide it
 #endif
 
-using namespace std;
-
 // we assume that Xlib.h defines XPointer, and it does since at least 1994...
 
 extern "C" {
@@ -74,12 +72,6 @@
 #include <X11/keysymdef.h>
 #include <X11/Xatom.h>
 
-#ifdef HAVE_AFTERIMAGE
-# include <afterimage.h>
-# undef min
-# undef max
-#endif
-
 #ifdef HAVE_PIXBUF
 # include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
@@ -1182,17 +1174,6 @@
     bg_flags &= ~BG_IS_VALID;
   }
 #endif
-#ifdef HAVE_AFTERIMAGE
-  ASImage        *original_asim;
-  ASVisual       *asv;
-  ASImageManager *asimman;
-
-  void init_asv ()
-  {
-    if (!asv)
-      asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
-  }
-#endif
 #ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf;
   bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,