--- libelwix/inc/elwix.h	2025/09/26 08:58:05	1.26.4.1
+++ libelwix/inc/elwix.h	2026/02/10 17:50:00	1.30
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: elwix.h,v 1.26.4.1 2025/09/26 08:58:05 misho Exp $
+* $Id: elwix.h,v 1.30 2026/02/10 17:50:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2025
+Copyright 2004 - 2026
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -56,6 +56,7 @@ SUCH DAMAGE.
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <stdatomic.h>
 #ifndef __linux__
 #include <sys/limits.h>
 #include <sys/endian.h>
@@ -66,13 +67,6 @@ SUCH DAMAGE.
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#ifndef __cplusplus
-	#include <stdatomic.h>
-#else
-	#include <atomic>
-	#define _Atomic(X) std::atomic< X >
-#endif
-
 #include <elwix/aqueue.h>
 #include <elwix/atree.h>
 #include <elwix/ampool.h>
@@ -91,6 +85,7 @@ SUCH DAMAGE.
 #include <elwix/aiov.h>
 #include <elwix/aindex.h>
 #include <elwix/aring.h>
+#include <elwix/auuid.h>
 
 
 #ifndef STRSIZ
@@ -189,11 +184,15 @@ SUCH DAMAGE.
 #define VACUUM_BETWEEN		2
 
 
-extern int __isthreaded;
+typedef struct {
+	E_ATOMIC_ALIGN int	value;
+} e_atomic_int;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+extern int __isthreaded;
 
 // elwix_SetProg() Set program memory pool name
 void elwix_SetProg(const char *csProgName);