diff --git a/src/server/conference.c b/src/server/conference.c
index 154c182217628fc96e8f09bdc8149aa8d43b93c1..e517e2d73d50bb367af409e612a79fb94fdbecd7 100644
--- a/src/server/conference.c
+++ b/src/server/conference.c
@@ -20,7 +20,7 @@
 #include "connections.h"
 #include "send-async.h"
 #include <debug.h>
-#include "parser.h"
+#include <parser.h>
 #include "internal-connections.h"
 
 /* From ram-cache.h. This will go away when we use regexp-matching. This is
@@ -134,7 +134,8 @@ unique_name( const String name, Conf_no conf_no )
     int n;
         
     parse_info = parse(name, match_table, FALSE, TRUE,
-		       s_fcrea_str(" \t"), DEFAULT_COLLAT_TAB);
+		       s_fcrea_str(WHITESPACE),
+		       DEFAULT_COLLAT_TAB);
 
     if ( parse_info.no_of_matches == 0 ) /* Doesn't match any name. */
     {
@@ -158,7 +159,7 @@ unique_name( const String name, Conf_no conf_no )
     
     /* The name matches some conference. Check if they are equal. */
 
-    name_token = tokenize(name, s_fcrea_str(" \t"));
+    name_token = tokenize(name, s_fcrea_str(WHITESPACE));
 
     exact_match_found = FALSE;