diff --git a/repos/base-nova/src/timer/nova/time_source.cc b/repos/base-nova/src/timer/nova/time_source.cc
index ebf83fb4a..92bf2127e 100644
--- a/repos/base-nova/src/timer/nova/time_source.cc
+++ b/repos/base-nova/src/timer/nova/time_source.cc
@@ -16,7 +16,7 @@
 #include <nova/native_thread.h>
 
 /* local includes */
-#include <time_source.h>
+#include "time_source.h"
 
 using namespace Genode;
 using namespace Nova;
diff --git a/repos/base/src/timer/include/root_component.h b/repos/base/src/timer/include/root_component.h
index d2f89c033..464dec580 100644
--- a/repos/base/src/timer/include/root_component.h
+++ b/repos/base/src/timer/include/root_component.h
@@ -19,7 +19,7 @@
 #include <root/component.h>
 
 /* local includes */
-#include <time_source.h>
+#include "time_source.h"
 #include <session_component.h>
 
 namespace Timer { class Root_component; }
diff --git a/repos/os/src/app/block_tester/main.cc b/repos/os/src/app/block_tester/main.cc
index 63a6070f2..168602f0e 100644
--- a/repos/os/src/app/block_tester/main.cc
+++ b/repos/os/src/app/block_tester/main.cc
@@ -307,10 +307,10 @@ struct Test::Test_base : private Genode::Fifo<Test_base>::Element
 
 
 /* tests */
-#include <test_ping_pong.h>
-#include <test_random.h>
-#include <test_replay.h>
-#include <test_sequential.h>
+#include "test_ping_pong.h"
+#include "test_random.h"
+#include "test_replay.h"
+#include "test_sequential.h"
 
 
 /*
diff --git a/repos/os/src/app/ping/dhcp_client.cc b/repos/os/src/app/ping/dhcp_client.cc
index b9daa5cf9..b91368e45 100644
--- a/repos/os/src/app/ping/dhcp_client.cc
+++ b/repos/os/src/app/ping/dhcp_client.cc
@@ -12,9 +12,9 @@
  */
 
 /* local includes */
-#include <nic.h>
-#include <dhcp_client.h>
-#include <ipv4_config.h>
+#include "nic.h"
+#include "dhcp_client.h"
+#include "ipv4_config.h"
 
 /* Genode includes */
 #include <util/xml_node.h>
diff --git a/repos/os/src/app/ping/ipv4_address_prefix.cc b/repos/os/src/app/ping/ipv4_address_prefix.cc
index bf46d115e..7db8ba1f0 100644
--- a/repos/os/src/app/ping/ipv4_address_prefix.cc
+++ b/repos/os/src/app/ping/ipv4_address_prefix.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <ipv4_address_prefix.h>
+#include "ipv4_address_prefix.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/app/ping/ipv4_config.cc b/repos/os/src/app/ping/ipv4_config.cc
index 5aea166f5..0463bc4ca 100644
--- a/repos/os/src/app/ping/ipv4_config.cc
+++ b/repos/os/src/app/ping/ipv4_config.cc
@@ -15,7 +15,7 @@
 #include <base/log.h>
 
 /* local includes */
-#include <ipv4_config.h>
+#include "ipv4_config.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/app/ping/ipv4_config.h b/repos/os/src/app/ping/ipv4_config.h
index 6b3f01107..2f945abd4 100644
--- a/repos/os/src/app/ping/ipv4_config.h
+++ b/repos/os/src/app/ping/ipv4_config.h
@@ -15,7 +15,7 @@
 #define _IPV4_CONFIG_H_
 
 /* local includes */
-#include <ipv4_address_prefix.h>
+#include "ipv4_address_prefix.h"
 
 namespace Net { class Ipv4_config; }
 
diff --git a/repos/os/src/app/ping/main.cc b/repos/os/src/app/ping/main.cc
index a3966f285..6f3b9fbf4 100644
--- a/repos/os/src/app/ping/main.cc
+++ b/repos/os/src/app/ping/main.cc
@@ -12,10 +12,10 @@
  */
 
 /* local includes */
-#include <nic.h>
-#include <ipv4_config.h>
-#include <dhcp_client.h>
-#include <protocol.h>
+#include "nic.h"
+#include "ipv4_config.h"
+#include "dhcp_client.h"
+#include "protocol.h"
 
 /* Genode includes */
 #include <net/ipv4.h>
diff --git a/repos/os/src/app/ping/nic.cc b/repos/os/src/app/ping/nic.cc
index dd835d63e..cd4dd18d1 100644
--- a/repos/os/src/app/ping/nic.cc
+++ b/repos/os/src/app/ping/nic.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <nic.h>
+#include "nic.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/app/ping/xml_node.cc b/repos/os/src/app/ping/xml_node.cc
index b2dbee155..604d18cea 100644
--- a/repos/os/src/app/ping/xml_node.cc
+++ b/repos/os/src/app/ping/xml_node.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <xml_node.h>
+#include "xml_node.h"
 
 using namespace Genode;
 
diff --git a/repos/os/src/app/trace_logger/main.cc b/repos/os/src/app/trace_logger/main.cc
index a87b37112..8764d8a13 100644
--- a/repos/os/src/app/trace_logger/main.cc
+++ b/repos/os/src/app/trace_logger/main.cc
@@ -12,9 +12,9 @@
  */
 
 /* local includes */
-#include <policy.h>
-#include <monitor.h>
-#include <xml_node.h>
+#include "policy.h"
+#include "monitor.h"
+#include "xml_node.h"
 
 /* Genode includes */
 #include <base/component.h>
diff --git a/repos/os/src/app/trace_logger/monitor.cc b/repos/os/src/app/trace_logger/monitor.cc
index 8145ed1f8..7188b7c87 100644
--- a/repos/os/src/app/trace_logger/monitor.cc
+++ b/repos/os/src/app/trace_logger/monitor.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <monitor.h>
+#include "monitor.h"
 
 /* Genode includes */
 #include <trace_session/connection.h>
diff --git a/repos/os/src/app/trace_logger/monitor.h b/repos/os/src/app/trace_logger/monitor.h
index e701ecf72..5901e88a2 100644
--- a/repos/os/src/app/trace_logger/monitor.h
+++ b/repos/os/src/app/trace_logger/monitor.h
@@ -15,8 +15,8 @@
 #define _MONITOR_H_
 
 /* local includes */
-#include <avl_tree.h>
-#include <trace_buffer.h>
+#include "avl_tree.h"
+#include "trace_buffer.h"
 
 /* Genode includes */
 #include <base/trace/types.h>
diff --git a/repos/os/src/app/trace_logger/policy.cc b/repos/os/src/app/trace_logger/policy.cc
index ac4861908..bcdd43512 100644
--- a/repos/os/src/app/trace_logger/policy.cc
+++ b/repos/os/src/app/trace_logger/policy.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <policy.h>
+#include "policy.h"
 
 using namespace Genode;
 
diff --git a/repos/os/src/app/trace_logger/xml_node.cc b/repos/os/src/app/trace_logger/xml_node.cc
index b2dbee155..604d18cea 100644
--- a/repos/os/src/app/trace_logger/xml_node.cc
+++ b/repos/os/src/app/trace_logger/xml_node.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <xml_node.h>
+#include "xml_node.h"
 
 using namespace Genode;
 
diff --git a/repos/os/src/init/alias.h b/repos/os/src/init/alias.h
index 89f07df22..423280d15 100644
--- a/repos/os/src/init/alias.h
+++ b/repos/os/src/init/alias.h
@@ -15,7 +15,7 @@
 #define _SRC__INIT__ALIAS_H_
 
 /* local includes */
-#include <types.h>
+#include "types.h"
 
 namespace Init { struct Alias; }
 
diff --git a/repos/os/src/init/child.cc b/repos/os/src/init/child.cc
index bbc19cfca..8683b1cd7 100644
--- a/repos/os/src/init/child.cc
+++ b/repos/os/src/init/child.cc
@@ -14,7 +14,7 @@
 #include <vm_session/vm_session.h>
 
 /* local includes */
-#include <child.h>
+#include "child.h"
 
 
 void Init::Child::destroy_services()
diff --git a/repos/os/src/init/child.h b/repos/os/src/init/child.h
index 0adc97b63..f0c7dcadb 100644
--- a/repos/os/src/init/child.h
+++ b/repos/os/src/init/child.h
@@ -22,12 +22,12 @@
 #include <os/buffered_xml.h>
 
 /* local includes */
-#include <types.h>
-#include <verbose.h>
-#include <report.h>
-#include <name_registry.h>
-#include <service.h>
-#include <utils.h>
+#include "types.h"
+#include "verbose.h"
+#include "report.h"
+#include "name_registry.h"
+#include "service.h"
+#include "utils.h"
 
 namespace Init { class Child; }
 
diff --git a/repos/os/src/init/child_registry.h b/repos/os/src/init/child_registry.h
index 61ed13beb..8b05f31e8 100644
--- a/repos/os/src/init/child_registry.h
+++ b/repos/os/src/init/child_registry.h
@@ -15,10 +15,10 @@
 #define _SRC__INIT__CHILD_REGISTRY_H_
 
 /* local includes */
-#include <child.h>
-#include <name_registry.h>
-#include <alias.h>
-#include <report.h>
+#include "child.h"
+#include "name_registry.h"
+#include "alias.h"
+#include "report.h"
 
 namespace Init { struct Child_registry; }
 
diff --git a/repos/os/src/init/heartbeat.h b/repos/os/src/init/heartbeat.h
index da9a6e1c0..c28370383 100644
--- a/repos/os/src/init/heartbeat.h
+++ b/repos/os/src/init/heartbeat.h
@@ -15,8 +15,8 @@
 #define _SRC__INIT__HEARTBEAT_H_
 
 /* local includes */
-#include <state_reporter.h>
-#include <child_registry.h>
+#include "state_reporter.h"
+#include "child_registry.h"
 #include <util/noncopyable.h>
 
 namespace Init { class Heartbeat; }
diff --git a/repos/os/src/init/main.cc b/repos/os/src/init/main.cc
index 05f2f5937..2f944ddb5 100644
--- a/repos/os/src/init/main.cc
+++ b/repos/os/src/init/main.cc
@@ -16,10 +16,10 @@
 #include <base/attached_rom_dataspace.h>
 
 /* local includes */
-#include <child.h>
-#include <alias.h>
-#include <server.h>
-#include <heartbeat.h>
+#include "child.h"
+#include "alias.h"
+#include "server.h"
+#include "heartbeat.h"
 
 namespace Init { struct Main; }
 
diff --git a/repos/os/src/init/name_registry.h b/repos/os/src/init/name_registry.h
index 4e85b2924..7c9a067bd 100644
--- a/repos/os/src/init/name_registry.h
+++ b/repos/os/src/init/name_registry.h
@@ -18,7 +18,7 @@
 #include <base/child.h>
 
 /* local includes */
-#include <types.h>
+#include "types.h"
 
 namespace Init { struct Name_registry; }
 
diff --git a/repos/os/src/lib/vfs/file_system_factory.cc b/repos/os/src/lib/vfs/file_system_factory.cc
index cf62e5100..151e23be5 100644
--- a/repos/os/src/lib/vfs/file_system_factory.cc
+++ b/repos/os/src/lib/vfs/file_system_factory.cc
@@ -17,18 +17,18 @@
 #include <base/shared_object.h>
 
 /* supported builtin file systems */
-#include <block_file_system.h>
-#include <fs_file_system.h>
-#include <inline_file_system.h>
-#include <log_file_system.h>
-#include <null_file_system.h>
-#include <ram_file_system.h>
-#include <rom_file_system.h>
-#include <rtc_file_system.h>
-#include <symlink_file_system.h>
-#include <tar_file_system.h>
-#include <terminal_file_system.h>
-#include <zero_file_system.h>
+#include "block_file_system.h"
+#include "fs_file_system.h"
+#include "inline_file_system.h"
+#include "log_file_system.h"
+#include "null_file_system.h"
+#include "ram_file_system.h"
+#include "rom_file_system.h"
+#include "rtc_file_system.h"
+#include "symlink_file_system.h"
+#include "tar_file_system.h"
+#include "terminal_file_system.h"
+#include "zero_file_system.h"
 
 
 namespace Vfs {
diff --git a/repos/os/src/server/input_filter/accelerate_source.h b/repos/os/src/server/input_filter/accelerate_source.h
index cc0021535..9fe2a735a 100644
--- a/repos/os/src/server/input_filter/accelerate_source.h
+++ b/repos/os/src/server/input_filter/accelerate_source.h
@@ -19,8 +19,8 @@
 #include <input/keycodes.h>
 
 /* local includes */
-#include <source.h>
-#include <key_code_by_name.h>
+#include "source.h"
+#include "key_code_by_name.h"
 
 namespace Input_filter { class Accelerate_source; }
 
diff --git a/repos/os/src/server/input_filter/button_scroll_source.h b/repos/os/src/server/input_filter/button_scroll_source.h
index dd0f4b54d..c84488e7e 100644
--- a/repos/os/src/server/input_filter/button_scroll_source.h
+++ b/repos/os/src/server/input_filter/button_scroll_source.h
@@ -18,8 +18,8 @@
 #include <input/keycodes.h>
 
 /* local includes */
-#include <source.h>
-#include <key_code_by_name.h>
+#include "source.h"
+#include "key_code_by_name.h"
 
 namespace Input_filter { class Button_scroll_source; }
 
diff --git a/repos/os/src/server/input_filter/chargen_source.h b/repos/os/src/server/input_filter/chargen_source.h
index 06fc657c2..aa3cdf64b 100644
--- a/repos/os/src/server/input_filter/chargen_source.h
+++ b/repos/os/src/server/input_filter/chargen_source.h
@@ -18,9 +18,9 @@
 #include <input/keycodes.h>
 
 /* local includes */
-#include <source.h>
-#include <timer_accessor.h>
-#include <include_accessor.h>
+#include "source.h"
+#include "timer_accessor.h"
+#include "include_accessor.h"
 
 namespace Input_filter { class Chargen_source; }
 
diff --git a/repos/os/src/server/input_filter/connection.h b/repos/os/src/server/input_filter/connection.h
index a8611d6e0..31ca15f02 100644
--- a/repos/os/src/server/input_filter/connection.h
+++ b/repos/os/src/server/input_filter/connection.h
@@ -19,7 +19,7 @@
 #include <base/session_label.h>
 
 /* local includes */
-#include <types.h>
+#include "types.h"
 
 namespace Input_filter { struct Input_connection; }
 
diff --git a/repos/os/src/server/input_filter/include_accessor.h b/repos/os/src/server/input_filter/include_accessor.h
index 4df98095d..20885db3b 100644
--- a/repos/os/src/server/input_filter/include_accessor.h
+++ b/repos/os/src/server/input_filter/include_accessor.h
@@ -18,7 +18,7 @@
 #include <util/xml_node.h>
 
 /* local includes */
-#include <types.h>
+#include "types.h"
 
 namespace Input_filter { struct Include_accessor; }
 
diff --git a/repos/os/src/server/input_filter/input_source.h b/repos/os/src/server/input_filter/input_source.h
index 8e99b539d..50d253f3a 100644
--- a/repos/os/src/server/input_filter/input_source.h
+++ b/repos/os/src/server/input_filter/input_source.h
@@ -15,8 +15,8 @@
 #define _INPUT_FILTER__INPUT_SOURCE_H_
 
 /* local includes */
-#include <source.h>
-#include <connection.h>
+#include "source.h"
+#include "connection.h"
 
 namespace Input_filter { class Input_source; }
 
diff --git a/repos/os/src/server/input_filter/main.cc b/repos/os/src/server/input_filter/main.cc
index b15122fde..04eee7289 100644
--- a/repos/os/src/server/input_filter/main.cc
+++ b/repos/os/src/server/input_filter/main.cc
@@ -20,12 +20,12 @@
 #include <timer_session/connection.h>
 
 /* local includes */
-#include <input_source.h>
-#include <remap_source.h>
-#include <merge_source.h>
-#include <chargen_source.h>
-#include <button_scroll_source.h>
-#include <accelerate_source.h>
+#include "input_source.h"
+#include "remap_source.h"
+#include "merge_source.h"
+#include "chargen_source.h"
+#include "button_scroll_source.h"
+#include "accelerate_source.h"
 
 namespace Input_filter { struct Main; }
 
diff --git a/repos/os/src/server/input_filter/merge_source.h b/repos/os/src/server/input_filter/merge_source.h
index b570f7792..874e41f30 100644
--- a/repos/os/src/server/input_filter/merge_source.h
+++ b/repos/os/src/server/input_filter/merge_source.h
@@ -15,7 +15,7 @@
 #define _INPUT_FILTER__MERGE_SOURCE_H_
 
 /* local includes */
-#include <source.h>
+#include "source.h"
 
 namespace Input_filter { class Merge_source; }
 
diff --git a/repos/os/src/server/input_filter/remap_source.h b/repos/os/src/server/input_filter/remap_source.h
index b28fcbc6c..de5ce886e 100644
--- a/repos/os/src/server/input_filter/remap_source.h
+++ b/repos/os/src/server/input_filter/remap_source.h
@@ -18,9 +18,9 @@
 #include <input/keycodes.h>
 
 /* local includes */
-#include <include_accessor.h>
-#include <source.h>
-#include <key_code_by_name.h>
+#include "include_accessor.h"
+#include "source.h"
+#include "key_code_by_name.h"
 
 namespace Input_filter { class Remap_source; }
 
diff --git a/repos/os/src/server/input_filter/source.h b/repos/os/src/server/input_filter/source.h
index 907881984..2a8188a2f 100644
--- a/repos/os/src/server/input_filter/source.h
+++ b/repos/os/src/server/input_filter/source.h
@@ -19,7 +19,7 @@
 #include <input/event.h>
 
 /* local includes */
-#include <types.h>
+#include "types.h"
 
 namespace Input_filter { struct Source; }
 
diff --git a/repos/os/src/server/nic_bridge/component.cc b/repos/os/src/server/nic_bridge/component.cc
index f61475f56..1b2cf9fa3 100644
--- a/repos/os/src/server/nic_bridge/component.cc
+++ b/repos/os/src/server/nic_bridge/component.cc
@@ -16,7 +16,7 @@
 #include <net/dhcp.h>
 #include <net/udp.h>
 
-#include <component.h>
+#include "component.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_bridge/component.h b/repos/os/src/server/nic_bridge/component.h
index 42170f829..c9c80351e 100644
--- a/repos/os/src/server/nic_bridge/component.h
+++ b/repos/os/src/server/nic_bridge/component.h
@@ -26,12 +26,12 @@
 #include <util/arg_string.h>
 
 /* NIC router includes */
-#include <mac_allocator.h>
+#include "mac_allocator.h"
 
 /* local includes */
-#include <address_node.h>
-#include <nic.h>
-#include <packet_handler.h>
+#include "address_node.h"
+#include "nic.h"
+#include "packet_handler.h"
 
 namespace Net {
 	class Stream_allocator;
diff --git a/repos/os/src/server/nic_bridge/main.cc b/repos/os/src/server/nic_bridge/main.cc
index c2d8f5b6c..5485910e4 100644
--- a/repos/os/src/server/nic_bridge/main.cc
+++ b/repos/os/src/server/nic_bridge/main.cc
@@ -22,7 +22,7 @@
 #include <nic/packet_allocator.h>
 
 /* local includes */
-#include <component.h>
+#include "component.h"
 
 
 struct Main
diff --git a/repos/os/src/server/nic_bridge/nic.cc b/repos/os/src/server/nic_bridge/nic.cc
index 8e3ddac5a..696af0fa6 100644
--- a/repos/os/src/server/nic_bridge/nic.cc
+++ b/repos/os/src/server/nic_bridge/nic.cc
@@ -18,7 +18,7 @@
 #include <net/udp.h>
 #include <net/dhcp.h>
 
-#include <component.h>
+#include "component.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_bridge/nic.h b/repos/os/src/server/nic_bridge/nic.h
index 77d029306..1491a9333 100644
--- a/repos/os/src/server/nic_bridge/nic.h
+++ b/repos/os/src/server/nic_bridge/nic.h
@@ -17,7 +17,7 @@
 #include <nic_session/connection.h>
 #include <nic/packet_allocator.h>
 
-#include <packet_handler.h>
+#include "packet_handler.h"
 
 namespace Net { class Nic; }
 
diff --git a/repos/os/src/server/nic_bridge/packet_handler.cc b/repos/os/src/server/nic_bridge/packet_handler.cc
index e5515062c..68c5a12e4 100644
--- a/repos/os/src/server/nic_bridge/packet_handler.cc
+++ b/repos/os/src/server/nic_bridge/packet_handler.cc
@@ -18,8 +18,8 @@
 #include <net/ipv4.h>
 #include <net/udp.h>
 
-#include <component.h>
-#include <packet_handler.h>
+#include "component.h"
+#include "packet_handler.h"
 
 using namespace Net;
 
diff --git a/repos/os/src/server/nic_bridge/packet_handler.h b/repos/os/src/server/nic_bridge/packet_handler.h
index ee08b43fe..8534d56d5 100644
--- a/repos/os/src/server/nic_bridge/packet_handler.h
+++ b/repos/os/src/server/nic_bridge/packet_handler.h
@@ -21,7 +21,7 @@
 #include <net/ethernet.h>
 #include <net/ipv4.h>
 
-#include <vlan.h>
+#include "vlan.h"
 
 namespace Net {
 
diff --git a/repos/os/src/server/nic_bridge/vlan.h b/repos/os/src/server/nic_bridge/vlan.h
index 4c74a61f8..506f3dac6 100644
--- a/repos/os/src/server/nic_bridge/vlan.h
+++ b/repos/os/src/server/nic_bridge/vlan.h
@@ -18,7 +18,7 @@
 
 #include <util/avl_tree.h>
 #include <util/list.h>
-#include <address_node.h>
+#include "address_node.h"
 
 namespace Net {
 
diff --git a/repos/os/src/server/nic_dump/component.cc b/repos/os/src/server/nic_dump/component.cc
index 15c070e6b..a843369e5 100644
--- a/repos/os/src/server/nic_dump/component.cc
+++ b/repos/os/src/server/nic_dump/component.cc
@@ -15,8 +15,8 @@
 #include <os/session_policy.h>
 
 /* local includes */
-#include <component.h>
-#include <uplink.h>
+#include "component.h"
+#include "uplink.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_dump/component.h b/repos/os/src/server/nic_dump/component.h
index cd61edcd7..415339980 100644
--- a/repos/os/src/server/nic_dump/component.h
+++ b/repos/os/src/server/nic_dump/component.h
@@ -21,8 +21,8 @@
 #include <nic_session/rpc_object.h>
 
 /* local includes */
-#include <interface.h>
-#include <uplink.h>
+#include "interface.h"
+#include "uplink.h"
 
 namespace Net {
 
diff --git a/repos/os/src/server/nic_dump/interface.cc b/repos/os/src/server/nic_dump/interface.cc
index 5af99e90b..b7592b17e 100644
--- a/repos/os/src/server/nic_dump/interface.cc
+++ b/repos/os/src/server/nic_dump/interface.cc
@@ -12,11 +12,11 @@
  */
 
 /* local includes */
-#include <interface.h>
+#include "interface.h"
+#include "packet_log.h"
 
 /* Genode includes */
 #include <net/ethernet.h>
-#include <packet_log.h>
 #include <util/xml_node.h>
 
 using namespace Net;
diff --git a/repos/os/src/server/nic_dump/interface.h b/repos/os/src/server/nic_dump/interface.h
index 3d65dfa29..026ed0e4f 100644
--- a/repos/os/src/server/nic_dump/interface.h
+++ b/repos/os/src/server/nic_dump/interface.h
@@ -15,8 +15,8 @@
 #define _INTERFACE_H_
 
 /* local includes */
-#include <pointer.h>
-#include <packet_log.h>
+#include "pointer.h"
+#include "packet_log.h"
 
 /* Genode includes */
 #include <nic_session/nic_session.h>
diff --git a/repos/os/src/server/nic_dump/main.cc b/repos/os/src/server/nic_dump/main.cc
index e51ed4600..79b6f6b5e 100644
--- a/repos/os/src/server/nic_dump/main.cc
+++ b/repos/os/src/server/nic_dump/main.cc
@@ -18,7 +18,7 @@
 #include <timer_session/connection.h>
 
 /* local includes */
-#include <component.h>
+#include "component.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_dump/packet_log.cc b/repos/os/src/server/nic_dump/packet_log.cc
index d69bdfa46..f4faef6ec 100644
--- a/repos/os/src/server/nic_dump/packet_log.cc
+++ b/repos/os/src/server/nic_dump/packet_log.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <packet_log.h>
+#include "packet_log.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/server/nic_dump/uplink.cc b/repos/os/src/server/nic_dump/uplink.cc
index c7ae1915e..7a1fbff86 100644
--- a/repos/os/src/server/nic_dump/uplink.cc
+++ b/repos/os/src/server/nic_dump/uplink.cc
@@ -16,7 +16,7 @@
 #include <net/ethernet.h>
 
 /* local includes */
-#include <uplink.h>
+#include "uplink.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_dump/uplink.h b/repos/os/src/server/nic_dump/uplink.h
index d50be17b3..4e521fa0b 100644
--- a/repos/os/src/server/nic_dump/uplink.h
+++ b/repos/os/src/server/nic_dump/uplink.h
@@ -20,7 +20,7 @@
 #include <util/xml_node.h>
 
 /* local includes */
-#include <interface.h>
+#include "interface.h"
 
 namespace Net { class Uplink; }
 
diff --git a/repos/os/src/server/nic_router/arp_cache.cc b/repos/os/src/server/nic_router/arp_cache.cc
index 500e858f6..a74221ef5 100644
--- a/repos/os/src/server/nic_router/arp_cache.cc
+++ b/repos/os/src/server/nic_router/arp_cache.cc
@@ -12,9 +12,9 @@
 */
 
 /* local includes */
-#include <arp_cache.h>
-#include <domain.h>
-#include <configuration.h>
+#include "arp_cache.h"
+#include "domain.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/arp_waiter.cc b/repos/os/src/server/nic_router/arp_waiter.cc
index 992e59c2b..a45a28fd8 100644
--- a/repos/os/src/server/nic_router/arp_waiter.cc
+++ b/repos/os/src/server/nic_router/arp_waiter.cc
@@ -12,9 +12,9 @@
  */
 
 /* local includes */
-#include <arp_waiter.h>
-#include <interface.h>
-#include <domain.h>
+#include "arp_waiter.h"
+#include "interface.h"
+#include "domain.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/arp_waiter.h b/repos/os/src/server/nic_router/arp_waiter.h
index 2a505d373..eaa010447 100644
--- a/repos/os/src/server/nic_router/arp_waiter.h
+++ b/repos/os/src/server/nic_router/arp_waiter.h
@@ -15,8 +15,8 @@
 #define _ARP_WAITER_H_
 
 /* local includes */
-#include <list.h>
-#include <reference.h>
+#include "list.h"
+#include "reference.h"
 
 /* Genode includes */
 #include <net/ipv4.h>
diff --git a/repos/os/src/server/nic_router/avl_string_tree.h b/repos/os/src/server/nic_router/avl_string_tree.h
index 31a4e956b..9667bd374 100644
--- a/repos/os/src/server/nic_router/avl_string_tree.h
+++ b/repos/os/src/server/nic_router/avl_string_tree.h
@@ -15,7 +15,7 @@
 #define _AVL_STRING_TREE_H_
 
 /* local includes */
-#include <reference.h>
+#include "reference.h"
 
 /* Genode includes */
 #include <util/avl_string.h>
diff --git a/repos/os/src/server/nic_router/component.cc b/repos/os/src/server/nic_router/component.cc
index c1ac984d5..d9f46fe71 100644
--- a/repos/os/src/server/nic_router/component.cc
+++ b/repos/os/src/server/nic_router/component.cc
@@ -15,8 +15,8 @@
 #include <os/session_policy.h>
 
 /* local includes */
-#include <component.h>
-#include <configuration.h>
+#include "component.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/component.h b/repos/os/src/server/nic_router/component.h
index 7fc65982e..d51fff4ba 100644
--- a/repos/os/src/server/nic_router/component.h
+++ b/repos/os/src/server/nic_router/component.h
@@ -22,10 +22,10 @@
 #include <nic_session/rpc_object.h>
 
 /* local includes */
-#include <mac_allocator.h>
-#include <interface.h>
-#include <reference.h>
-#include <report.h>
+#include "mac_allocator.h"
+#include "interface.h"
+#include "reference.h"
+#include "report.h"
 
 namespace Genode { class Session_env; }
 
diff --git a/repos/os/src/server/nic_router/configuration.cc b/repos/os/src/server/nic_router/configuration.cc
index 3211335b1..7f98683c5 100644
--- a/repos/os/src/server/nic_router/configuration.cc
+++ b/repos/os/src/server/nic_router/configuration.cc
@@ -12,8 +12,8 @@
  */
 
 /* local includes */
-#include <configuration.h>
-#include <xml_node.h>
+#include "configuration.h"
+#include "xml_node.h"
 
 /* Genode includes */
 #include <base/allocator.h>
diff --git a/repos/os/src/server/nic_router/configuration.h b/repos/os/src/server/nic_router/configuration.h
index 41f03f2e7..56a083da2 100644
--- a/repos/os/src/server/nic_router/configuration.h
+++ b/repos/os/src/server/nic_router/configuration.h
@@ -15,9 +15,9 @@
 #define _CONFIGURATION_H_
 
 /* local includes */
-#include <domain.h>
-#include <report.h>
-#include <uplink.h>
+#include "domain.h"
+#include "report.h"
+#include "uplink.h"
 
 /* Genode includes */
 #include <base/duration.h>
diff --git a/repos/os/src/server/nic_router/dhcp_client.cc b/repos/os/src/server/nic_router/dhcp_client.cc
index 173b4d12c..978ebb2a9 100644
--- a/repos/os/src/server/nic_router/dhcp_client.cc
+++ b/repos/os/src/server/nic_router/dhcp_client.cc
@@ -12,10 +12,10 @@
  */
 
 /* local includes */
-#include <dhcp_client.h>
-#include <interface.h>
-#include <domain.h>
-#include <configuration.h>
+#include "dhcp_client.h"
+#include "interface.h"
+#include "domain.h"
+#include "configuration.h"
 
 enum { PKT_SIZE = 1024 };
 
diff --git a/repos/os/src/server/nic_router/dhcp_server.cc b/repos/os/src/server/nic_router/dhcp_server.cc
index 1e3399fa4..ab04ee5bb 100644
--- a/repos/os/src/server/nic_router/dhcp_server.cc
+++ b/repos/os/src/server/nic_router/dhcp_server.cc
@@ -12,10 +12,10 @@
  */
 
 /* local includes */
-#include <dhcp_server.h>
-#include <interface.h>
-#include <domain.h>
-#include <configuration.h>
+#include "dhcp_server.h"
+#include "interface.h"
+#include "domain.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/dhcp_server.h b/repos/os/src/server/nic_router/dhcp_server.h
index 6aedab301..cc8efe529 100644
--- a/repos/os/src/server/nic_router/dhcp_server.h
+++ b/repos/os/src/server/nic_router/dhcp_server.h
@@ -15,10 +15,10 @@
 #define _DHCP_SERVER_H_
 
 /* local includes */
-#include <ipv4_address_prefix.h>
-#include <bit_allocator_dynamic.h>
-#include <list.h>
-#include <pointer.h>
+#include "ipv4_address_prefix.h"
+#include "bit_allocator_dynamic.h"
+#include "list.h"
+#include "pointer.h"
 
 /* Genode includes */
 #include <net/mac_address.h>
diff --git a/repos/os/src/server/nic_router/direct_rule.cc b/repos/os/src/server/nic_router/direct_rule.cc
index 3700124cd..a24a9d8af 100644
--- a/repos/os/src/server/nic_router/direct_rule.cc
+++ b/repos/os/src/server/nic_router/direct_rule.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <direct_rule.h>
+#include "direct_rule.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/direct_rule.h b/repos/os/src/server/nic_router/direct_rule.h
index e4ccfe93e..1507efd7c 100644
--- a/repos/os/src/server/nic_router/direct_rule.h
+++ b/repos/os/src/server/nic_router/direct_rule.h
@@ -15,8 +15,8 @@
 #define _DIRECT_RULE_H_
 
 /* local includes */
-#include <ipv4_address_prefix.h>
-#include <list.h>
+#include "ipv4_address_prefix.h"
+#include "list.h"
 
 /* Genode includes */
 #include <util/list.h>
diff --git a/repos/os/src/server/nic_router/domain.cc b/repos/os/src/server/nic_router/domain.cc
index 34c54b1e8..19d4a12ab 100644
--- a/repos/os/src/server/nic_router/domain.cc
+++ b/repos/os/src/server/nic_router/domain.cc
@@ -12,9 +12,9 @@
  */
 
 /* local includes */
-#include <configuration.h>
-#include <l3_protocol.h>
-#include <interface.h>
+#include "configuration.h"
+#include "l3_protocol.h"
+#include "interface.h"
 
 /* Genode includes */
 #include <util/xml_generator.h>
diff --git a/repos/os/src/server/nic_router/domain.h b/repos/os/src/server/nic_router/domain.h
index 50cdad818..97922bc11 100644
--- a/repos/os/src/server/nic_router/domain.h
+++ b/repos/os/src/server/nic_router/domain.h
@@ -15,17 +15,17 @@
 #define _DOMAIN_H_
 
 /* local includes */
-#include <forward_rule.h>
-#include <transport_rule.h>
-#include <nat_rule.h>
-#include <ip_rule.h>
-#include <arp_cache.h>
-#include <port_allocator.h>
-#include <pointer.h>
-#include <ipv4_config.h>
-#include <dhcp_server.h>
-#include <interface.h>
-#include <avl_string_tree.h>
+#include "forward_rule.h"
+#include "transport_rule.h"
+#include "nat_rule.h"
+#include "ip_rule.h"
+#include "arp_cache.h"
+#include "port_allocator.h"
+#include "pointer.h"
+#include "ipv4_config.h"
+#include "dhcp_server.h"
+#include "interface.h"
+#include "avl_string_tree.h"
 
 /* Genode includes */
 #include <util/reconstructible.h>
diff --git a/repos/os/src/server/nic_router/forward_rule.cc b/repos/os/src/server/nic_router/forward_rule.cc
index 30d8c6592..ba4d6a10d 100644
--- a/repos/os/src/server/nic_router/forward_rule.cc
+++ b/repos/os/src/server/nic_router/forward_rule.cc
@@ -12,8 +12,8 @@
  */
 
 /* local includes */
-#include <forward_rule.h>
-#include <domain.h>
+#include "forward_rule.h"
+#include "domain.h"
 
 /* Genode includes */
 #include <util/xml_node.h>
diff --git a/repos/os/src/server/nic_router/forward_rule.h b/repos/os/src/server/nic_router/forward_rule.h
index c9b1a6477..92000a7cd 100644
--- a/repos/os/src/server/nic_router/forward_rule.h
+++ b/repos/os/src/server/nic_router/forward_rule.h
@@ -15,7 +15,7 @@
 #define _FORWARD_RULE_H_
 
 /* local includes */
-#include <avl_tree.h>
+#include "avl_tree.h"
 
 /* Genode includes */
 #include <util/avl_tree.h>
diff --git a/repos/os/src/server/nic_router/interface.cc b/repos/os/src/server/nic_router/interface.cc
index 3a5f695ea..4278b496a 100644
--- a/repos/os/src/server/nic_router/interface.cc
+++ b/repos/os/src/server/nic_router/interface.cc
@@ -19,9 +19,9 @@
 #include <base/quota_guard.h>
 
 /* local includes */
-#include <interface.h>
-#include <configuration.h>
-#include <l3_protocol.h>
+#include "interface.h"
+#include "configuration.h"
+#include "l3_protocol.h"
 
 using namespace Net;
 using Genode::Deallocator;
diff --git a/repos/os/src/server/nic_router/interface.h b/repos/os/src/server/nic_router/interface.h
index 1a1f8f233..cdc23b154 100644
--- a/repos/os/src/server/nic_router/interface.h
+++ b/repos/os/src/server/nic_router/interface.h
@@ -15,13 +15,13 @@
 #define _INTERFACE_H_
 
 /* local includes */
-#include <link.h>
-#include <arp_waiter.h>
-#include <l3_protocol.h>
-#include <dhcp_client.h>
-#include <dhcp_server.h>
-#include <list.h>
-#include <report.h>
+#include "link.h"
+#include "arp_waiter.h"
+#include "l3_protocol.h"
+#include "dhcp_client.h"
+#include "dhcp_server.h"
+#include "list.h"
+#include "report.h"
 
 /* Genode includes */
 #include <nic_session/nic_session.h>
diff --git a/repos/os/src/server/nic_router/ip_rule.cc b/repos/os/src/server/nic_router/ip_rule.cc
index dc39199a6..70e2e062e 100644
--- a/repos/os/src/server/nic_router/ip_rule.cc
+++ b/repos/os/src/server/nic_router/ip_rule.cc
@@ -12,8 +12,8 @@
  */
 
 /* local includes */
-#include <ip_rule.h>
-#include <domain.h>
+#include "ip_rule.h"
+#include "domain.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/ip_rule.h b/repos/os/src/server/nic_router/ip_rule.h
index ca8de1886..cb69bbe5a 100644
--- a/repos/os/src/server/nic_router/ip_rule.h
+++ b/repos/os/src/server/nic_router/ip_rule.h
@@ -15,7 +15,7 @@
 #define _IP_RULE_H_
 
 /* local includes */
-#include <direct_rule.h>
+#include "direct_rule.h"
 
 namespace Net {
 
diff --git a/repos/os/src/server/nic_router/ipv4_address_prefix.cc b/repos/os/src/server/nic_router/ipv4_address_prefix.cc
index bf46d115e..7db8ba1f0 100644
--- a/repos/os/src/server/nic_router/ipv4_address_prefix.cc
+++ b/repos/os/src/server/nic_router/ipv4_address_prefix.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <ipv4_address_prefix.h>
+#include "ipv4_address_prefix.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/server/nic_router/ipv4_config.cc b/repos/os/src/server/nic_router/ipv4_config.cc
index b923ab796..13e41662c 100644
--- a/repos/os/src/server/nic_router/ipv4_config.cc
+++ b/repos/os/src/server/nic_router/ipv4_config.cc
@@ -15,7 +15,7 @@
 #include <base/log.h>
 
 /* local includes */
-#include <ipv4_config.h>
+#include "ipv4_config.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/server/nic_router/ipv4_config.h b/repos/os/src/server/nic_router/ipv4_config.h
index 3ccfbf8c4..2634e4efd 100644
--- a/repos/os/src/server/nic_router/ipv4_config.h
+++ b/repos/os/src/server/nic_router/ipv4_config.h
@@ -15,7 +15,7 @@
 #define _IPV4_CONFIG_H_
 
 /* local includes */
-#include <ipv4_address_prefix.h>
+#include "ipv4_address_prefix.h"
 
 namespace Net { class Ipv4_config; }
 
diff --git a/repos/os/src/server/nic_router/l3_protocol.cc b/repos/os/src/server/nic_router/l3_protocol.cc
index 4abc94f88..cfd2e6752 100644
--- a/repos/os/src/server/nic_router/l3_protocol.cc
+++ b/repos/os/src/server/nic_router/l3_protocol.cc
@@ -12,8 +12,8 @@
  */
 
 /* local includes */
-#include <l3_protocol.h>
-#include <interface.h>
+#include "l3_protocol.h"
+#include "interface.h"
 
 /* Genode includes */
 #include <util/string.h>
diff --git a/repos/os/src/server/nic_router/link.cc b/repos/os/src/server/nic_router/link.cc
index 33636d554..b46bc2595 100644
--- a/repos/os/src/server/nic_router/link.cc
+++ b/repos/os/src/server/nic_router/link.cc
@@ -15,8 +15,8 @@
 #include <net/tcp.h>
 
 /* local includes */
-#include <link.h>
-#include <configuration.h>
+#include "link.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/link.h b/repos/os/src/server/nic_router/link.h
index f46d3509c..3130bed59 100644
--- a/repos/os/src/server/nic_router/link.h
+++ b/repos/os/src/server/nic_router/link.h
@@ -38,10 +38,10 @@
 #include <net/port.h>
 
 /* local includes */
-#include <list.h>
-#include <reference.h>
-#include <pointer.h>
-#include <l3_protocol.h>
+#include "list.h"
+#include "reference.h"
+#include "pointer.h"
+#include "l3_protocol.h"
 
 namespace Net {
 
diff --git a/repos/os/src/server/nic_router/main.cc b/repos/os/src/server/nic_router/main.cc
index 7d902d88e..95885acb4 100644
--- a/repos/os/src/server/nic_router/main.cc
+++ b/repos/os/src/server/nic_router/main.cc
@@ -19,9 +19,9 @@
 #include <timer_session/connection.h>
 
 /* local includes */
-#include <component.h>
-#include <uplink.h>
-#include <configuration.h>
+#include "component.h"
+#include "uplink.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/nat_rule.cc b/repos/os/src/server/nic_router/nat_rule.cc
index cc61862b5..9531fcada 100644
--- a/repos/os/src/server/nic_router/nat_rule.cc
+++ b/repos/os/src/server/nic_router/nat_rule.cc
@@ -18,9 +18,9 @@
 #include <net/udp.h>
 
 /* local includes */
-#include <nat_rule.h>
-#include <domain.h>
-#include <interface.h>
+#include "nat_rule.h"
+#include "domain.h"
+#include "interface.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/nat_rule.h b/repos/os/src/server/nic_router/nat_rule.h
index ec26201f5..080a57c0f 100644
--- a/repos/os/src/server/nic_router/nat_rule.h
+++ b/repos/os/src/server/nic_router/nat_rule.h
@@ -15,9 +15,9 @@
 #define _NAT_RULE_H_
 
 /* local includes */
-#include <port_allocator.h>
-#include <l3_protocol.h>
-#include <avl_tree.h>
+#include "port_allocator.h"
+#include "l3_protocol.h"
+#include "avl_tree.h"
 
 /* Genode includes */
 #include <util/avl_string.h>
diff --git a/repos/os/src/server/nic_router/permit_rule.cc b/repos/os/src/server/nic_router/permit_rule.cc
index 4bfc88779..2b78fbbc9 100644
--- a/repos/os/src/server/nic_router/permit_rule.cc
+++ b/repos/os/src/server/nic_router/permit_rule.cc
@@ -15,8 +15,8 @@
 #include <base/log.h>
 
 /* local includes */
-#include <permit_rule.h>
-#include <domain.h>
+#include "permit_rule.h"
+#include "domain.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/permit_rule.h b/repos/os/src/server/nic_router/permit_rule.h
index e75f41c91..f240aa22d 100644
--- a/repos/os/src/server/nic_router/permit_rule.h
+++ b/repos/os/src/server/nic_router/permit_rule.h
@@ -15,7 +15,7 @@
 #define _PERMIT_RULE_H_
 
 /* local includes */
-#include <avl_tree.h>
+#include "avl_tree.h"
 
 /* Genode includes */
 #include <util/avl_tree.h>
diff --git a/repos/os/src/server/nic_router/port_allocator.cc b/repos/os/src/server/nic_router/port_allocator.cc
index fe1f1f625..616b4d763 100644
--- a/repos/os/src/server/nic_router/port_allocator.cc
+++ b/repos/os/src/server/nic_router/port_allocator.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <port_allocator.h>
+#include "port_allocator.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/report.cc b/repos/os/src/server/nic_router/report.cc
index 236d5ade6..0180e7d84 100644
--- a/repos/os/src/server/nic_router/report.cc
+++ b/repos/os/src/server/nic_router/report.cc
@@ -12,9 +12,9 @@
  */
 
 /* local includes */
-#include <report.h>
-#include <xml_node.h>
-#include <domain.h>
+#include "report.h"
+#include "xml_node.h"
+#include "domain.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/transport_rule.cc b/repos/os/src/server/nic_router/transport_rule.cc
index 3baf4ea86..c260caa1d 100644
--- a/repos/os/src/server/nic_router/transport_rule.cc
+++ b/repos/os/src/server/nic_router/transport_rule.cc
@@ -17,8 +17,8 @@
 #include <base/log.h>
 
 /* local includes */
-#include <transport_rule.h>
-#include <configuration.h>
+#include "transport_rule.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/transport_rule.h b/repos/os/src/server/nic_router/transport_rule.h
index 061885628..90b8af060 100644
--- a/repos/os/src/server/nic_router/transport_rule.h
+++ b/repos/os/src/server/nic_router/transport_rule.h
@@ -15,9 +15,9 @@
 #define _TRANSPORT_RULE_H_
 
 /* local includes */
-#include <direct_rule.h>
-#include <permit_rule.h>
-#include <pointer.h>
+#include "direct_rule.h"
+#include "permit_rule.h"
+#include "pointer.h"
 
 namespace Genode { class Allocator; }
 
diff --git a/repos/os/src/server/nic_router/uplink.cc b/repos/os/src/server/nic_router/uplink.cc
index 4d2ede07c..667437a22 100644
--- a/repos/os/src/server/nic_router/uplink.cc
+++ b/repos/os/src/server/nic_router/uplink.cc
@@ -15,8 +15,8 @@
 #include <base/env.h>
 
 /* local includes */
-#include <uplink.h>
-#include <configuration.h>
+#include "uplink.h"
+#include "configuration.h"
 
 using namespace Net;
 using namespace Genode;
diff --git a/repos/os/src/server/nic_router/uplink.h b/repos/os/src/server/nic_router/uplink.h
index 0faeaf189..9186eb93b 100644
--- a/repos/os/src/server/nic_router/uplink.h
+++ b/repos/os/src/server/nic_router/uplink.h
@@ -19,9 +19,9 @@
 #include <nic/packet_allocator.h>
 
 /* local includes */
-#include <avl_string_tree.h>
-#include <interface.h>
-#include <ipv4_address_prefix.h>
+#include "avl_string_tree.h"
+#include "interface.h"
+#include "ipv4_address_prefix.h"
 
 namespace Net {
 
diff --git a/repos/os/src/server/nic_router/xml_node.cc b/repos/os/src/server/nic_router/xml_node.cc
index b2dbee155..604d18cea 100644
--- a/repos/os/src/server/nic_router/xml_node.cc
+++ b/repos/os/src/server/nic_router/xml_node.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <xml_node.h>
+#include "xml_node.h"
 
 using namespace Genode;
 
diff --git a/repos/os/src/test/cpu_bench/main.cc b/repos/os/src/test/cpu_bench/main.cc
index 05679330d..d1926ad02 100644
--- a/repos/os/src/test/cpu_bench/main.cc
+++ b/repos/os/src/test/cpu_bench/main.cc
@@ -16,7 +16,7 @@
 #include <base/log.h>
 #include <timer_session/connection.h>
 
-#include <bogomips.h>
+#include "bogomips.h"
 
 void Component::construct(Genode::Env &env)
 {
diff --git a/repos/os/src/test/net_flood/dhcp_client.cc b/repos/os/src/test/net_flood/dhcp_client.cc
index b9daa5cf9..b91368e45 100644
--- a/repos/os/src/test/net_flood/dhcp_client.cc
+++ b/repos/os/src/test/net_flood/dhcp_client.cc
@@ -12,9 +12,9 @@
  */
 
 /* local includes */
-#include <nic.h>
-#include <dhcp_client.h>
-#include <ipv4_config.h>
+#include "nic.h"
+#include "dhcp_client.h"
+#include "ipv4_config.h"
 
 /* Genode includes */
 #include <util/xml_node.h>
diff --git a/repos/os/src/test/net_flood/ipv4_address_prefix.cc b/repos/os/src/test/net_flood/ipv4_address_prefix.cc
index bf46d115e..7db8ba1f0 100644
--- a/repos/os/src/test/net_flood/ipv4_address_prefix.cc
+++ b/repos/os/src/test/net_flood/ipv4_address_prefix.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <ipv4_address_prefix.h>
+#include "ipv4_address_prefix.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/test/net_flood/ipv4_config.cc b/repos/os/src/test/net_flood/ipv4_config.cc
index 5aea166f5..0463bc4ca 100644
--- a/repos/os/src/test/net_flood/ipv4_config.cc
+++ b/repos/os/src/test/net_flood/ipv4_config.cc
@@ -15,7 +15,7 @@
 #include <base/log.h>
 
 /* local includes */
-#include <ipv4_config.h>
+#include "ipv4_config.h"
 
 using namespace Genode;
 using namespace Net;
diff --git a/repos/os/src/test/net_flood/ipv4_config.h b/repos/os/src/test/net_flood/ipv4_config.h
index 6b3f01107..2f945abd4 100644
--- a/repos/os/src/test/net_flood/ipv4_config.h
+++ b/repos/os/src/test/net_flood/ipv4_config.h
@@ -15,7 +15,7 @@
 #define _IPV4_CONFIG_H_
 
 /* local includes */
-#include <ipv4_address_prefix.h>
+#include "ipv4_address_prefix.h"
 
 namespace Net { class Ipv4_config; }
 
diff --git a/repos/os/src/test/net_flood/main.cc b/repos/os/src/test/net_flood/main.cc
index 6f14012e5..e3c8207b5 100644
--- a/repos/os/src/test/net_flood/main.cc
+++ b/repos/os/src/test/net_flood/main.cc
@@ -12,10 +12,10 @@
  */
 
 /* local includes */
-#include <nic.h>
-#include <ipv4_config.h>
-#include <dhcp_client.h>
-#include <protocol.h>
+#include "nic.h"
+#include "ipv4_config.h"
+#include "dhcp_client.h"
+#include "protocol.h"
 
 /* Genode includes */
 #include <net/ipv4.h>
diff --git a/repos/os/src/test/net_flood/nic.cc b/repos/os/src/test/net_flood/nic.cc
index dd835d63e..cd4dd18d1 100644
--- a/repos/os/src/test/net_flood/nic.cc
+++ b/repos/os/src/test/net_flood/nic.cc
@@ -12,7 +12,7 @@
  */
 
 /* local includes */
-#include <nic.h>
+#include "nic.h"
 
 using namespace Net;
 using namespace Genode;