6 files changed, 20 insertions, 13 deletions
diff --git a/usr.sbin/smtpd/log.h b/usr.sbin/smtpd/log.h
index 8120653cc9e..22bb4164394 100644
--- a/usr.sbin/smtpd/log.h
+++ b/usr.sbin/smtpd/log.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: log.h,v 1.7 2017/01/09 14:49:22 reyk Exp $	*/
+/*	$OpenBSD: log.h,v 1.8 2018/04/26 20:57:59 eric Exp $	*/
 
 /*
- * Copyright (c) 2010 Gilles Chehade <gilles@poolp.org>
+ * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -16,9 +16,12 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <syslog.h>
+#ifndef LOG_H
+#define LOG_H
+
+#include <stdarg.h>
+#include <sys/cdefs.h>
 
-/* log.c */
 void	log_init(int, int);
 void	log_procinit(const char *);
 void	log_setverbose(int);
@@ -40,7 +43,4 @@ __dead void fatal(const char *, ...)
 __dead void fatalx(const char *, ...)
 	    __attribute__((__format__ (printf, 1, 2)));
 
-/* util.c */
-void	log_trace_verbose(int);
-void	log_trace(int, const char *, ...)
-	    __attribute__((format (printf, 2, 3)));
+#endif /* LOG_H */
diff --git a/usr.sbin/smtpd/makemap.c b/usr.sbin/smtpd/makemap.c
index 8f32e766fd2..1cc2f7a865d 100644
--- a/usr.sbin/smtpd/makemap.c
+++ b/usr.sbin/smtpd/makemap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: makemap.c,v 1.67 2017/07/27 18:48:30 sunil Exp $	*/
+/*	$OpenBSD: makemap.c,v 1.68 2018/04/26 20:57:59 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <unistd.h>
 #include <limits.h>
 #include <util.h>
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index fff07abb457..f5daba594cc 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.158 2018/03/14 22:22:30 gilles Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.159 2018/04/26 20:57:59 eric Exp $	*/
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -39,6 +39,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <time.h>
 #include <unistd.h>
 #include <vis.h>
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 5ca0499028d..87253cef07f 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.292 2018/01/27 08:32:03 anton Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.293 2018/04/26 20:57:59 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -42,6 +42,7 @@
 #include <pwd.h>
 #include <signal.h>
 #include <stdio.h>
+#include <syslog.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index c44ca6a296d..81225dda62d 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.538 2018/03/14 22:25:21 gilles Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.539 2018/04/26 20:57:59 eric Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1487,6 +1487,9 @@ int getmailname(char *, size_t);
 int base64_encode(unsigned char const *, size_t, char *, size_t);
 int base64_decode(char const *, unsigned char *, size_t);
 
+void log_trace_verbose(int);
+void log_trace(int, const char *, ...)
+    __attribute__((format (printf, 2, 3)));
 
 /* waitq.c */
 int  waitq_wait(void *, void (*)(void *, void *, void *), void *);
diff --git a/usr.sbin/smtpd/util.c b/usr.sbin/smtpd/util.c
index 3700c7627c0..52b8aabf679 100644
--- a/usr.sbin/smtpd/util.c
+++ b/usr.sbin/smtpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.133 2018/01/30 12:44:55 eric Exp $	*/
+/*	$OpenBSD: util.c,v 1.134 2018/04/26 20:57:59 eric Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Markus Friedl.  All rights reserved.
@@ -45,6 +45,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <syslog.h>
 #include <time.h>
 #include <unistd.h>