diff --git a/cmd-new-session.c b/cmd-new-session.c
index 30e6892a..ebe41533 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -1,4 +1,4 @@
-/* $Id: cmd-new-session.c,v 1.61 2009-08-24 16:31:26 tcunha Exp $ */
+/* $Id: cmd-new-session.c,v 1.62 2009-08-26 09:10:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -24,6 +24,18 @@
 
 #include "tmux.h"
 
+#ifdef HAVE_TTYDEFAULTS_H
+#ifdef HAVE_TTYDEFCHARS
+#define TTYDEFCHARS
+#endif
+#include <sys/ttydefaults.h>
+#else
+#ifndef OXTABS
+#define OXTABS 0
+#endif
+#include "compat/ttydefaults.h"
+#endif
+
 /*
  * Create a new session and attach to the current terminal unless -d is given.
  */
diff --git a/compat.h b/compat.h
index a630d962..1b0b7ab6 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/* $Id: compat.h,v 1.14 2009-08-20 12:49:18 nicm Exp $ */
+/* $Id: compat.h,v 1.15 2009-08-26 09:10:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -87,18 +87,6 @@ typedef uint64_t u_int64_t;
 #include "compat/vis.h"
 #endif
 
-#ifdef HAVE_TTYDEFAULTS_H
-#ifdef HAVE_TTYDEFCHARS
-#define TTYDEFCHARS
-#endif
-#include <sys/ttydefaults.h>
-#else
-#ifndef OXTABS
-#define OXTABS 0
-#endif
-#include "compat/ttydefaults.h"
-#endif
-
 #ifndef HAVE_IMSG
 #include "compat/imsg.h"
 #endif