--- libaitio/inc/global.h	2011/04/19 22:32:16	1.5.2.2
+++ libaitio/inc/global.h	2011/12/13 02:23:07	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: global.h,v 1.5.2.2 2011/04/19 22:32:16 misho Exp $
+* $Id: global.h,v 1.9 2011/12/13 02:23:07 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -27,11 +27,11 @@ are met:
    must display the following acknowledgement:
 This product includes software developed by Michael Pounov <misho@elwix.org>
 ELWIX - Embedded LightWeight unIX and its contributors.
-4. Neither the name of the University nor the names of its contributors
+4. Neither the name of AITNET nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
@@ -47,8 +47,6 @@ SUCH DAMAGE.
 #define __GLOBAL_H
 
 
-#define COMPAT_43TTY
-
 #include "config.h"
 
 #include <stdio.h>
@@ -60,24 +58,36 @@ 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 <poll.h>
+#include <netdb.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>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#ifndef __OpenBSD__
+#include <sys/endian.h>
+#include <libutil.h>
+#else
+#include <util.h>
+#endif
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #ifdef AIO_OPS
 #include <aio.h>
 #endif
 
 
+#include "atree.h"
+#include "apatricia.h"
 #include "aitio.h"
 #include "defs.h"