Index: uspace/lib/console/include/io/console.h
===================================================================
--- uspace/lib/console/include/io/console.h	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/console/include/io/console.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -42,28 +42,7 @@
 #include <io/cons_event.h>
 #include <io/keycode.h>
-#include <async.h>
 #include <stdbool.h>
 #include <stdio.h>
-
-/** Console control structure. */
-typedef struct {
-	/** Console input file */
-	FILE *input;
-
-	/** Console output file */
-	FILE *output;
-
-	/** Console input session */
-	async_sess_t *input_sess;
-
-	/** Console output session */
-	async_sess_t *output_sess;
-
-	/** Input request call with timeout */
-	ipc_call_t input_call;
-
-	/** Input response with timeout */
-	aid_t input_aid;
-} console_ctrl_t;
+#include <types/console.h>
 
 extern console_ctrl_t *console_init(FILE *, FILE *);
Index: uspace/lib/console/include/types/console.h
===================================================================
--- uspace/lib/console/include/types/console.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
+++ uspace/lib/console/include/types/console.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2026 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libconsole
+ * @{
+ */
+/** @file
+ */
+
+#ifndef _LIBCONSOLE_TYPES_CONSOLE_H_
+#define _LIBCONSOLE_TYPES_CONSOLE_H_
+
+struct console_ctrl;
+typedef struct console_ctrl console_ctrl_t;
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/console/private/console.h
===================================================================
--- uspace/lib/console/private/console.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
+++ uspace/lib/console/private/console.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2026 Jiri Svoboda
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** @addtogroup libconsole
+ * @{
+ */
+/** @file
+ */
+
+#ifndef _LIBCONSOLE_PRIVATE_CONSOLE_H_
+#define _LIBCONSOLE_PRIVATE_CONSOLE_H_
+
+#include <async.h>
+#include <stdio.h>
+
+/** Console control structure. */
+typedef struct console_ctrl {
+	/** Console input file */
+	FILE *input;
+
+	/** Console output file */
+	FILE *output;
+
+	/** Console input session */
+	async_sess_t *input_sess;
+
+	/** Console output session */
+	async_sess_t *output_sess;
+
+	/** Input request call with timeout */
+	ipc_call_t input_call;
+
+	/** Input response with timeout */
+	aid_t input_aid;
+} console_ctrl_t;
+
+#endif
+
+/** @}
+ */
Index: uspace/lib/console/src/console.c
===================================================================
--- uspace/lib/console/src/console.c	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/console/src/console.c	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2006 Josef Cejka
  * Copyright (c) 2006 Jakub Vana
@@ -45,4 +45,5 @@
 #include <io/console.h>
 #include <ipc/console.h>
+#include "../private/console.h"
 
 console_ctrl_t *console_init(FILE *ifile, FILE *ofile)
Index: uspace/lib/display/include/types/display.h
===================================================================
--- uspace/lib/display/include/types/display.h	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/display/include/types/display.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -36,6 +36,4 @@
 #define _LIBDISPLAY_TYPES_DISPLAY_H_
 
-#include <async.h>
-#include <fibril_synch.h>
 #include <io/kbd_event.h>
 #include <io/pos_event.h>
Index: uspace/lib/ui/include/ui/ui.h
===================================================================
--- uspace/lib/ui/include/ui/ui.h	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/ui/include/ui/ui.h	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -40,6 +40,6 @@
 #include <errno.h>
 #include <gfx/coord.h>
-#include <io/console.h>
 #include <stdbool.h>
+#include <types/console.h>
 #include <types/ui/clickmatic.h>
 #include <types/ui/ui.h>
Index: uspace/lib/ui/src/entry.c
===================================================================
--- uspace/lib/ui/src/entry.c	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/ui/src/entry.c	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -37,4 +37,5 @@
  */
 
+#include <assert.h>
 #include <clipboard.h>
 #include <errno.h>
@@ -44,4 +45,5 @@
 #include <gfx/text.h>
 #include <macros.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
Index: uspace/lib/ui/src/msgdialog.c
===================================================================
--- uspace/lib/ui/src/msgdialog.c	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/ui/src/msgdialog.c	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -34,4 +34,5 @@
  */
 
+#include <assert.h>
 #include <errno.h>
 #include <mem.h>
Index: uspace/lib/ui/test/menudd.c
===================================================================
--- uspace/lib/ui/test/menudd.c	(revision 9b534a412472d2ce2d77966ab5333d38a023e52e)
+++ uspace/lib/ui/test/menudd.c	(revision d0dfbba5d13e96246cfe043af8cdfbe2c5b16a33)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -32,4 +32,5 @@
 #include <pcut/pcut.h>
 #include <stdbool.h>
+#include <stdio.h>
 #include <str.h>
 #include <ui/control.h>