diff --git a/os/src/server/nitpicker/common/view_stack.cc b/os/src/server/nitpicker/common/view_stack.cc
index b31766b336..f1da6c409d 100644
--- a/os/src/server/nitpicker/common/view_stack.cc
+++ b/os/src/server/nitpicker/common/view_stack.cc
@@ -11,8 +11,6 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#include <base/printf.h>
-
 #include "view_stack.h"
 #include "clip_guard.h"
 
@@ -35,19 +33,6 @@ static View const *last_stay_top_view(View const *view)
 }
 
 
-/**
- * Get last view that without background attribute
- */
-//static View *last_foreground_view(View *view)
-//{
-//	for (; view && view->view_stack_next(); view = view->view_stack_next())
-//		if (view->view_stack_next()->background())
-//			break;
-//
-//	return view;
-//}
-
-
 /**************************
  ** View stack interface **
  **************************/
diff --git a/os/src/server/nitpicker/include/list.h b/os/src/server/nitpicker/include/list.h
deleted file mode 100644
index 4dfe6d95fa..0000000000
--- a/os/src/server/nitpicker/include/list.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * \brief  Simple connected list
- * \author Norman Feske
- * \date   2006-08-02
- */
-
-/*
- * Copyright (C) 2006-2013 Genode Labs GmbH
- *
- * This file is part of the Genode OS framework, which is distributed
- * under the terms of the GNU General Public License version 2.
- */
-
-#ifndef _LIST_H_
-#define _LIST_H_
-
-/*
- * \param LT  list element type
- */
-template <typename LT>
-class List
-{
-	private:
-
-		LT *_first;
-
-	public:
-
-		class Element
-		{
-			protected:
-
-				friend class List;
-
-				LT mutable *_next;
-
-			public:
-
-				Element(): _next(0) { }
-
-				/**
-				 * Return next element in list
-				 */
-				LT *next() const { return _next; }
-		};
-
-	public:
-
-		/**
-		 * Constructor
-		 *
-		 * On construction, start with an empty list.
-		 */
-		List(): _first(0) { }
-
-		/**
-		 * Return first list element
-		 */
-		LT       *first()       { return _first; }
-		LT const *first() const { return _first; }
-
-		/**
-		 * Insert element into list
-		 *
-		 * \param  le  list element to insert
-		 * \param  at  target position (preceding list element) or
-		 *             0 to insert element at the beginning of the list
-		 */
-		void insert(LT const *le, LT const *at = 0)
-		{
-			/* insert element at the beginning of the list */
-			if (at == 0) {
-				le->_next = _first;
-				_first    = const_cast<LT *>(le);
-			} else {
-				le->_next = at->_next;
-				at->_next = const_cast<LT *>(le);
-			}
-		}
-
-		/**
-		 * Remove element from list
-		 */
-		void remove(LT const *le)
-		{
-			if (!_first) return;
-
-			/* if specified element is the first of the list */
-			if (le == _first)
-				_first = le->_next;
-
-			else {
-
-				/* search specified element in the list */
-				LT *e = _first;
-				while (e->_next && (e->_next != le))
-					e = e->_next;
-
-				/* element is not member of the list */
-				if (!e->_next) return;
-
-				/* e->_next is the element to remove, skip it in list */
-				e->_next = e->_next->_next;
-			}
-
-			le->_next = 0;
-		}
-};
-
-#endif
diff --git a/os/src/server/nitpicker/include/view.h b/os/src/server/nitpicker/include/view.h
index 5eb2f8f7eb..d2945f3782 100644
--- a/os/src/server/nitpicker/include/view.h
+++ b/os/src/server/nitpicker/include/view.h
@@ -15,10 +15,10 @@
 #define _VIEW_H_
 
 #include <util/string.h>
+#include <util/list.h>
 #include <nitpicker_gfx/canvas.h>
 #include <nitpicker_gfx/geometry.h>
 
-#include "list.h"
 #include "mode.h"
 #include "session.h"
 
@@ -29,10 +29,10 @@ class Buffer;
  * For each buffer, there is a list of views that belong to
  * this buffer. This list is called Same_buffer_list.
  */
-class Same_buffer_list_elem : public List<Same_buffer_list_elem>::Element { };
+struct Same_buffer_list_elem : Genode::List<Same_buffer_list_elem>::Element { };
 
 
-class View_stack_elem : public List<View_stack_elem>::Element { };
+struct View_stack_elem : Genode::List<View_stack_elem>::Element { };
 
 
 class View : public Same_buffer_list_elem, public View_stack_elem, public Rect
diff --git a/os/src/server/nitpicker/include/view_stack.h b/os/src/server/nitpicker/include/view_stack.h
index dde9628f68..184e11b38c 100644
--- a/os/src/server/nitpicker/include/view_stack.h
+++ b/os/src/server/nitpicker/include/view_stack.h
@@ -22,10 +22,10 @@ class View_stack
 {
 	private:
 
-		Canvas                &_canvas;
-		Mode                  &_mode;
-		List<View_stack_elem>  _views;
-		View                  *_default_background;
+		Canvas                        &_canvas;
+		Mode                          &_mode;
+		Genode::List<View_stack_elem>  _views;
+		View                          *_default_background;
 
 		/**
 		 * Return outline geometry of a view