===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- src/usr.bin/tmux/tmux.h	2015/11/15 22:50:38	1.580
+++ src/usr.bin/tmux/tmux.h	2015/11/18 13:06:54	1.581
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.580 2015/11/15 22:50:38 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.581 2015/11/18 13:06:54 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -45,6 +45,8 @@
 struct tmuxpeer;
 struct tmuxproc;
 
+#include "xmalloc.h"
+
 /* Default global configuration file. */
 #define TMUX_CONF "/etc/tmux.conf"
 
@@ -67,10 +69,6 @@
 #define READ_BACKOFF 512
 #define READ_TIME 100
 
-/* Fatal errors. */
-#define fatal(msg) log_fatal("%s: %s", __func__, msg);
-#define fatalx(msg) log_fatalx("%s: %s", __func__, msg);
-
 /* Definition to shut gcc up about unused arguments. */
 #define unused __attribute__ ((unused))
 
@@ -2214,19 +2212,8 @@
 void		 log_open(const char *);
 void		 log_close(void);
 void printflike(1, 2) log_debug(const char *, ...);
-__dead void printflike(1, 2) log_fatal(const char *, ...);
-__dead void printflike(1, 2) log_fatalx(const char *, ...);
-
-/* xmalloc.c */
-char		*xstrdup(const char *);
-void		*xcalloc(size_t, size_t);
-void		*xmalloc(size_t);
-void		*xrealloc(void *, size_t);
-void		*xreallocarray(void *, size_t, size_t);
-int printflike(2, 3) xasprintf(char **, const char *, ...);
-int		 xvasprintf(char **, const char *, va_list);
-int printflike(3, 4) xsnprintf(char *, size_t, const char *, ...);
-int		 xvsnprintf(char *, size_t, const char *, va_list);
+__dead void printflike(1, 2) fatal(const char *, ...);
+__dead void printflike(1, 2) fatalx(const char *, ...);
 
 /* style.c */
 int		 style_parse(const struct grid_cell *,