1 files changed, 12 insertions, 6 deletions
diff --git a/tmux.h b/tmux.h
index 99c42aa4..8684c6db 100644
--- a/tmux.h
+++ b/tmux.h
@@ -22,18 +22,20 @@
 #define PROTOCOL_VERSION 8
 
 #include <sys/time.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
+#include <sys/uio.h>
 
-#include <bitstring.h>
 #include <event.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <termios.h>
 #include <wchar.h>
 
+#ifdef HAVE_UTEMPTER
+#include <utempter.h>
+#endif
+
+#include "compat.h"
 #include "xmalloc.h"
 
 extern char   **environ;
@@ -55,7 +57,9 @@ struct tmuxpeer;
 struct tmuxproc;
 
 /* Default global configuration file. */
+#ifndef TMUX_CONF
 #define TMUX_CONF "/etc/tmux.conf"
+#endif
 
 /*
  * Minimum layout cell size, NOT including separator line. The scroll region
@@ -2331,8 +2335,10 @@ char		*utf8_rtrimcstr(const char *, u_int);
 char		*utf8_trimcstr(const char *, u_int);
 char		*utf8_padcstr(const char *, u_int);
 
-/* procname.c */
-char   *get_proc_name(int, char *);
+/* osdep-*.c */
+char		*osdep_get_name(int, char *);
+char		*osdep_get_cwd(int);
+struct event_base *osdep_event_init(void);
 
 /* log.c */
 void	log_add_level(void);