diff --git a/qse/configure b/qse/configure
index 6e3cb9af..4d742bba 100755
--- a/qse/configure
+++ b/qse/configure
@@ -23058,7 +23058,7 @@ QSE_PROJECT_AUTHOR="${PACKAGE_BUGREPORT}"
 QSE_PROJECT_URL="${PACKAGE_URL}"
 
 
-ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/si/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/xli/Makefile include/qse/http/Makefile lib/Makefile lib/cmn/Makefile lib/si/Makefile lib/awk/Makefile lib/sed/Makefile lib/xli/Makefile lib/http/Makefile lib/qsecmn.pc lib/qseawk.pc lib/qsesed.pc lib/qsexli.pc lib/qsehttp.pc cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile cmd/xli/Makefile cmd/http/Makefile samples/Makefile samples/cmn/Makefile samples/si/Makefile samples/awk/Makefile samples/sed/Makefile samples/http/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/Doxyfile tools/Makefile"
+ac_config_files="$ac_config_files Makefile README include/Makefile include/qse/Makefile include/qse/cmn/Makefile include/qse/si/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/xli/Makefile include/qse/http/Makefile lib/Makefile lib/cmn/Makefile lib/si/Makefile lib/awk/Makefile lib/sed/Makefile lib/xli/Makefile lib/http/Makefile lib/qsecmn.pc lib/qsesi.pc lib/qsesed.pc lib/qseawk.pc lib/qsexli.pc lib/qsehttp.pc cmd/Makefile cmd/awk/Makefile cmd/sed/Makefile cmd/xli/Makefile cmd/http/Makefile samples/Makefile samples/cmn/Makefile samples/si/Makefile samples/awk/Makefile samples/sed/Makefile samples/http/Makefile regress/Makefile regress/awk/Makefile regress/awk/regress.sh regress/sed/Makefile regress/sed/regress.sh doc/Makefile doc/Doxyfile tools/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24248,8 +24248,9 @@ do
     "lib/xli/Makefile") CONFIG_FILES="$CONFIG_FILES lib/xli/Makefile" ;;
     "lib/http/Makefile") CONFIG_FILES="$CONFIG_FILES lib/http/Makefile" ;;
     "lib/qsecmn.pc") CONFIG_FILES="$CONFIG_FILES lib/qsecmn.pc" ;;
-    "lib/qseawk.pc") CONFIG_FILES="$CONFIG_FILES lib/qseawk.pc" ;;
+    "lib/qsesi.pc") CONFIG_FILES="$CONFIG_FILES lib/qsesi.pc" ;;
     "lib/qsesed.pc") CONFIG_FILES="$CONFIG_FILES lib/qsesed.pc" ;;
+    "lib/qseawk.pc") CONFIG_FILES="$CONFIG_FILES lib/qseawk.pc" ;;
     "lib/qsexli.pc") CONFIG_FILES="$CONFIG_FILES lib/qsexli.pc" ;;
     "lib/qsehttp.pc") CONFIG_FILES="$CONFIG_FILES lib/qsehttp.pc" ;;
     "cmd/Makefile") CONFIG_FILES="$CONFIG_FILES cmd/Makefile" ;;
diff --git a/qse/configure.ac b/qse/configure.ac
index c269f467..fa1ee3c6 100644
--- a/qse/configure.ac
+++ b/qse/configure.ac
@@ -796,8 +796,9 @@ AC_CONFIG_FILES([
 	lib/xli/Makefile 
 	lib/http/Makefile 
 	lib/qsecmn.pc
-	lib/qseawk.pc
+	lib/qsesi.pc
 	lib/qsesed.pc
+	lib/qseawk.pc
 	lib/qsexli.pc
 	lib/qsehttp.pc
 	cmd/Makefile 
diff --git a/qse/lib/Makefile.am b/qse/lib/Makefile.am
index f3b89220..22fb42c4 100644
--- a/qse/lib/Makefile.am
+++ b/qse/lib/Makefile.am
@@ -2,4 +2,4 @@ SUBDIRS = cmn si sed awk xli http
 DIST_SUBDIRS = $(SUBDIRS) 
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = qsecmn.pc qseawk.pc qsesed.pc qsexli.pc qsehttp.pc
+pkgconfig_DATA = qsecmn.pc qsesi.pc qsesed.pc qseawk.pc qsexli.pc qsehttp.pc
diff --git a/qse/lib/Makefile.in b/qse/lib/Makefile.in
index ae6f1e0e..9726fdff 100644
--- a/qse/lib/Makefile.in
+++ b/qse/lib/Makefile.in
@@ -80,9 +80,9 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/qsecmn.pc.in $(srcdir)/qseawk.pc.in \
-	$(srcdir)/qsesed.pc.in $(srcdir)/qsexli.pc.in \
-	$(srcdir)/qsehttp.pc.in
+	$(srcdir)/qsecmn.pc.in $(srcdir)/qsesi.pc.in \
+	$(srcdir)/qsesed.pc.in $(srcdir)/qseawk.pc.in \
+	$(srcdir)/qsexli.pc.in $(srcdir)/qsehttp.pc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \
 	$(top_srcdir)/m4/ax_check_sign.m4 \
@@ -96,7 +96,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/include/qse/config.h
-CONFIG_CLEAN_FILES = qsecmn.pc qseawk.pc qsesed.pc qsexli.pc \
+CONFIG_CLEAN_FILES = qsecmn.pc qsesi.pc qsesed.pc qseawk.pc qsexli.pc \
 	qsehttp.pc
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -386,7 +386,7 @@ top_srcdir = @top_srcdir@
 SUBDIRS = cmn si sed awk xli http 
 DIST_SUBDIRS = $(SUBDIRS) 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = qsecmn.pc qseawk.pc qsesed.pc qsexli.pc qsehttp.pc
+pkgconfig_DATA = qsecmn.pc qsesi.pc qsesed.pc qseawk.pc qsexli.pc qsehttp.pc
 all: all-recursive
 
 .SUFFIXES:
@@ -422,10 +422,12 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 qsecmn.pc: $(top_builddir)/config.status $(srcdir)/qsecmn.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-qseawk.pc: $(top_builddir)/config.status $(srcdir)/qseawk.pc.in
+qsesi.pc: $(top_builddir)/config.status $(srcdir)/qsesi.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 qsesed.pc: $(top_builddir)/config.status $(srcdir)/qsesed.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+qseawk.pc: $(top_builddir)/config.status $(srcdir)/qseawk.pc.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 qsexli.pc: $(top_builddir)/config.status $(srcdir)/qsexli.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 qsehttp.pc: $(top_builddir)/config.status $(srcdir)/qsehttp.pc.in
diff --git a/qse/lib/qseawk.pc.in b/qse/lib/qseawk.pc.in
index 7e0da60c..06d000f6 100644
--- a/qse/lib/qseawk.pc.in
+++ b/qse/lib/qseawk.pc.in
@@ -8,5 +8,5 @@ Description: QSEAWK Library
 Version: @VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lqseawk 
-Requires: qsecmn qsesed
+Requires: qsecmn qsesi qsesed
 #Requires.private: qsecmn qsesed
diff --git a/qse/lib/qsehttp.pc.in b/qse/lib/qsehttp.pc.in
index 430142b6..021717db 100644
--- a/qse/lib/qsehttp.pc.in
+++ b/qse/lib/qsehttp.pc.in
@@ -9,5 +9,5 @@ Version: @VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lqsehttp
 # TODO: Produce Requres: using the autoconf settings
-Requires: qsecmn 
+Requires: qsecmn qsesi
 Requires.private: openssl
diff --git a/qse/lib/qsesed.pc.in b/qse/lib/qsesed.pc.in
index e8098d36..52ffec9d 100644
--- a/qse/lib/qsesed.pc.in
+++ b/qse/lib/qsesed.pc.in
@@ -8,4 +8,4 @@ Description: QSESED Library
 Version: @VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lqsesed
-Requires: qsecmn 
+Requires: qsecmn qsesi
diff --git a/qse/lib/qsexli.pc.in b/qse/lib/qsexli.pc.in
index 9f2d0457..fd4a1ba0 100644
--- a/qse/lib/qsexli.pc.in
+++ b/qse/lib/qsexli.pc.in
@@ -8,4 +8,4 @@ Description: QSEXLI Library
 Version: @VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lqsexli
-Requires: qsecmn 
+Requires: qsecmn qsesi
diff --git a/qse/lib/si/aio-sck.c b/qse/lib/si/aio-sck.c
index 6544178c..d87bd4ca 100644
--- a/qse/lib/si/aio-sck.c
+++ b/qse/lib/si/aio-sck.c
@@ -297,44 +297,46 @@ struct sck_type_map_t
 	int extra_dev_capa;
 };
 
+#define PROTO_ETHARP  QSE_CONST_HTON16(QSE_AIO_ETHHDR_PROTO_ARP)
+
 static struct sck_type_map_t sck_type_map[] =
 {
 	/* QSE_AIO_DEV_SCK_TCP4 */
-	{ AF_INET,    SOCK_STREAM,    0,                         QSE_AIO_DEV_CAPA_STREAM  | QSE_AIO_DEV_CAPA_OUT_QUEUED },
+	{ AF_INET,    SOCK_STREAM,    0,              QSE_AIO_DEV_CAPA_STREAM  | QSE_AIO_DEV_CAPA_OUT_QUEUED },
 
 	/* QSE_AIO_DEV_SCK_TCP6 */
-	{ AF_INET6,   SOCK_STREAM,    0,                         QSE_AIO_DEV_CAPA_STREAM  | QSE_AIO_DEV_CAPA_OUT_QUEUED },
+	{ AF_INET6,   SOCK_STREAM,    0,              QSE_AIO_DEV_CAPA_STREAM  | QSE_AIO_DEV_CAPA_OUT_QUEUED },
 
 	/* QSE_AIO_DEV_SCK_UPD4 */
-	{ AF_INET,    SOCK_DGRAM,     0,                         0                                                },
+	{ AF_INET,    SOCK_DGRAM,     0,              0 },
 
 	/* QSE_AIO_DEV_SCK_UDP6 */
-	{ AF_INET6,   SOCK_DGRAM,     0,                         0                                                },
+	{ AF_INET6,   SOCK_DGRAM,     0,              0 },
 
 
 #if defined(AF_PACKET) && (QSE_SIZEOF_STRUCT_SOCKADDR_LL > 0)
 	/* QSE_AIO_DEV_SCK_ARP - Ethernet type is 2 bytes long. Protocol must be specified in the network byte order */
-	{ AF_PACKET,  SOCK_RAW,       QSE_CONST_HTON16(QSE_AIO_ETHHDR_PROTO_ARP), 0                                 },
+	{ AF_PACKET,  SOCK_RAW,       PROTO_ETHARP,   0 },
 
 	/* QSE_AIO_DEV_SCK_DGRAM */
-	{ AF_PACKET,  SOCK_DGRAM,     QSE_CONST_HTON16(QSE_AIO_ETHHDR_PROTO_ARP), 0                                 },
+	{ AF_PACKET,  SOCK_DGRAM,     PROTO_ETHARP,   0 },
 
 #elif defined(AF_LINK) && (QSE_SIZEOF_STRUCT_SOCKADDR_DL > 0)
 	/* QSE_AIO_DEV_SCK_ARP */
-	{ AF_LINK,  SOCK_RAW,         QSE_CONST_HTON16(QSE_AIO_ETHHDR_PROTO_ARP), 0                                 },
+	{ AF_LINK,  SOCK_RAW,         PROTO_ETHARP,   0 },
 
 	/* QSE_AIO_DEV_SCK_DGRAM */
-	{ AF_LINK,  SOCK_DGRAM,       QSE_CONST_HTON16(QSE_AIO_ETHHDR_PROTO_ARP), 0                                 },
+	{ AF_LINK,  SOCK_DGRAM,       PROTO_ETHARP,   0 },
 #else
-	{ -1,       0,                0,                            0                                             },
-	{ -1,       0,                0,                            0                                             },
+	{ -1,       0,                0,              0 },
+	{ -1,       0,                0,              0 },
 #endif
 
 	/* QSE_AIO_DEV_SCK_ICMP4 - IP protocol field is 1 byte only. no byte order conversion is needed */
-	{ AF_INET,    SOCK_RAW,       IPPROTO_ICMP,              0,                                               },
+	{ AF_INET,    SOCK_RAW,       IPPROTO_ICMP,   0, 1 },
 
 	/* QSE_AIO_DEV_SCK_ICMP6 - IP protocol field is 1 byte only. no byte order conversion is needed */
-	{ AF_INET6,   SOCK_RAW,       IPPROTO_ICMP,              0,                                               }
+	{ AF_INET6,   SOCK_RAW,       IPPROTO_ICMP,   0, 1 }
 };
 
 /* ======================================================================== */
diff --git a/qse/lib/si/aio.c b/qse/lib/si/aio.c
index 0adbb838..d8248af1 100644
--- a/qse/lib/si/aio.c
+++ b/qse/lib/si/aio.c
@@ -69,7 +69,7 @@ static int kill_and_free_device (qse_aio_dev_t* dev, int force);
 #define MUX_CMD_UPDATE 2
 #define MUX_CMD_DELETE 3
 
-#define MUX_INDEX_INVALID QSE_AIO_TYPE_MAX(qse_size_t)
+#define MUX_INDEX_INVALID QSE_TYPE_MAX(qse_size_t)
 
 struct qse_aio_mux_t
 {
@@ -136,7 +136,7 @@ static int mux_control (qse_aio_dev_t* dev, int cmd, qse_aio_syshnd_t hnd, int d
 			return -1;
 		}
 
-		new_capa = QSE_AIO_ALIGNTO_POW2((hnd + 1), 256);
+		new_capa = QSE_ALIGNTO_POW2((hnd + 1), 256);
 
 		tmp = QSE_MMGR_REALLOC (aio->mmgr, mux->map.ptr, new_capa * QSE_SIZEOF(*tmp));
 		if (!tmp)
@@ -180,7 +180,7 @@ static int mux_control (qse_aio_dev_t* dev, int cmd, qse_aio_syshnd_t hnd, int d
 				struct pollfd* tmp1;
 				qse_aio_dev_t** tmp2;
 
-				new_capa = QSE_AIO_ALIGNTO_POW2(mux->pd.size + 1, 256);
+				new_capa = QSE_ALIGNTO_POW2(mux->pd.size + 1, 256);
 
 				tmp1 = QSE_MMGR_REALLOC (aio->mmgr, mux->pd.pfd, new_capa * QSE_SIZEOF(*tmp1));
 				if (!tmp1)