diff --git a/src/server/fb_upscale/component.cc b/src/server/fb_upscale/component.cc
index c212c0c..25ddf6b 100644
--- a/src/server/fb_upscale/component.cc
+++ b/src/server/fb_upscale/component.cc
@@ -17,6 +17,7 @@
 #include <base/attached_dataspace.h>
 #include <root/component.h>
 #include <base/component.h>
+#include <base/heap.h>
 #include <base/log.h>
 
 
@@ -220,4 +221,4 @@ void Component::construct(Genode::Env &env)
 	static Genode::Sliced_heap sliced_heap(env.ram(), env.rm());
 
 	static Fb_scaler::Root_component root(env, sliced_heap);
-}
\ No newline at end of file
+}
diff --git a/src/server/input_remap/component.cc b/src/server/input_remap/component.cc
index 5e49c0c..d7890a8 100644
--- a/src/server/input_remap/component.cc
+++ b/src/server/input_remap/component.cc
@@ -92,7 +92,7 @@ struct Input::Remap
 			if ((from == "") || (to == "")) {
 				char tmp[128];
 				strncpy(tmp, node.addr(), min(sizeof(tmp), node.size()+1));
-				error("ignoring mapping '", tmp, "'");
+				error("ignoring mapping '", Cstring(tmp), "'");
 				return;
 			}
 
diff --git a/src/server/log_tee/component.cc b/src/server/log_tee/component.cc
index 970bf09..559da5f 100644
--- a/src/server/log_tee/component.cc
+++ b/src/server/log_tee/component.cc
@@ -16,6 +16,7 @@
 #include <root/component.h>
 #include <base/component.h>
 #include <base/session_label.h>
+#include <base/heap.h>
 #include <base/log.h>
 #include <base/snprintf.h>
 #include <util/list.h>
@@ -106,4 +107,4 @@ void Component::construct(Genode::Env &env)
 	static Log_tee::Root_component root(env, heap);
 
 	env.parent().announce(env.ep().manage(root));
-}
\ No newline at end of file
+}
diff --git a/src/server/synergy_input/main.cc b/src/server/synergy_input/main.cc
index d0b7402..cd1c195 100644
--- a/src/server/synergy_input/main.cc
+++ b/src/server/synergy_input/main.cc
@@ -112,7 +112,7 @@ static uSynergyBool connect(uSynergyCookie cookie)
 	sockaddr.sin_family = AF_INET;
 	sockaddr.sin_port   = htons(port);
 	if (inet_pton(AF_INET, addr, &sockaddr.sin_addr.s_addr) == 0) {
-		Genode::error("bad IPv4 address ", addr, " for server");
+		Genode::error("bad IPv4 address ", Cstring(addr), " for server");
 		return USYNERGY_FALSE;
 	}