Rename include/nitpicker_session to gui_session

This patch also renames the depot api archive accordingly. Issue #3778
2025-04-09 04:15:52 +00:00 · 2020-06-11 14:27:20 +02:00 · 2020-06-11 14:27:20 +02:00 · c6eda9bd80
commit c6eda9bd80
parent 87b08d6c7f
75 changed files with 87 additions and 87 deletions
--- a/repos/demo/include/scout/nitpicker_graphics_backend.h
+++ b/repos/demo/include/scout/nitpicker_graphics_backend.h
@ -15,7 +15,7 @@
 #define _INCLUDE__SCOUT__NITPICKER_GRAPHICS_BACKEND_H_

 /* Genode includes */
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <os/pixel_rgb565.h>
 #include <base/attached_dataspace.h>

--- a/repos/demo/recipes/src/demo/used_apis
+++ b/repos/demo/recipes/src/demo/used_apis
@ -5,4 +5,4 @@ nitpicker_gfx
 timer_session
 input_session
 framebuffer_session
-nitpicker_session
+gui_session
--- a/repos/demo/src/server/nitlog/main.cc
+++ b/repos/demo/src/server/nitlog/main.cc
@ -18,7 +18,7 @@
 #include <base/session_label.h>
 #include <root/component.h>
 #include <log_session/log_session.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <timer_session/connection.h>
 #include <input/event.h>
 #include <os/pixel_rgb565.h>
--- a/repos/gems/include/gems/nitpicker_buffer.h
+++ b/repos/gems/include/gems/nitpicker_buffer.h
@ -16,7 +16,7 @@

 /* Genode includes */
 #include <base/ram_allocator.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <base/attached_dataspace.h>
 #include <base/attached_ram_dataspace.h>
 #include <os/surface.h>
--- a/repos/gems/include/gems/wrapped_nitpicker_session.h
+++ b/repos/gems/include/gems/wrapped_nitpicker_session.h
@ -22,7 +22,7 @@

 /* Genode includes */
 #include <base/rpc_server.h>
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>

 class Wrapped_nitpicker_session : public Genode::Rpc_object<Nitpicker::Session>
 {
--- a/repos/gems/include/nano3d/scene.h
+++ b/repos/gems/include/nano3d/scene.h
@ -22,7 +22,7 @@
 /* Genode includes */
 #include <base/entrypoint.h>
 #include <timer_session/connection.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <os/surface.h>
 #include <os/pixel_alpha8.h>
 #include <base/attached_dataspace.h>
--- a/repos/gems/recipes/src/backdrop/used_apis
+++ b/repos/gems/recipes/src/backdrop/used_apis
@ -7,6 +7,6 @@ blit
 gems
 nitpicker_gfx
 vfs
-nitpicker_session
+gui_session
 framebuffer_session
 input_session
--- a/repos/gems/recipes/src/cpu_load_display/used_apis
+++ b/repos/gems/recipes/src/cpu_load_display/used_apis
@ -4,6 +4,6 @@ polygon_gfx
 nano3d
 gems
 input_session
-nitpicker_session
+gui_session
 framebuffer_session
 timer_session
--- a/repos/gems/recipes/src/decorator/used_apis
+++ b/repos/gems/recipes/src/decorator/used_apis
@ -4,6 +4,6 @@ nitpicker_gfx
 scout_gfx
 gems
 input_session
-nitpicker_session
+gui_session
 framebuffer_session
 report_session
--- a/repos/gems/recipes/src/menu_view/used_apis
+++ b/repos/gems/recipes/src/menu_view/used_apis
@ -8,7 +8,7 @@ gems
 nitpicker_gfx
 scout_gfx
 vfs
-nitpicker_session
+gui_session
 framebuffer_session
 input_session
 timer_session
--- a/repos/gems/recipes/src/nano3d/used_apis
+++ b/repos/gems/recipes/src/nano3d/used_apis
@ -3,7 +3,7 @@ os
 blit
 framebuffer_session
 input_session
-nitpicker_session
+gui_session
 timer_session
 nano3d
 polygon_gfx
--- a/repos/gems/recipes/src/nit_fader/used_apis
+++ b/repos/gems/recipes/src/nit_fader/used_apis
@ -3,7 +3,7 @@ os
 blit
 framebuffer_session
 input_session
-nitpicker_session
+gui_session
 timer_session
 nitpicker_gfx
 scout_gfx
--- a/repos/gems/recipes/src/sculpt_manager/used_apis
+++ b/repos/gems/recipes/src/sculpt_manager/used_apis
@ -8,7 +8,7 @@ block_session
 usb_session
 framebuffer_session
 platform_session
-nitpicker_session
+gui_session
 terminal_session
 rtc_session
 input_session
--- a/repos/gems/recipes/src/text_area/used_apis
+++ b/repos/gems/recipes/src/text_area/used_apis
@ -4,6 +4,6 @@ vfs
 report_session
 file_system_session
 timer_session
-nitpicker_session
+gui_session
 input_session
 framebuffer_session
--- a/repos/gems/recipes/src/themed_decorator/used_apis
+++ b/repos/gems/recipes/src/themed_decorator/used_apis
@ -10,6 +10,6 @@ zlib
 gems
 vfs
 input_session
-nitpicker_session
+gui_session
 framebuffer_session
 report_session
--- a/repos/gems/recipes/src/window_layouter/used_apis
+++ b/repos/gems/recipes/src/window_layouter/used_apis
@ -2,6 +2,6 @@ base
 os
 input_session
 report_session
-nitpicker_session
+gui_session
 framebuffer_session
 timer_session
--- a/repos/gems/recipes/src/wm/used_apis
+++ b/repos/gems/recipes/src/wm/used_apis
@ -2,6 +2,6 @@ base
 os
 gems
 input_session
-nitpicker_session
+gui_session
 framebuffer_session
 report_session
--- a/repos/gems/src/app/backdrop/main.cc
+++ b/repos/gems/src/app/backdrop/main.cc
@ -15,7 +15,7 @@
 #include <base/component.h>
 #include <base/heap.h>
 #include <base/attached_rom_dataspace.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <util/misc_math.h>
 #include <decorator/xml_utils.h>
 #include <nitpicker_gfx/box_painter.h>
--- a/repos/gems/src/app/decorator/main.cc
+++ b/repos/gems/src/app/decorator/main.cc
@ -16,7 +16,7 @@
 #include <base/component.h>
 #include <base/heap.h>
 #include <base/attached_rom_dataspace.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <os/pixel_rgb565.h>
 #include <os/reporter.h>

--- a/repos/gems/src/app/menu_view/types.h
+++ b/repos/gems/src/app/menu_view/types.h
@ -15,7 +15,7 @@
 #define _TYPES_H_

 /* Genode includes */
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <util/misc_math.h>
 #include <decorator/xml_utils.h>
 #include <nitpicker_gfx/box_painter.h>
--- a/repos/gems/src/app/sculpt_manager/main.cc
+++ b/repos/gems/src/app/sculpt_manager/main.cc
@ -17,7 +17,7 @@
 #include <base/attached_rom_dataspace.h>
 #include <os/reporter.h>
 #include <os/path.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <vm_session/vm_session.h>
 #include <timer_session/connection.h>

--- a/repos/gems/src/app/sculpt_manager/nitpicker.cc
+++ b/repos/gems/src/app/sculpt_manager/nitpicker.cc
@ -15,7 +15,7 @@

 /* Genode includes */
 #include <input/component.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <base/heap.h>

 struct Nitpicker::Session_component : Rpc_object<Nitpicker::Session>
--- a/repos/gems/src/app/sculpt_manager/nitpicker.h
+++ b/repos/gems/src/app/sculpt_manager/nitpicker.h
@ -16,7 +16,7 @@

 /* Genode includes */
 #include <root/component.h>
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>
 #include <base/component.h>

 /* local includes */
--- a/repos/gems/src/app/sculpt_manager/types.h
+++ b/repos/gems/src/app/sculpt_manager/types.h
@ -18,7 +18,7 @@
 #include <base/env.h>
 #include <base/attached_rom_dataspace.h>
 #include <platform_session/platform_session.h>
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>
 #include <usb_session/usb_session.h>
 #include <log_session/log_session.h>
 #include <rm_session/rm_session.h>
--- a/repos/gems/src/app/text_area/nitpicker.h
+++ b/repos/gems/src/app/text_area/nitpicker.h
@ -17,7 +17,7 @@
 /* Genode includes */
 #include <input/component.h>
 #include <base/session_object.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 /* local includes */
 #include <input_event_handler.h>
--- a/repos/gems/src/app/themed_decorator/window.h
+++ b/repos/gems/src/app/themed_decorator/window.h
@ -17,7 +17,7 @@
 /* Genode includes */
 #include <base/ram_allocator.h>
 #include <decorator/window.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <base/attached_dataspace.h>
 #include <util/reconstructible.h>

--- a/repos/gems/src/app/window_layouter/main.cc
+++ b/repos/gems/src/app/window_layouter/main.cc
@ -19,7 +19,7 @@
 #include <base/heap.h>
 #include <os/reporter.h>
 #include <os/session_policy.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <input_session/client.h>
 #include <input/event.h>
 #include <input/keycodes.h>
--- a/repos/gems/src/server/nit_fader/main.cc
+++ b/repos/gems/src/server/nit_fader/main.cc
@ -13,7 +13,7 @@

 /* Genode includes */
 #include <base/component.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <base/attached_rom_dataspace.h>
 #include <base/attached_ram_dataspace.h>
 #include <os/texture.h>
--- a/repos/gems/src/server/wm/decorator_nitpicker.h
+++ b/repos/gems/src/server/wm/decorator_nitpicker.h
@ -18,7 +18,7 @@
 #include <util/string.h>
 #include <base/attached_dataspace.h>
 #include <os/reporter.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <input_session/client.h>
 #include <input/event.h>
 #include <input/component.h>
--- a/repos/gems/src/server/wm/direct_nitpicker.h
+++ b/repos/gems/src/server/wm/direct_nitpicker.h
@ -16,7 +16,7 @@

 /* Genode includes */
 #include <os/session_policy.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 namespace Wm { class Direct_nitpicker_session; }

--- a/repos/gems/src/server/wm/layouter_nitpicker.h
+++ b/repos/gems/src/server/wm/layouter_nitpicker.h
@ -16,7 +16,7 @@

 /* Genode includes */
 #include <input/component.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 namespace Wm {
 	struct Layouter_nitpicker_session;
--- a/repos/gems/src/server/wm/main.cc
+++ b/repos/gems/src/server/wm/main.cc
@ -12,7 +12,7 @@
 */

 /* Genode includes */
-#include <nitpicker_session/client.h>
+#include <gui_session/client.h>
 #include <framebuffer_session/client.h>
 #include <base/component.h>
 #include <base/attached_rom_dataspace.h>
--- a/repos/gems/src/server/wm/nitpicker.h
+++ b/repos/gems/src/server/wm/nitpicker.h
@ -23,7 +23,7 @@
 #include <os/reporter.h>
 #include <os/session_policy.h>
 #include <root/component.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <input_session/capability.h>
 #include <input/component.h>

--- a/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h
+++ b/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h
@ -19,7 +19,7 @@
 #include <qwindowsystem_qws.h>
 #endif

-#include <nitpicker_session/client.h>
+#include <gui_session/client.h>


 class QEmbeddedViewWidget : public QWidget
--- a/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h
+++ b/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h
@ -18,7 +18,7 @@

 /* Genode includes */
 #include <input/event.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 /* EGL includes */
 #include <EGL/egl.h>
--- a/repos/libports/recipes/src/pdf_view/used_apis
+++ b/repos/libports/recipes/src/pdf_view/used_apis
@ -3,5 +3,5 @@ framebuffer_session
 input_session
 libc
 mupdf
-nitpicker_session
+gui_session
 os
--- a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis
+++ b/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis
@ -3,7 +3,7 @@ framebuffer_session
 input_session
 libc
 mesa
-nitpicker_session
+gui_session
 os
 qoost
 qt5_core
--- a/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis
+++ b/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis
@ -5,7 +5,7 @@ freetype
 input_session
 libc
 mesa
-nitpicker_session
+gui_session
 os
 qoost
 qt5_core
--- a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis
+++ b/repos/libports/recipes/src/qt5_qpluginwidget/used_apis
@ -4,7 +4,7 @@ input_session
 libc
 loader_session
 mesa
-nitpicker_session
+gui_session
 os
 qoost
 qt5_core
--- a/repos/libports/recipes/src/test-qpluginwidget/used_apis
+++ b/repos/libports/recipes/src/test-qpluginwidget/used_apis
@ -4,7 +4,7 @@ input_session
 libc
 loader_session
 mesa
-nitpicker_session
+gui_session
 os
 qoost
 qt5_core
--- a/repos/libports/src/app/pdf_view/main.cc
+++ b/repos/libports/src/app/pdf_view/main.cc
@ -22,7 +22,7 @@
 #include <input_session/client.h>
 #include <input/event.h>
 #include <input/keycodes.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 /* MuPDF includes */
 extern "C" {
--- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp
+++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp
@ -15,7 +15,7 @@

 /* Genode includes */
 #include <base/log.h>
-#include <nitpicker_session/client.h>
+#include <gui_session/client.h>

 /* Qt includes */
 #include <qpa/qplatformscreen.h>
--- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h
+++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h
@ -16,7 +16,7 @@
 #define _QNITPICKERSCREEN_H_

 /* Genode includes */
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 /* Qt includes */
 #include <qpa/qplatformscreen.h>
--- a/repos/os/include/decorator/types.h
+++ b/repos/os/include/decorator/types.h
@ -15,7 +15,7 @@
 #define _INCLUDE__DECORATOR__TYPES_H_

 /* Genode includes */
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>
 #include <util/xml_node.h>
 #include <util/color.h>
 #include <util/geometry.h>
--- a/repos/os/include/decorator/window.h
+++ b/repos/os/include/decorator/window.h
@ -18,7 +18,7 @@
 #include <util/string.h>
 #include <util/xml_generator.h>
 #include <util/list_model.h>
-#include <nitpicker_session/client.h>
+#include <gui_session/client.h>
 #include <base/snprintf.h>

 /* decorator includes */
--- a/repos/os/include/decorator/window_stack.h
+++ b/repos/os/include/decorator/window_stack.h
@ -15,7 +15,7 @@
 #define _INCLUDE__DECORATOR__WINDOW_STACK_H_

 /* Genode includes */
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>
 #include <base/log.h>

 /* local includes */
--- a/repos/os/include/nitpicker_session/capability.h
+++ b/repos/os/include/nitpicker_session/capability.h
@ -1,5 +1,5 @@
 /*
- * \brief  Nitpicker-session capability type
+ * \brief  GUI-session capability type
 * \author Norman Feske
 * \date   2008-08-16
 */
@ -11,15 +11,15 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _INCLUDE__NITPICKER_SESSION__CAPABILITY_H_
-#define _INCLUDE__NITPICKER_SESSION__CAPABILITY_H_
+#ifndef _INCLUDE__GUI_SESSION__CAPABILITY_H_
+#define _INCLUDE__GUI_SESSION__CAPABILITY_H_

 #include <base/capability.h>
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>

 namespace Nitpicker {

 	typedef Genode::Capability<Session> Session_capability;
 }

-#endif /* _INCLUDE__NITPICKER_SESSION__CAPABILITY_H_ */
+#endif /* _INCLUDE__GUI_SESSION__CAPABILITY_H_ */
--- a/repos/os/include/nitpicker_session/client.h
+++ b/repos/os/include/nitpicker_session/client.h
@ -1,5 +1,5 @@
 /*
- * \brief  Client-side nitpicker session interface
+ * \brief  Client-side GUI session interface
 * \author Norman Feske
 * \date   2006-08-23
 */
@ -11,10 +11,10 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _INCLUDE__NITPICKER_SESSION__CLIENT_H_
-#define _INCLUDE__NITPICKER_SESSION__CLIENT_H_
+#ifndef _INCLUDE__GUI_SESSION__CLIENT_H_
+#define _INCLUDE__GUI_SESSION__CLIENT_H_

-#include <nitpicker_session/capability.h>
+#include <gui_session/capability.h>
 #include <base/rpc_client.h>
 #include <base/attached_dataspace.h>

@ -112,4 +112,4 @@ class Nitpicker::Session_client : public Genode::Rpc_client<Session>
 		}
 };

-#endif /* _INCLUDE__NITPICKER_SESSION__CLIENT_H_ */
+#endif /* _INCLUDE__GUI_SESSION__CLIENT_H_ */
--- a/repos/os/include/nitpicker_session/connection.h
+++ b/repos/os/include/nitpicker_session/connection.h
@ -11,10 +11,10 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _INCLUDE__NITPICKER_SESSION__CONNECTION_H_
-#define _INCLUDE__NITPICKER_SESSION__CONNECTION_H_
+#ifndef _INCLUDE__GUI_SESSION__CONNECTION_H_
+#define _INCLUDE__GUI_SESSION__CONNECTION_H_

-#include <nitpicker_session/client.h>
+#include <gui_session/client.h>
 #include <framebuffer_session/client.h>
 #include <input_session/client.h>
 #include <util/arg_string.h>
@ -99,4 +99,4 @@ class Nitpicker::Connection : public Genode::Connection<Session>,
 		Framebuffer::Session *framebuffer() { return &_framebuffer; }
 };

-#endif /* _INCLUDE__NITPICKER_SESSION__CONNECTION_H_ */
+#endif /* _INCLUDE__GUI_SESSION__CONNECTION_H_ */
--- a/repos/os/include/nitpicker_session/nitpicker_session.h
+++ b/repos/os/include/nitpicker_session/nitpicker_session.h
@ -13,8 +13,8 @@
 * under the terms of the GNU Affero General Public License version 3.
 */

-#ifndef _INCLUDE__NITPICKER_SESSION__NITPICKER_SESSION_H_
-#define _INCLUDE__NITPICKER_SESSION__NITPICKER_SESSION_H_
+#ifndef _INCLUDE__GUI_SESSION__GUI_SESSION_H_
+#define _INCLUDE__GUI_SESSION__GUI_SESSION_H_

 #include <session/session.h>
 #include <os/surface.h>
@ -361,4 +361,4 @@ struct Nitpicker::Session : Genode::Session
 	                     Rpc_mode_sigh, Rpc_buffer, Rpc_focus, Rpc_session_control);
 };

-#endif /* _INCLUDE__NITPICKER_SESSION__NITPICKER_SESSION_H_ */
+#endif /* _INCLUDE__GUI_SESSION__GUI_SESSION_H_ */
--- a/repos/os/include/loader_session/loader_session.h
+++ b/repos/os/include/loader_session/loader_session.h
@ -18,7 +18,7 @@
 #include <base/rpc.h>
 #include <base/rpc_args.h>
 #include <dataspace/capability.h>
-#include <nitpicker_session/client.h>
+#include <gui_session/client.h>
 #include <pd_session/pd_session.h>
 #include <base/signal.h>
 #include <session/session.h>
--- a/repos/os/recipes/api/gui_session/content.mk
+++ b/repos/os/recipes/api/gui_session/content.mk
@ -0,0 +1,2 @@
+MIRRORED_FROM_REP_DIR := include/gui_session
+include $(REP_DIR)/recipes/api/session.inc
--- a/repos/os/recipes/api/nitpicker_session/hash
+++ b/repos/os/recipes/api/nitpicker_session/hash
--- a/repos/os/recipes/api/nitpicker_session/content.mk
+++ b/repos/os/recipes/api/nitpicker_session/content.mk
@ -1,2 +0,0 @@
-MIRRORED_FROM_REP_DIR := include/nitpicker_session
-include $(REP_DIR)/recipes/api/session.inc
--- a/repos/os/recipes/src/global_keys_handler/used_apis
+++ b/repos/os/recipes/src/global_keys_handler/used_apis
@ -3,5 +3,5 @@ os
 input_session
 timer_session
 framebuffer_session
-nitpicker_session
+gui_session
 report_session
--- a/repos/os/recipes/src/loader/used_apis
+++ b/repos/os/recipes/src/loader/used_apis
@ -3,4 +3,4 @@ os
 framebuffer_session
 input_session
 loader_session
-nitpicker_session
+gui_session
--- a/repos/os/recipes/src/nit_fb/used_apis
+++ b/repos/os/recipes/src/nit_fb/used_apis
@ -1,5 +1,5 @@
 base
 os
-nitpicker_session
+gui_session
 input_session
 framebuffer_session
--- a/repos/os/recipes/src/nitpicker/used_apis
+++ b/repos/os/recipes/src/nitpicker/used_apis
@ -5,5 +5,5 @@ blit
 input_session
 timer_session
 framebuffer_session
-nitpicker_session
+gui_session
 report_session
--- a/repos/os/recipes/src/test-dynamic_config/used_apis
+++ b/repos/os/recipes/src/test-dynamic_config/used_apis
@ -2,6 +2,6 @@ base
 os
 input_session
 framebuffer_session
-nitpicker_session
+gui_session
 loader_session
 timer_session
--- a/repos/os/recipes/src/test-fault_detection/used_apis
+++ b/repos/os/recipes/src/test-fault_detection/used_apis
@ -1,6 +1,6 @@
 base
 os
 loader_session
-nitpicker_session
+gui_session
 framebuffer_session
 input_session
--- a/repos/os/src/app/global_keys_handler/main.cc
+++ b/repos/os/src/app/global_keys_handler/main.cc
@ -16,7 +16,7 @@
 #include <base/heap.h>
 #include <base/attached_rom_dataspace.h>
 #include <base/registry.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <os/reporter.h>
 #include <input/event.h>
 #include <input/keycodes.h>
--- a/repos/os/src/app/pointer/main.cc
+++ b/repos/os/src/app/pointer/main.cc
@ -22,7 +22,7 @@
 #include <os/pixel_rgb888.h>
 #include <os/surface.h>
 #include <os/texture_rgb888.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <report_rom/report_service.h>
 #include <pointer/dither_painter.h>
 #include <pointer/shape_report.h>
--- a/repos/os/src/app/status_bar/main.cc
+++ b/repos/os/src/app/status_bar/main.cc
@ -17,7 +17,7 @@
 #include <base/component.h>
 #include <base/attached_rom_dataspace.h>
 #include <os/pixel_rgb565.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <nitpicker_gfx/box_painter.h>
 #include <nitpicker_gfx/tff_font.h>

--- a/repos/os/src/server/loader/nitpicker.h
+++ b/repos/os/src/server/loader/nitpicker.h
@ -20,7 +20,7 @@
 #include <util/misc_math.h>
 #include <base/component.h>
 #include <base/attached_ram_dataspace.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>

 /* local includes */
 #include <input.h>
--- a/repos/os/src/server/nit_fb/main.cc
+++ b/repos/os/src/server/nit_fb/main.cc
@ -12,7 +12,7 @@
 */

 /* Genode includes */
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <input/component.h>
 #include <os/surface.h>
 #include <input/event.h>
--- a/repos/os/src/server/nitpicker/session_component.h
+++ b/repos/os/src/server/nitpicker/session_component.h
@ -21,7 +21,7 @@
 #include <os/session_policy.h>
 #include <os/reporter.h>
 #include <os/pixel_rgb565.h>
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>

 /* local includes */
 #include "canvas.h"
--- a/repos/os/src/server/nitpicker/view_owner.h
+++ b/repos/os/src/server/nitpicker/view_owner.h
@ -22,7 +22,7 @@
 /* Genode includes */
 #include <util/xml_generator.h>
 #include <input/event.h>
-#include <nitpicker_session/nitpicker_session.h>
+#include <gui_session/gui_session.h>
 #include <os/texture.h>

 /* local includes */
--- a/repos/os/src/test/nitpicker/test.cc
+++ b/repos/os/src/test/nitpicker/test.cc
@ -15,7 +15,7 @@
 #include <util/list.h>
 #include <base/component.h>
 #include <base/log.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <timer_session/connection.h>
 #include <input/event.h>

--- a/repos/ports/recipes/src/arora/used_apis
+++ b/repos/ports/recipes/src/arora/used_apis
@ -4,7 +4,7 @@ input_session
 libc
 loader_session
 mesa
-nitpicker_session
+gui_session
 os
 qt5_core
 qt5_gui
--- a/repos/ports/recipes/src/seoul/used_apis
+++ b/repos/ports/recipes/src/seoul/used_apis
@ -3,7 +3,7 @@ libc
 os
 blit
 nitpicker_gfx
-nitpicker_session
+gui_session
 framebuffer_session
 input_session
 timer_session
--- a/repos/ports/recipes/src/vbox5-nova/used_apis
+++ b/repos/ports/recipes/src/vbox5-nova/used_apis
@ -7,7 +7,7 @@ input_session
 libc
 libiconv
 nic_session
-nitpicker_session
+gui_session
 os
 report_session
 rtc_session
--- a/repos/ports/recipes/src/vbox5/used_apis
+++ b/repos/ports/recipes/src/vbox5/used_apis
@ -6,7 +6,7 @@ input_session
 libc
 libiconv
 nic_session
-nitpicker_session
+gui_session
 os
 report_session
 rtc_session
--- a/repos/ports/src/app/seoul/console.h
+++ b/repos/ports/src/app/seoul/console.h
@ -31,7 +31,7 @@
 #include <framebuffer_session/connection.h>
 #include <input/event.h>
 #include <input_session/connection.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #include <timer_session/connection.h>

 #include <os/pixel_rgb565.h>
--- a/repos/ports/src/virtualbox5/frontend/console.h
+++ b/repos/ports/src/virtualbox5/frontend/console.h
@ -20,7 +20,7 @@
 #include <input/keycodes.h>
 #include <input_session/connection.h>
 #define Framebuffer Fb_Genode
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #undef Framebuffer
 #include <os/reporter.h>
 #include <report_session/connection.h>
--- a/repos/ports/src/virtualbox5/frontend/fb.h
+++ b/repos/ports/src/virtualbox5/frontend/fb.h
@ -14,7 +14,7 @@
 /* Genode includes */
 #define Framebuffer Fb_Genode
 #include <framebuffer_session/connection.h>
-#include <nitpicker_session/connection.h>
+#include <gui_session/connection.h>
 #undef Framebuffer

 #include <os/texture_rgb565.h>