diff --git a/src/server/simple-cache.c b/src/server/simple-cache.c
index 6b552cd86d611c64453c52df1a847c734c0b1798..dfd93897f3559afcadfa57986acf736088941f3d 100644
--- a/src/server/simple-cache.c
+++ b/src/server/simple-cache.c
@@ -30,12 +30,12 @@
 
 #include <kom-errno.h>
 #include <kom-types.h>
-#include "s-collat-tables.h"
+#include "s-collat-tabs.h"
 #include "smalloc.h"
+#include <parser.h>
 #include "cache.h"
 #include <debug.h>
 #include "lyskomd.h"
-#include "parser.h"
 #include "ram-parse.h"
 #include "log.h"
 #include "com.h"
@@ -1002,7 +1002,7 @@ build_matching_info(void)
 	    && ! s_empty ( small_conf_arr[ i ]->name ) )
 	{
 	    match->name = small_conf_arr[ i ]->name;
-	    match->tokens = tokenize(match->name, s_fcrea_str(" \t"));
+	    match->tokens = tokenize(match->name, s_fcrea_str(WHITESPACE));
 	    match->priority = 7;
 	    *conf = i;
 	    ++match;
@@ -1030,7 +1030,7 @@ cached_lookup_name(const String name,
     int i;
     
     tmp = parse(name, match_table, FALSE, FALSE,
-		s_fcrea_str(" \t"), DEFAULT_COLLAT_TAB);
+		s_fcrea_str(WHITESPACE), DEFAULT_COLLAT_TAB);
 
     if ( tmp.no_of_matches == -1 )
 	return FAILURE;