diff --git a/include/s_newconf.h b/include/s_newconf.h
index 55b3ec36..b23c6364 100644
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -131,7 +131,7 @@ struct oper_conf
 extern struct remote_conf *make_remote_conf(void);
 extern void free_remote_conf(struct remote_conf *);
 
-extern int find_shared_conf(const char *username, const char *host,
+extern bool find_shared_conf(const char *username, const char *host,
 			const char *server, int flags);
 extern void propagate_generic(struct Client *source_p, const char *command,
 		const char *target, int cap, const char *format, ...);
diff --git a/ircd/restart.c b/ircd/restart.c
index 499b291d..1a63b572 100644
--- a/ircd/restart.c
+++ b/ircd/restart.c
@@ -37,11 +37,11 @@ extern char **myargv;
 void
 restart(const char *mesg)
 {
-	static int was_here = NO;	/* redundant due to restarting flag below */
+	static bool was_here = false;	/* redundant due to restarting flag below */
 
 	if(was_here)
 		abort();
-	was_here = YES;
+	was_here = true;
 
 	ilog(L_MAIN, "Restarting Server because: %s", mesg);
 
diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c
index fc3fe43d..b7a9768c 100644
--- a/ircd/s_newconf.c
+++ b/ircd/s_newconf.c
@@ -174,7 +174,7 @@ free_remote_conf(struct remote_conf *remote_p)
 	rb_free(remote_p);
 }
 
-int
+bool
 find_shared_conf(const char *username, const char *host,
 		const char *server, int flags)
 {
@@ -190,9 +190,9 @@ find_shared_conf(const char *username, const char *host,
 		   match(shared_p->server, server))
 		{
 			if(shared_p->flags & flags)
-				return YES;
+				return true;
 			else
-				return NO;
+				return false;
 		}
 	}