diff --git a/repos/base/src/include/base/internal/output.h b/repos/base/src/include/base/internal/output.h
index 43c51e467f..a7ececba32 100644
--- a/repos/base/src/include/base/internal/output.h
+++ b/repos/base/src/include/base/internal/output.h
@@ -17,8 +17,6 @@
 
 #include <base/output.h>
 
-using namespace Genode;
-
 
 /**
  * Convert digit to ASCII value
@@ -114,6 +112,8 @@ static inline void out_unsigned(T value, unsigned base, int pad,
 template <typename T, typename OUT_CHAR_FN>
 static inline void out_float(T value, unsigned base, unsigned length, OUT_CHAR_FN const &out_char)
 {
+	using namespace Genode;
+
 	/* set flag if value is negative */
 	int neg = value < 0 ? 1 : 0;
 
@@ -154,7 +154,7 @@ namespace Genode { template <size_t, typename> class Buffered_output; }
  * The 'WRITE_FN' functor is called with a null-terminated 'char const *'
  * as argument.
  */
-template <size_t BUF_SIZE, typename BACKEND_WRITE_FN>
+template <Genode::size_t BUF_SIZE, typename BACKEND_WRITE_FN>
 class Genode::Buffered_output : public Output
 {
 	private:
diff --git a/repos/base/src/lib/base/raw_output.cc b/repos/base/src/lib/base/raw_output.cc
index 915186dc3d..56479a1253 100644
--- a/repos/base/src/lib/base/raw_output.cc
+++ b/repos/base/src/lib/base/raw_output.cc
@@ -19,10 +19,8 @@
 #include <base/internal/output.h>
 #include <base/internal/raw_write_string.h>
 
-using namespace Genode;
 
-
-Output &Raw::_output()
+Genode::Output &Genode::Raw::_output()
 {
 	struct Write_fn { void operator () (char const *s) { raw_write_string(s); } };