From 30700e179a511053095b1642acb8d22147779625 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 6 Sep 2019 11:04:11 +0200
Subject: [PATCH] Clang: reconcile struct and class declarations

---
 .../src/core/include/core_region_map.h        |  2 +-
 repos/base-linux/src/core/include/pager.h     | 30 ++++++++++++-------
 .../base-linux/src/core/include/platform_pd.h |  2 +-
 .../src/core/include/platform_thread.h        |  2 --
 .../src/include/base/internal/local_parent.h  |  2 +-
 .../src/include/base/internal/native_utcb.h   |  2 +-
 .../core/include/signal_source_component.h    |  2 +-
 .../src/include/base/internal/native_utcb.h   |  2 +-
 repos/base/include/base/child.h               |  2 +-
 repos/base/include/base/duration.h            |  6 ++--
 repos/base/include/base/entrypoint.h          |  6 ++--
 repos/base/include/base/ipc_msgbuf.h          |  2 +-
 repos/base/include/base/local_connection.h    |  2 +-
 repos/base/include/base/lock.h                |  2 +-
 repos/base/include/base/native_capability.h   |  2 +-
 repos/base/include/base/object_pool.h         |  2 +-
 repos/base/include/base/registry.h            |  2 +-
 repos/base/include/base/rpc_client.h          |  2 +-
 repos/base/include/base/rpc_server.h          |  2 +-
 repos/base/include/base/session_object.h      |  2 +-
 repos/base/include/base/shared_object.h       |  2 +-
 repos/base/include/base/signal.h              |  8 ++---
 repos/base/include/base/slab.h                |  2 +-
 repos/base/include/base/thread.h              |  6 ++--
 repos/base/include/base/trace/logger.h        |  4 +--
 repos/base/include/base/trace/policy.h        |  2 +-
 repos/base/include/base/trace/types.h         |  2 +-
 repos/base/include/cpu_session/capability.h   |  2 +-
 repos/base/include/pd_session/pd_session.h    |  4 +--
 repos/base/include/rom_session/connection.h   |  2 +-
 repos/base/include/root/component.h           |  2 +-
 repos/base/include/timer/timeout.h            |  2 +-
 repos/base/include/timer_session/connection.h |  2 +-
 repos/base/include/util/avl_tree.h            |  2 +-
 repos/base/include/util/mmio.h                |  2 +-
 repos/base/include/util/reconstructible.h     |  2 +-
 repos/base/include/vm_session/client.h        |  2 +-
 repos/base/include/vm_session/handler.h       |  4 +--
 repos/base/src/core/include/address_space.h   |  2 +-
 .../src/core/include/core_capability_space.h  |  2 +-
 .../src/core/include/region_map_component.h   |  4 +--
 .../src/core/include/trace/source_registry.h  |  2 +-
 .../internal/expanding_pd_session_client.h    |  2 +-
 .../internal/expanding_region_map_client.h    |  2 +-
 .../base/src/include/base/internal/globals.h  |  6 ++--
 .../src/include/base/internal/rpc_obj_key.h   |  2 +-
 repos/base/src/include/signal_source/client.h |  2 +-
 .../src/include/signal_source/signal_source.h |  2 +-
 repos/base/src/lib/ldso/include/debug.h       |  2 +-
 repos/base/src/lib/ldso/include/dynamic.h     |  2 +-
 repos/base/src/lib/ldso/include/linker.h      |  8 ++---
 repos/base/src/lib/ldso/main.cc               |  4 +--
 repos/gems/src/server/wm/nitpicker.h          |  2 +-
 .../os/src/server/nitpicker/view_component.h  |  2 +-
 54 files changed, 90 insertions(+), 84 deletions(-)

diff --git a/repos/base-linux/src/core/include/core_region_map.h b/repos/base-linux/src/core/include/core_region_map.h
index 92946ef42..eae3cd30f 100644
--- a/repos/base-linux/src/core/include/core_region_map.h
+++ b/repos/base-linux/src/core/include/core_region_map.h
@@ -17,7 +17,7 @@
 /* base-internal includes */
 #include <base/internal/region_map_mmap.h>
 
-namespace Genode { class Core_region_map; }
+namespace Genode { struct Core_region_map; }
 
 
 struct Genode::Core_region_map : Region_map_mmap
diff --git a/repos/base-linux/src/core/include/pager.h b/repos/base-linux/src/core/include/pager.h
index e0ebfea0f..798a7e763 100644
--- a/repos/base-linux/src/core/include/pager.h
+++ b/repos/base-linux/src/core/include/pager.h
@@ -27,21 +27,29 @@
 
 namespace Genode {
 
-	struct Pager_object
+	class Platform_thread;
+
+	class Pager_object
 	{
-		Thread_capability         _thread_cap { };
-		Signal_context_capability _sigh       { };
+		friend class Platform_thread;
 
-		virtual ~Pager_object() { }
+		protected:
 
-		void exception_handler(Signal_context_capability sigh) { _sigh = sigh; }
+			Thread_capability         _thread_cap { };
+			Signal_context_capability _sigh       { };
 
-		/**
-		 * Remember thread cap so that rm_session can tell thread that
-		 * rm_client is gone.
-		 */
-		Thread_capability thread_cap() const { return _thread_cap; }
-		void thread_cap(Thread_capability cap) { _thread_cap = cap; }
+		public:
+
+			virtual ~Pager_object() { }
+
+			void exception_handler(Signal_context_capability sigh) { _sigh = sigh; }
+
+			/**
+			 * Remember thread cap so that rm_session can tell thread that
+			 * rm_client is gone.
+			 */
+			Thread_capability thread_cap() const { return _thread_cap; }
+			void thread_cap(Thread_capability cap) { _thread_cap = cap; }
 	};
 
 	struct Pager_entrypoint
diff --git a/repos/base-linux/src/core/include/platform_pd.h b/repos/base-linux/src/core/include/platform_pd.h
index f61930afd..d353c4f24 100644
--- a/repos/base-linux/src/core/include/platform_pd.h
+++ b/repos/base-linux/src/core/include/platform_pd.h
@@ -21,7 +21,7 @@
 
 namespace Genode {
 	struct Platform_pd;
-	struct Platform_thread;
+	class Platform_thread;
 }
 
 struct Genode::Platform_pd
diff --git a/repos/base-linux/src/core/include/platform_thread.h b/repos/base-linux/src/core/include/platform_thread.h
index 61ab78f6e..cf97a2e1a 100644
--- a/repos/base-linux/src/core/include/platform_thread.h
+++ b/repos/base-linux/src/core/include/platform_thread.h
@@ -30,8 +30,6 @@
 
 namespace Genode {
 
-	class Platform_thread;
-
 	/*
 	 * We hold all Platform_thread objects in a list in order to be able to
 	 * reflect SIGCHLD as exception signals. When a SIGCHILD occurs, we
diff --git a/repos/base-linux/src/include/base/internal/local_parent.h b/repos/base-linux/src/include/base/internal/local_parent.h
index 00d336351..0e11e16c0 100644
--- a/repos/base-linux/src/include/base/internal/local_parent.h
+++ b/repos/base-linux/src/include/base/internal/local_parent.h
@@ -25,7 +25,7 @@
 
 namespace Genode {
 
-	class Local_session;
+	struct Local_session;
 	class Local_parent;
 }
 
diff --git a/repos/base-linux/src/include/base/internal/native_utcb.h b/repos/base-linux/src/include/base/internal/native_utcb.h
index 2b1d74bad..276651c30 100644
--- a/repos/base-linux/src/include/base/internal/native_utcb.h
+++ b/repos/base-linux/src/include/base/internal/native_utcb.h
@@ -14,6 +14,6 @@
 #ifndef _INCLUDE__BASE__INTERNAL__NATIVE_UTCB_H_
 #define _INCLUDE__BASE__INTERNAL__NATIVE_UTCB_H_
 
-namespace Genode { struct Native_utcb { }; }
+namespace Genode { class Native_utcb { }; }
 
 #endif /* _INCLUDE__BASE__INTERNAL__NATIVE_UTCB_H_ */
diff --git a/repos/base-nova/src/core/include/signal_source_component.h b/repos/base-nova/src/core/include/signal_source_component.h
index 5eccabb9e..d66cf43ba 100644
--- a/repos/base-nova/src/core/include/signal_source_component.h
+++ b/repos/base-nova/src/core/include/signal_source_component.h
@@ -20,7 +20,7 @@
 
 namespace Genode {
 
-	class Signal_context_component;
+	struct Signal_context_component;
 	class Signal_source_component;
 }
 
diff --git a/repos/base-nova/src/include/base/internal/native_utcb.h b/repos/base-nova/src/include/base/internal/native_utcb.h
index 2f309b65e..7b0316bf9 100644
--- a/repos/base-nova/src/include/base/internal/native_utcb.h
+++ b/repos/base-nova/src/include/base/internal/native_utcb.h
@@ -16,7 +16,7 @@
 
 #include <base/stdint.h>
 
-namespace Genode { struct Native_utcb; }
+namespace Genode { class Native_utcb; }
 
 class Genode::Native_utcb
 {
diff --git a/repos/base/include/base/child.h b/repos/base/include/base/child.h
index 9f6ea76f3..6fde245fb 100644
--- a/repos/base/include/base/child.h
+++ b/repos/base/include/base/child.h
@@ -30,7 +30,7 @@
 
 namespace Genode {
 	struct Child_policy;
-	struct Child;
+	class Child;
 }
 
 
diff --git a/repos/base/include/base/duration.h b/repos/base/include/base/duration.h
index 87ac6a2a1..40dcfcbdb 100644
--- a/repos/base/include/base/duration.h
+++ b/repos/base/include/base/duration.h
@@ -21,9 +21,9 @@
 
 namespace Genode {
 
-	class Microseconds;
-	class Milliseconds;
-	class Duration;
+	struct Microseconds;
+	struct Milliseconds;
+	struct Duration;
 }
 
 
diff --git a/repos/base/include/base/entrypoint.h b/repos/base/include/base/entrypoint.h
index 046bb50ae..fe7bd1345 100644
--- a/repos/base/include/base/entrypoint.h
+++ b/repos/base/include/base/entrypoint.h
@@ -21,9 +21,9 @@
 #include <base/thread.h>
 
 namespace Genode {
-	class Startup;
+	struct Startup;
 	class Entrypoint;
-	class Env;
+	struct Env;
 }
 
 
@@ -138,7 +138,7 @@ class Genode::Entrypoint : Noncopyable
 		void _handle_stop_signal_proxy() { _stop_signal_proxy = true; }
 		Constructible<Genode::Signal_handler<Entrypoint> > _stop_signal_proxy_handler { };
 
-		friend class Startup;
+		friend struct Startup;
 
 		/**
 		 * Called by the startup code only
diff --git a/repos/base/include/base/ipc_msgbuf.h b/repos/base/include/base/ipc_msgbuf.h
index dd8dba142..97b4bb3a5 100644
--- a/repos/base/include/base/ipc_msgbuf.h
+++ b/repos/base/include/base/ipc_msgbuf.h
@@ -22,7 +22,7 @@
 namespace Genode {
 
 	class Msgbuf_base;
-	template <unsigned> class Msgbuf;
+	template <unsigned> struct Msgbuf;
 }
 
 
diff --git a/repos/base/include/base/local_connection.h b/repos/base/include/base/local_connection.h
index 0a255a951..61b0d50c1 100644
--- a/repos/base/include/base/local_connection.h
+++ b/repos/base/include/base/local_connection.h
@@ -22,7 +22,7 @@
 
 namespace Genode {
 
-	class Local_connection_base;
+	struct Local_connection_base;
 	template <typename> class Local_connection;
 }
 
diff --git a/repos/base/include/base/lock.h b/repos/base/include/base/lock.h
index 191d32e3a..dad60b07a 100644
--- a/repos/base/include/base/lock.h
+++ b/repos/base/include/base/lock.h
@@ -16,7 +16,7 @@
 
 #include <base/cancelable_lock.h>
 
-namespace Genode { class Lock; }
+namespace Genode { struct Lock; }
 
 
 struct Genode::Lock : Cancelable_lock
diff --git a/repos/base/include/base/native_capability.h b/repos/base/include/base/native_capability.h
index 97d2b0848..cc56fbe7d 100644
--- a/repos/base/include/base/native_capability.h
+++ b/repos/base/include/base/native_capability.h
@@ -37,7 +37,7 @@ class Genode::Native_capability
 		 * Forward declaration of the platform-specific internal capability
 		 * representation
 		 */
-		class Data;
+		struct Data;
 
 	private:
 
diff --git a/repos/base/include/base/object_pool.h b/repos/base/include/base/object_pool.h
index 4e74e8186..68152c459 100644
--- a/repos/base/include/base/object_pool.h
+++ b/repos/base/include/base/object_pool.h
@@ -43,7 +43,7 @@ class Genode::Object_pool : Interface, Noncopyable
 
 				friend class Object_pool;
 				friend class Avl_tree<Entry>;
-				friend class Avl_node<Entry>;
+				friend struct Avl_node<Entry>;
 
 				struct Entry_lock : Weak_object<Entry_lock>, Noncopyable
 				{
diff --git a/repos/base/include/base/registry.h b/repos/base/include/base/registry.h
index ada4d227a..817df5f61 100644
--- a/repos/base/include/base/registry.h
+++ b/repos/base/include/base/registry.h
@@ -106,7 +106,7 @@ struct Genode::Registry : private Registry_base
 {
 	struct Element : Registry_base::Element
 	{
-		friend class Registry;  /* allow 'for_each' to access '_obj' */
+		friend struct Registry;  /* allow 'for_each' to access '_obj' */
 
 		Element(Registry &registry, T &obj)
 		: Registry_base::Element(registry, &obj) { }
diff --git a/repos/base/include/base/rpc_client.h b/repos/base/include/base/rpc_client.h
index 7cd9fb34e..7b2b3bde1 100644
--- a/repos/base/include/base/rpc_client.h
+++ b/repos/base/include/base/rpc_client.h
@@ -19,7 +19,7 @@
 
 namespace Genode {
 
-	template <typename> struct Rpc_client;
+	template <typename> class Rpc_client;
 
 	/**
 	 * Count capabilities of a RPC_FUNCTION which are out parameters.
diff --git a/repos/base/include/base/rpc_server.h b/repos/base/include/base/rpc_server.h
index c5766acd0..14fd8bfc4 100644
--- a/repos/base/include/base/rpc_server.h
+++ b/repos/base/include/base/rpc_server.h
@@ -25,7 +25,7 @@
 
 namespace Genode {
 
-	class Ipc_server;
+	struct Ipc_server;
 
 	template <typename, typename> class Rpc_dispatcher;
 	class Rpc_object_base;
diff --git a/repos/base/include/base/session_object.h b/repos/base/include/base/session_object.h
index b9d47e7a3..afdfb5eb2 100644
--- a/repos/base/include/base/session_object.h
+++ b/repos/base/include/base/session_object.h
@@ -18,7 +18,7 @@
 #include <base/entrypoint.h>
 #include <session/session.h>
 
-namespace Genode { template <typename, typename> struct Session_object; }
+namespace Genode { template <typename, typename> class Session_object; }
 
 template <typename RPC_INTERFACE, typename SERVER = RPC_INTERFACE>
 class Genode::Session_object : private Ram_quota_guard,
diff --git a/repos/base/include/base/shared_object.h b/repos/base/include/base/shared_object.h
index f4dd1622f..4d66455b1 100644
--- a/repos/base/include/base/shared_object.h
+++ b/repos/base/include/base/shared_object.h
@@ -24,7 +24,7 @@ namespace Genode {
 
 	class  Shared_object;
 	struct Address_info;
-	struct Dynamic_linker;
+	class Dynamic_linker;
 };
 
 
diff --git a/repos/base/include/base/signal.h b/repos/base/include/base/signal.h
index f3c657f57..b91d097bf 100644
--- a/repos/base/include/base/signal.h
+++ b/repos/base/include/base/signal.h
@@ -29,17 +29,17 @@ namespace Genode {
 
 	class Entrypoint;
 	class Rpc_entrypoint;
-	class Signal_source;
+	struct Signal_source;
 
 	class Signal_receiver;
 	class Signal_context;
 	class Signal_context_registry;
 	class Signal_transmitter;
 	class Signal;
-	class Signal_dispatcher_base;
+	struct Signal_dispatcher_base;
 
 	template <typename, typename> class Signal_handler;
-	template <typename, typename> class Io_signal_handler;
+	template <typename, typename> struct Io_signal_handler;
 
 	typedef Capability<Signal_context> Signal_context_capability;
 }
@@ -97,7 +97,7 @@ class Genode::Signal
 		 */
 		Signal(Data data);
 
-		friend class Kernel::Signal_receiver;
+		friend struct Kernel::Signal_receiver;
 		friend class Signal_receiver;
 		friend class Signal_context;
 
diff --git a/repos/base/include/base/slab.h b/repos/base/include/base/slab.h
index e2beffb5c..b266c3bcb 100644
--- a/repos/base/include/base/slab.h
+++ b/repos/base/include/base/slab.h
@@ -24,7 +24,7 @@ class Genode::Slab : public Allocator
 {
 	private:
 
-		struct Block;
+		class Block;
 		struct Entry;
 
 		size_t const _slab_size;          /* size of one slab entry           */
diff --git a/repos/base/include/base/thread.h b/repos/base/include/base/thread.h
index a4b408d9a..53367088e 100644
--- a/repos/base/include/base/thread.h
+++ b/repos/base/include/base/thread.h
@@ -23,11 +23,11 @@
 #include <cpu_session/cpu_session.h>  /* for 'Thread_capability' type */
 
 namespace Genode {
-	struct Native_utcb;
+	class Native_utcb;
 	struct Native_thread;
 	class Thread;
 	class Stack;
-	class Env;
+	struct Env;
 	template <unsigned> class Thread_deprecated;
 }
 
@@ -161,7 +161,7 @@ class Genode::Thread
 		 */
 		Tls _tls { };
 
-		friend class Tls::Base;
+		friend struct Tls::Base;
 
 		/**
 		 * Hook for platform-specific constructor supplements
diff --git a/repos/base/include/base/trace/logger.h b/repos/base/include/base/trace/logger.h
index f5ffe2cf6..1c2048f0e 100644
--- a/repos/base/include/base/trace/logger.h
+++ b/repos/base/include/base/trace/logger.h
@@ -20,8 +20,8 @@
 namespace Genode { namespace Trace {
 
 	class Control;
-	class Policy_module;
-	class Logger;
+	struct Policy_module;
+	struct Logger;
 } }
 
 
diff --git a/repos/base/include/base/trace/policy.h b/repos/base/include/base/trace/policy.h
index 600859cc8..88289fe94 100644
--- a/repos/base/include/base/trace/policy.h
+++ b/repos/base/include/base/trace/policy.h
@@ -22,7 +22,7 @@ namespace Genode {
 	class Signal_context;
 	class Rpc_object_base;
 
-	namespace Trace { class Policy_module; }
+	namespace Trace { struct Policy_module; }
 }
 
 
diff --git a/repos/base/include/base/trace/types.h b/repos/base/include/base/trace/types.h
index 206ffb093..cfafc5691 100644
--- a/repos/base/include/base/trace/types.h
+++ b/repos/base/include/base/trace/types.h
@@ -40,7 +40,7 @@ namespace Genode { namespace Trace {
 	struct Policy_id;
 	struct Subject_id;
 	struct Execution_time;
-	struct Subject_info;
+	class Subject_info;
 } }
 
 
diff --git a/repos/base/include/cpu_session/capability.h b/repos/base/include/cpu_session/capability.h
index 15c9e303d..c0f30999f 100644
--- a/repos/base/include/cpu_session/capability.h
+++ b/repos/base/include/cpu_session/capability.h
@@ -18,7 +18,7 @@
 
 namespace Genode
 {
-	class Cpu_session;
+	struct Cpu_session;
 	typedef Capability<Cpu_session> Cpu_session_capability;
 }
 
diff --git a/repos/base/include/pd_session/pd_session.h b/repos/base/include/pd_session/pd_session.h
index 8b5edbe06..d1e19e6bb 100644
--- a/repos/base/include/pd_session/pd_session.h
+++ b/repos/base/include/pd_session/pd_session.h
@@ -23,8 +23,8 @@
 namespace Genode {
 	struct Pd_session;
 	struct Pd_session_client;
-	struct Parent;
-	struct Signal_context;
+	class Parent;
+	class Signal_context;
 }
 
 
diff --git a/repos/base/include/rom_session/connection.h b/repos/base/include/rom_session/connection.h
index ce1b9badf..342a0b378 100644
--- a/repos/base/include/rom_session/connection.h
+++ b/repos/base/include/rom_session/connection.h
@@ -18,7 +18,7 @@
 #include <base/connection.h>
 #include <base/log.h>
 
-namespace Genode { class Rom_connection; }
+namespace Genode { struct Rom_connection; }
 
 
 struct Genode::Rom_connection : Connection<Rom_session>,
diff --git a/repos/base/include/root/component.h b/repos/base/include/root/component.h
index e1038b28e..f7a8a8183 100644
--- a/repos/base/include/root/component.h
+++ b/repos/base/include/root/component.h
@@ -28,7 +28,7 @@
 namespace Genode {
 
 	class Single_client;
-	class Multiple_clients;
+	struct Multiple_clients;
 	template <typename, typename POLICY = Multiple_clients> class Root_component;
 }
 
diff --git a/repos/base/include/timer/timeout.h b/repos/base/include/timer/timeout.h
index 7a5c043fc..3735fbd25 100644
--- a/repos/base/include/timer/timeout.h
+++ b/repos/base/include/timer/timeout.h
@@ -27,7 +27,7 @@
 
 namespace Genode {
 
-	class Time_source;
+	struct Time_source;
 	class Timeout_scheduler;
 	class Timeout;
 	class Alarm_timeout_scheduler;
diff --git a/repos/base/include/timer_session/connection.h b/repos/base/include/timer_session/connection.h
index eef8d641e..3e2c2d272 100644
--- a/repos/base/include/timer_session/connection.h
+++ b/repos/base/include/timer_session/connection.h
@@ -25,7 +25,7 @@
 namespace Timer
 {
 	class Connection;
-	template <typename> class Periodic_timeout;
+	template <typename> struct Periodic_timeout;
 	template <typename> class One_shot_timeout;
 }
 
diff --git a/repos/base/include/util/avl_tree.h b/repos/base/include/util/avl_tree.h
index f128219ce..5e8026b60 100644
--- a/repos/base/include/util/avl_tree.h
+++ b/repos/base/include/util/avl_tree.h
@@ -20,7 +20,7 @@
 namespace Genode {
 	
 	class Avl_node_base;
-	template <typename> class Avl_node;
+	template <typename> struct Avl_node;
 	template <typename> class Avl_tree;
 }
 
diff --git a/repos/base/include/util/mmio.h b/repos/base/include/util/mmio.h
index 58301b6aa..bb2cb748a 100644
--- a/repos/base/include/util/mmio.h
+++ b/repos/base/include/util/mmio.h
@@ -20,7 +20,7 @@
 namespace Genode {
 
 	class Mmio_plain_access;
-	class Mmio;
+	struct Mmio;
 }
 
 /**
diff --git a/repos/base/include/util/reconstructible.h b/repos/base/include/util/reconstructible.h
index 5385749f7..248ff31ff 100644
--- a/repos/base/include/util/reconstructible.h
+++ b/repos/base/include/util/reconstructible.h
@@ -20,7 +20,7 @@
 
 namespace Genode {
 	template<typename> class Reconstructible;
-	template<typename> class Constructible;
+	template<typename> struct Constructible;
 }
 
 
diff --git a/repos/base/include/vm_session/client.h b/repos/base/include/vm_session/client.h
index 089d38ebd..6f2d6b340 100644
--- a/repos/base/include/vm_session/client.h
+++ b/repos/base/include/vm_session/client.h
@@ -19,7 +19,7 @@
 #include <vm_session/handler.h>
 #include <base/rpc_client.h>
 
-namespace Genode { struct Vm_session_client; class Allocator; class Vm_state; }
+namespace Genode { struct Vm_session_client; struct Allocator; struct Vm_state; }
 
 /**
  * Client-side VM session interface
diff --git a/repos/base/include/vm_session/handler.h b/repos/base/include/vm_session/handler.h
index ca7c4aed6..1e633e37c 100644
--- a/repos/base/include/vm_session/handler.h
+++ b/repos/base/include/vm_session/handler.h
@@ -17,14 +17,14 @@
 #include <base/signal.h>
 
 namespace Genode {
-	class Vm_state;
+	struct Vm_state;
 	class Vm_handler_base;
 	template <typename, typename> class Vm_handler;
 }
 
 class Genode::Vm_handler_base : public Signal_dispatcher_base
 {
-	friend class Vm_session_client;
+	friend struct Vm_session_client;
 
 	protected:
 
diff --git a/repos/base/src/core/include/address_space.h b/repos/base/src/core/include/address_space.h
index 185e9bede..3ce6de62b 100644
--- a/repos/base/src/core/include/address_space.h
+++ b/repos/base/src/core/include/address_space.h
@@ -22,7 +22,7 @@ namespace Genode { struct Address_space; }
 struct Genode::Address_space : private Weak_object<Address_space>,
                                public  Interface
 {
-	friend class Locked_ptr<Address_space>;
+	friend struct Locked_ptr<Address_space>;
 
 	struct Core_local_addr { addr_t value; };
 
diff --git a/repos/base/src/core/include/core_capability_space.h b/repos/base/src/core/include/core_capability_space.h
index 8bce5980a..7c17b06ed 100644
--- a/repos/base/src/core/include/core_capability_space.h
+++ b/repos/base/src/core/include/core_capability_space.h
@@ -17,7 +17,7 @@
 /* base-internal includes */
 #include <base/internal/rpc_obj_key.h>
 
-namespace Genode { class Cap_sel; class Pd_session; }
+namespace Genode { class Cap_sel; struct Pd_session; }
 
 
 namespace Genode { namespace Capability_space {
diff --git a/repos/base/src/core/include/region_map_component.h b/repos/base/src/core/include/region_map_component.h
index 49481293f..7eab656ff 100644
--- a/repos/base/src/core/include/region_map_component.h
+++ b/repos/base/src/core/include/region_map_component.h
@@ -383,7 +383,7 @@ class Genode::Region_map_component : private Weak_object<Region_map_component>,
 		~Region_map_component();
 
 		using Weak_object<Region_map_component>::weak_ptr;
-		friend class Locked_ptr<Region_map_component>;
+		friend struct Locked_ptr<Region_map_component>;
 
 		bool equals(Weak_ptr<Region_map_component> const &other)
 		{
@@ -393,7 +393,7 @@ class Genode::Region_map_component : private Weak_object<Region_map_component>,
 		void address_space(Address_space *space) { _address_space = space; }
 		Address_space *address_space() { return _address_space; }
 
-		class Fault_area;
+		struct Fault_area;
 
 		/**
 		 * Register fault
diff --git a/repos/base/src/core/include/trace/source_registry.h b/repos/base/src/core/include/trace/source_registry.h
index 9c3bb4ba1..81eef032a 100644
--- a/repos/base/src/core/include/trace/source_registry.h
+++ b/repos/base/src/core/include/trace/source_registry.h
@@ -25,7 +25,7 @@
 
 namespace Genode { namespace Trace {
 	class Source;
-	class Source_owner;
+	struct Source_owner;
 	class Source_registry;
 
 	/**
diff --git a/repos/base/src/include/base/internal/expanding_pd_session_client.h b/repos/base/src/include/base/internal/expanding_pd_session_client.h
index aeed257ff..ef449c59f 100644
--- a/repos/base/src/include/base/internal/expanding_pd_session_client.h
+++ b/repos/base/src/include/base/internal/expanding_pd_session_client.h
@@ -18,7 +18,7 @@
 #include <util/retry.h>
 #include <pd_session/client.h>
 
-namespace Genode { class Expanding_pd_session_client; }
+namespace Genode { struct Expanding_pd_session_client; }
 
 
 struct Genode::Expanding_pd_session_client : Pd_session_client
diff --git a/repos/base/src/include/base/internal/expanding_region_map_client.h b/repos/base/src/include/base/internal/expanding_region_map_client.h
index bca104edd..edf05347d 100644
--- a/repos/base/src/include/base/internal/expanding_region_map_client.h
+++ b/repos/base/src/include/base/internal/expanding_region_map_client.h
@@ -22,7 +22,7 @@
 /* base-internal includes */
 #include <base/internal/upgradeable_client.h>
 
-namespace Genode { class Expanding_region_map_client; }
+namespace Genode { struct Expanding_region_map_client; }
 
 
 struct Genode::Expanding_region_map_client : Region_map_client
diff --git a/repos/base/src/include/base/internal/globals.h b/repos/base/src/include/base/internal/globals.h
index c934f8ccf..3b740c0bb 100644
--- a/repos/base/src/include/base/internal/globals.h
+++ b/repos/base/src/include/base/internal/globals.h
@@ -18,9 +18,9 @@
 
 namespace Genode {
 
-	class Region_map;
-	class Ram_allocator;
-	class Env;
+	struct Region_map;
+	struct Ram_allocator;
+	struct Env;
 	class Local_session_id_space;
 
 	extern Region_map    *env_stack_area_region_map;
diff --git a/repos/base/src/include/base/internal/rpc_obj_key.h b/repos/base/src/include/base/internal/rpc_obj_key.h
index d16ccfb7c..de559d9e3 100644
--- a/repos/base/src/include/base/internal/rpc_obj_key.h
+++ b/repos/base/src/include/base/internal/rpc_obj_key.h
@@ -18,7 +18,7 @@
 #include <base/stdint.h>
 #include <base/output.h>
 
-namespace Genode { struct Rpc_obj_key; }
+namespace Genode { class Rpc_obj_key; }
 
 
 class Genode::Rpc_obj_key
diff --git a/repos/base/src/include/signal_source/client.h b/repos/base/src/include/signal_source/client.h
index 42f5f9672..fa14e02b4 100644
--- a/repos/base/src/include/signal_source/client.h
+++ b/repos/base/src/include/signal_source/client.h
@@ -18,7 +18,7 @@
 #include <pd_session/pd_session.h>
 #include <signal_source/signal_source.h>
 
-namespace Genode { class Signal_source_client; }
+namespace Genode { struct Signal_source_client; }
 
 struct Genode::Signal_source_client : Rpc_client<Signal_source>
 {
diff --git a/repos/base/src/include/signal_source/signal_source.h b/repos/base/src/include/signal_source/signal_source.h
index 2e704d1d0..16234bc44 100644
--- a/repos/base/src/include/signal_source/signal_source.h
+++ b/repos/base/src/include/signal_source/signal_source.h
@@ -18,7 +18,7 @@
 #ifndef _INCLUDE__SIGNAL_SOURCE__SIGNAL_SOURCE_H_
 #define _INCLUDE__SIGNAL_SOURCE__SIGNAL_SOURCE_H_
 
-namespace Genode { class Signal_source; }
+namespace Genode { struct Signal_source; }
 
 /**
  * Blocking part of the PD-session interface
diff --git a/repos/base/src/lib/ldso/include/debug.h b/repos/base/src/lib/ldso/include/debug.h
index c59c793dc..6b119fd1e 100644
--- a/repos/base/src/lib/ldso/include/debug.h
+++ b/repos/base/src/lib/ldso/include/debug.h
@@ -31,7 +31,7 @@ namespace Linker {
 	struct Debug;
 	struct Link_map;
 
-	struct Object;
+	class Object;
 	void dump_link_map(Object const &);
 }
 
diff --git a/repos/base/src/lib/ldso/include/dynamic.h b/repos/base/src/lib/ldso/include/dynamic.h
index 442b8c667..e0b2b4e92 100644
--- a/repos/base/src/lib/ldso/include/dynamic.h
+++ b/repos/base/src/lib/ldso/include/dynamic.h
@@ -20,7 +20,7 @@
 
 namespace Linker {
 	struct Hash_table;
-	struct Dynamic;
+	class Dynamic;
 }
 
 /**
diff --git a/repos/base/src/lib/ldso/include/linker.h b/repos/base/src/lib/ldso/include/linker.h
index 3dab1fef2..d917c1c50 100644
--- a/repos/base/src/lib/ldso/include/linker.h
+++ b/repos/base/src/lib/ldso/include/linker.h
@@ -33,10 +33,10 @@
  */
 namespace Linker {
 	class  Object;
-	struct Root_object;
-	struct Dependency;
-	struct Elf_object;
-	struct Dynamic;
+	class Root_object;
+	class Dependency;
+	class Elf_object;
+	class Dynamic;
 
 	typedef void (*Func)(void);
 
diff --git a/repos/base/src/lib/ldso/main.cc b/repos/base/src/lib/ldso/main.cc
index c639c7ae6..2aaeaaac0 100644
--- a/repos/base/src/lib/ldso/main.cc
+++ b/repos/base/src/lib/ldso/main.cc
@@ -33,13 +33,13 @@
 using namespace Linker;
 
 namespace Linker {
-	struct Dynamic;
+	class Dynamic;
 	struct Ld;
 	struct Ld_vtable;
 	struct Binary;
 	struct Link_map;
 	struct Debug;
-	struct Config;
+	class Config;
 };
 
 static    Binary *binary_ptr = nullptr;
diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/nitpicker.h
index ff9cf3d6d..6a7ecd8bc 100644
--- a/repos/gems/src/server/wm/nitpicker.h
+++ b/repos/gems/src/server/wm/nitpicker.h
@@ -108,7 +108,7 @@ class Wm::Nitpicker::View : private Genode::Weak_object<View>,
 	private:
 
 		friend class Genode::Weak_ptr<View>;
-		friend class Genode::Locked_ptr<View>;
+		friend struct Genode::Locked_ptr<View>;
 
 	protected:
 
diff --git a/repos/os/src/server/nitpicker/view_component.h b/repos/os/src/server/nitpicker/view_component.h
index d130cb8f5..48916df8b 100644
--- a/repos/os/src/server/nitpicker/view_component.h
+++ b/repos/os/src/server/nitpicker/view_component.h
@@ -83,7 +83,7 @@ class Nitpicker::View_component : private Same_buffer_list_elem,
 
 		friend class View_stack;
 		friend class Session_component;
-		friend class Locked_ptr<View_component>;
+		friend struct Locked_ptr<View_component>;
 
 		/*
 		 * Noncopyable