diff --git a/common/include/villas/task.hpp b/common/include/villas/task.hpp
index 922c8b599..4883bd5ea 100644
--- a/common/include/villas/task.hpp
+++ b/common/include/villas/task.hpp
@@ -12,6 +12,7 @@
 
 #include <ctime>
 
+namespace villas {
 // We can choose between two periodic task implementations
 //#define PERIODIC_TASK_IMPL NANOSLEEP
 #define TIMERFD 1
@@ -70,3 +71,5 @@ struct Task {
   // Note: currently not supported on all platforms.
   int getFD() const;
 };
+
+} // namespace villas
diff --git a/common/tests/unit/task.cpp b/common/tests/unit/task.cpp
index 13f53099c..daaeea21d 100644
--- a/common/tests/unit/task.cpp
+++ b/common/tests/unit/task.cpp
@@ -12,6 +12,8 @@
 #include <villas/task.hpp>
 #include <villas/timing.hpp>
 
+using namespace villas;
+
 // cppcheck-suppress unknownMacro
 TestSuite(task, .description = "Periodic timer tasks");