--- libaitio/inc/global.h	2011/04/20 22:56:32	1.6
+++ libaitio/inc/global.h	2011/10/31 13:53:51	1.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: global.h,v 1.6 2011/04/20 22:56:32 misho Exp $
+* $Id: global.h,v 1.8 2011/10/31 13:53:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,8 +47,6 @@ SUCH DAMAGE.
 #define __GLOBAL_H
 
 
-#define COMPAT_43TTY
-
 #include "config.h"
 
 #include <stdio.h>
@@ -60,24 +58,30 @@ SUCH DAMAGE.
 #include <regex.h>
 #include <termios.h>
 #include <glob.h>
+#include <grp.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <assert.h>
+#include <paths.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/event.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
-#include <sys/tty.h>
-#include <sys/ioctl_compat.h>
-#include <readline/readline.h>
-#include <readline/history.h>
+#ifndef __OpenBSD__
+#include <sys/endian.h>
+#include <libutil.h>
+#else
+#include <util.h>
+#endif
 
 #ifdef AIO_OPS
 #include <aio.h>
 #endif
 
 
+#include "atree.h"
+#include "apatricia.h"
 #include "aitio.h"
 #include "defs.h"