diff --git a/src/initctl.c b/src/initctl.c
index 6d94f0bc..ce24cbea 100644
--- a/src/initctl.c
+++ b/src/initctl.c
@@ -37,7 +37,7 @@
 #include <sys/un.h>
 #include <lite/lite.h>
 
-#define SCREEN_WIDTH 80		/* Calculate screen width as well, later */
+#define SCREEN_WIDTH screen_width()
 #include <lite/conio.h>
 
 #include "finit.h"
diff --git a/src/serv.c b/src/serv.c
index 82bb4916..46a2ba96 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -28,9 +28,9 @@
 #include <stdio.h>
 #include <lite/lite.h>
 
-#define SCREEN_WIDTH 80		/* Calculate screen width as well, later */
+#define SCREEN_WIDTH screen_width()
 #include <lite/conio.h>
-
+#include "util.h"
 
 static const char *cwd;
 static const char *available = FINIT_RCSD "/available";