commit - e567fc48e2fc05d29913db294a52b77bfa392c87
commit + e7391431b994ccdc312dac62dae0284f220d92d1
blob - a3203acf60445324405b8e1a14b3244be123710f
blob + d288a65f184ba19f1c32db03d1fc737834118187
--- gotwebd/config.c
+++ gotwebd/config.c
@@ -68,7 +68,7 @@ int
 config_getcfg(struct gotwebd *env, struct imsg *imsg)
 {
 	/* nothing to do but tell gotwebd configuration is done */
-	if (sockets_compose_main(env, IMSG_CFG_DONE, NULL, 0) == -1)
+	if (sockets_compose_main(env, GOTWEBD_IMSG_CFG_DONE, NULL, 0) == -1)
 		fatal("sockets_compose_main IMSG_CFG_DONE");
 	return 0;
 }
@@ -103,7 +103,7 @@ config_setsock(struct gotwebd *env, struct socket *soc
 	if (sockets_privinit(env, sock, uid, gid) == -1)
 		return -1;
 
-	if (main_compose_sockets(env, IMSG_CFG_SOCK, sock->fd,
+	if (main_compose_sockets(env, GOTWEBD_IMSG_CFG_SOCK, sock->fd,
 	    &sock->conf, sizeof(sock->conf)) == -1)
 		fatal("main_compose_sockets IMSG_CFG_SOCK");
 
blob - ff1fed836b983907bed2d75f26d0d48b47d78a6b
blob + b58f1b61836672541d663f0d88b9f21f67fbd42f
--- gotwebd/gotwebd.c
+++ gotwebd/gotwebd.c
@@ -234,7 +234,7 @@ gotwebd_dispatch_gotweb(int fd, short event, void *arg
 			break;
 
 		switch (imsg.hdr.type) {
-		case IMSG_CFG_DONE:
+		case GOTWEBD_IMSG_CFG_DONE:
 			gotwebd_configure_done(env);
 			break;
 		default:
blob - 6c7435f6b903ad0c6872bf40b84319bd3a7c82aa
blob + 403da65af4f60856666ec4c98989e6950a20657e
--- gotwebd/sockets.c
+++ gotwebd/sockets.c
@@ -454,10 +454,10 @@ sockets_dispatch_main(int fd, short event, void *arg)
 			break;
 
 		switch (imsg.hdr.type) {
-		case IMSG_CFG_SRV:
+		case GOTWEBD_IMSG_CFG_SRV:
 			config_getserver(env, &imsg);
 			break;
-		case IMSG_CFG_SOCK:
+		case GOTWEBD_IMSG_CFG_SOCK:
 			config_getsock(env, &imsg);
 			break;
 		case GOTWEBD_IMSG_CFG_DONE: