diff --git a/common/include/villas/boxes.hpp b/common/include/villas/boxes.hpp
index 28b12adf0..b38f0cb29 100644
--- a/common/include/villas/boxes.hpp
+++ b/common/include/villas/boxes.hpp
@@ -23,9 +23,7 @@
 
 #pragma once
 
-/* Alternate character set
- *
- * The suffixed of the BOX_ macro a constructed by
+/* The suffixed of the BOX_ macro a constructed by
  * combining the following letters in the written order:
  *   - U for a line facing upwards
  *   - D for a line facing downwards
@@ -35,13 +33,36 @@
  * E.g. a cross can be constructed by combining all line fragments:
  *    BOX_UDLR
  */
-#define BOX(chr)	"\e(0" chr "\e(B"
-#define BOX_LR		BOX("\x71") /**< Boxdrawing: ─ */
-#define BOX_UD		BOX("\x78") /**< Boxdrawing: │ */
-#define BOX_UDR		BOX("\x74") /**< Boxdrawing: ├ */
-#define BOX_UDLR	BOX("\x6E") /**< Boxdrawing: ┼ */
-#define BOX_UDL		BOX("\x75") /**< Boxdrawing: ┤ */
-#define BOX_ULR		BOX("\x76") /**< Boxdrawing: ┴ */
-#define BOX_UL		BOX("\x6A") /**< Boxdrawing: ┘ */
-#define BOX_DLR		BOX("\x77") /**< Boxdrawing: ┘ */
-#define BOX_DL		BOX("\x6B") /**< Boxdrawing: ┘ */
+#if 0 /* Alternate character set */
+  #define BOX(chr)	"\e(0" chr "\e(B"
+  #define BOX_LR	BOX("\x71") /**< Boxdrawing: ─ */
+  #define BOX_UD	BOX("\x78") /**< Boxdrawing: │ */
+  #define BOX_UDR	BOX("\x74") /**< Boxdrawing: ├ */
+  #define BOX_UDLR	BOX("\x6E") /**< Boxdrawing: ┼ */
+  #define BOX_UDL	BOX("\x75") /**< Boxdrawing: ┤ */
+  #define BOX_ULR	BOX("\x76") /**< Boxdrawing: ┴ */
+  #define BOX_UL	BOX("\x6A") /**< Boxdrawing: ┘ */
+  #define BOX_DLR	BOX("\x77") /**< Boxdrawing: ┘ */
+  #define BOX_DL	BOX("\x6B") /**< Boxdrawing: ┘ */
+#elif 1 /* UTF-8 */
+  #define BOX_LR	"─" /**< Boxdrawing: ─ */
+  #define BOX_UD	"│" /**< Boxdrawing: │ */
+  #define BOX_UDR	"├" /**< Boxdrawing: ├ */
+  #define BOX_UDLR	"┼" /**< Boxdrawing: ┼ */
+  #define BOX_UDL	"┤" /**< Boxdrawing: ┤ */
+  #define BOX_ULR	"┴" /**< Boxdrawing: ┴ */
+  #define BOX_UL	"┘" /**< Boxdrawing: ┘ */
+  #define BOX_DLR	"┬" /**< Boxdrawing: ┘ */
+  #define BOX_DL	"┐" /**< Boxdrawing: ┘ */
+  #define BOX_UR	"└" /**< Boxdrawing: └ */
+#else /* ASCII */
+  #define BOX_LR	"-" /**< Boxdrawing: ─ */
+  #define BOX_UD	"|" /**< Boxdrawing: │ */
+  #define BOX_UDR	"+" /**< Boxdrawing: ├ */
+  #define BOX_UDLR	"+" /**< Boxdrawing: ┼ */
+  #define BOX_UDL	"+" /**< Boxdrawing: ┤ */
+  #define BOX_ULR	"+" /**< Boxdrawing: ┴ */
+  #define BOX_UL	"+" /**< Boxdrawing: ┘ */
+  #define BOX_DLR	"+" /**< Boxdrawing: ┘ */
+  #define BOX_DL	"+" /**< Boxdrawing: ┘ */
+#endif
\ No newline at end of file
diff --git a/common/include/villas/utils.h b/common/include/villas/utils.h
index 1267a8ff9..a5119015c 100644
--- a/common/include/villas/utils.h
+++ b/common/include/villas/utils.h
@@ -57,51 +57,6 @@ extern "C" {
 #define CLR_WHT(str)	CLR(37, str) /**< Print str in white */
 #define CLR_BLD(str)	CLR( 1, str) /**< Print str in bold */
 
-
-/* The suffixed of the BOX_ macro a constructed by
- * combining the following letters in the written order:
- *   - U for a line facing upwards
- *   - D for a line facing downwards
- *   - L for a line facing leftwards
- *   - R for a line facing rightwards
- *
- * E.g. a cross can be constructed by combining all line fragments:
- *    BOX_UDLR
- */
-#if 0 /* Alternate character set */
-  #define BOX(chr)	"\e(0" chr "\e(B"
-  #define BOX_LR	BOX("\x71") /**< Boxdrawing: ─ */
-  #define BOX_UD	BOX("\x78") /**< Boxdrawing: │ */
-  #define BOX_UDR	BOX("\x74") /**< Boxdrawing: ├ */
-  #define BOX_UDLR	BOX("\x6E") /**< Boxdrawing: ┼ */
-  #define BOX_UDL	BOX("\x75") /**< Boxdrawing: ┤ */
-  #define BOX_ULR	BOX("\x76") /**< Boxdrawing: ┴ */
-  #define BOX_UL	BOX("\x6A") /**< Boxdrawing: ┘ */
-  #define BOX_DLR	BOX("\x77") /**< Boxdrawing: ┘ */
-  #define BOX_DL	BOX("\x6B") /**< Boxdrawing: ┘ */
-#elif 1 /* UTF-8 */
-  #define BOX_LR	"─" /**< Boxdrawing: ─ */
-  #define BOX_UD	"│" /**< Boxdrawing: │ */
-  #define BOX_UDR	"├" /**< Boxdrawing: ├ */
-  #define BOX_UDLR	"┼" /**< Boxdrawing: ┼ */
-  #define BOX_UDL	"┤" /**< Boxdrawing: ┤ */
-  #define BOX_ULR	"┴" /**< Boxdrawing: ┴ */
-  #define BOX_UL	"┘" /**< Boxdrawing: ┘ */
-  #define BOX_DLR	"┬" /**< Boxdrawing: ┘ */
-  #define BOX_DL	"┐" /**< Boxdrawing: ┘ */
-  #define BOX_UR	"└" /**< Boxdrawing: └ */
-#else /* ASCII */
-  #define BOX_LR	"-" /**< Boxdrawing: ─ */
-  #define BOX_UD	"|" /**< Boxdrawing: │ */
-  #define BOX_UDR	"+" /**< Boxdrawing: ├ */
-  #define BOX_UDLR	"+" /**< Boxdrawing: ┼ */
-  #define BOX_UDL	"+" /**< Boxdrawing: ┤ */
-  #define BOX_ULR	"+" /**< Boxdrawing: ┴ */
-  #define BOX_UL	"+" /**< Boxdrawing: ┘ */
-  #define BOX_DLR	"+" /**< Boxdrawing: ┘ */
-  #define BOX_DL	"+" /**< Boxdrawing: ┘ */
-#endif
-
 /* CPP stringification */
 #define XSTR(x)		STR(x)
 #define  STR(x)		#x
diff --git a/common/lib/table.cpp b/common/lib/table.cpp
index 73df285c2..714713253 100644
--- a/common/lib/table.cpp
+++ b/common/lib/table.cpp
@@ -25,6 +25,7 @@
 
 #include <villas/utils.h>
 #include <villas/table.hpp>
+#include <villas/boxes.hpp>
 #include <villas/log.h>
 
 int Table::resize(int w)