diff --git a/repos/gems/src/app/decorator/animator.h b/repos/gems/include/gems/animator.h
similarity index 77%
rename from repos/gems/src/app/decorator/animator.h
rename to repos/gems/include/gems/animator.h
index 52b5a5a09..19db820fc 100644
--- a/repos/gems/src/app/decorator/animator.h
+++ b/repos/gems/include/gems/animator.h
@@ -11,8 +11,12 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _ANIMATOR_H_
-#define _ANIMATOR_H_
+#ifndef _INCLUDE__GEMS__ANIMATOR_H_
+#define _INCLUDE__GEMS__ANIMATOR_H_
+
+/* Genode includes */
+#include <util/list.h>
+
 
 class Animator
 {
@@ -29,6 +33,8 @@ class Animator
 	public:
 
 		inline void animate();
+
+		bool active() const { return _items.first() != nullptr; }
 };
 
 
@@ -69,8 +75,11 @@ class Animator::Item : public Genode::List<Item>::Element
 
 inline void Animator::animate()
 {
-	for (Item *item = _items.first(); item; item = item->next())
+	for (Item *item = _items.first(); item; ) {
+		Item *next = item->next();
 		item->animate();
+		item = next;
+	}
 }
 
-#endif /* _ANIMATOR_H_ */
+#endif /* _INCLUDE__GEMS__ANIMATOR_H_ */
diff --git a/repos/gems/src/app/decorator/window.h b/repos/gems/src/app/decorator/window.h
index d5107c201..f778db9d7 100644
--- a/repos/gems/src/app/decorator/window.h
+++ b/repos/gems/src/app/decorator/window.h
@@ -17,8 +17,8 @@
 #include <util/lazy_value.h>
 #include <decorator/window.h>
 
-/* local includes */
-#include <animator.h>
+/* gems includes */
+#include <gems/animator.h>
 
 
 namespace Decorator { class Window; }