diff --git a/src/eobj.h b/src/eobj.h
index c459754f..159c8bb8 100644
--- a/src/eobj.h
+++ b/src/eobj.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2010 Kim Woelders
+ * Copyright (C) 2004-2011 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -79,6 +79,7 @@ struct _eobj {
 #define EobjGetW(eo)            WinGetW(EobjGetWin(eo))
 #define EobjGetH(eo)            WinGetH(EobjGetWin(eo))
 #define EobjGetBW(eo)           WinGetBorderWidth(EobjGetWin(eo))
+#define EoIsMapped(eo)          WinIsMapped(EoGetWin(eo))
 #define EobjHasEmptyShape(eo)   (WinGetNumRect(EobjGetWin(eo)) < 0)
 
 #define EobjGetType(eo)         ((eo)->type)
diff --git a/src/ewins.h b/src/ewins.h
index 1aabd573..820f003e 100644
--- a/src/ewins.h
+++ b/src/ewins.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors
- * Copyright (C) 2004-2010 Kim Woelders
+ * Copyright (C) 2004-2011 Kim Woelders
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -286,9 +286,9 @@ struct _ewin {
 #define EWIN_GRAVITY_SW         2
 #define EWIN_GRAVITY_SE         3
 
+#define EwinIsMapped(ewin)		EoIsMapped(ewin)
 #define EwinGetDesk(ewin)		EoGetDesk(ewin)
 
-#define EwinIsMapped(ewin)		((ewin)->state.state >= EWIN_STATE_MAPPED)
 #define EwinIsInternal(ewin)		((ewin)->type != EWIN_TYPE_NORMAL)
 #define EwinIsTransientChild(ewin)	((ewin)->icccm.transient > 0)
 #define EwinIsTransient(ewin)		((ewin)->icccm.transient != 0)