diff -burN owfs-3.2p3/module/owserver/src/c/handler.c owfs-3.2p3-patched/module/owserver/src/c/handler.c
--- owfs-3.2p3/module/owserver/src/c/handler.c	2018-10-03 22:54:33.000000000 +0200
+++ owfs-3.2p3-patched/module/owserver/src/c/handler.c	2020-01-29 15:28:44.825209279 +0100
@@ -36,6 +36,10 @@
 
 #include "owserver.h"
 
+pthread_mutex_t persistence_mutex ;
+#define PERSISTENCELOCK    _MUTEX_LOCK(   persistence_mutex ) ;
+#define PERSISTENCEUNLOCK  _MUTEX_UNLOCK( persistence_mutex ) ;
+
 /* Counters for persistent connections */
 int persistent_connections = 0;
 int handler_count = 0 ;
diff -burN owfs-3.2p3/module/owserver/src/c/owserver.c owfs-3.2p3-patched/module/owserver/src/c/owserver.c
--- owfs-3.2p3/module/owserver/src/c/owserver.c	2018-10-03 22:54:33.000000000 +0200
+++ owfs-3.2p3-patched/module/owserver/src/c/owserver.c	2020-01-29 15:53:21.125330899 +0100
@@ -36,6 +36,9 @@
 
 #include "owserver.h"
 
+/* defined in handler.c */
+extern pthread_mutex_t persistence_mutex ;
+
 /* --- Prototypes ------------ */
 static void SetupAntiloop(int argc, char **argv);
 
diff -burN owfs-3.2p3/module/owserver/src/include/owserver.h owfs-3.2p3-patched/module/owserver/src/include/owserver.h
--- owfs-3.2p3/module/owserver/src/include/owserver.h	2018-10-03 22:54:33.000000000 +0200
+++ owfs-3.2p3-patched/module/owserver/src/include/owserver.h	2020-01-29 15:28:38.074588986 +0100
@@ -18,10 +18,6 @@
 #include "ow.h"
 #include "ow_connection.h"
 
-pthread_mutex_t persistence_mutex ;
-#define PERSISTENCELOCK    _MUTEX_LOCK(   persistence_mutex ) ;
-#define PERSISTENCEUNLOCK  _MUTEX_UNLOCK( persistence_mutex ) ;
-
 #define TOCLIENTLOCK(hd) _MUTEX_LOCK( (hd)->to_client )
 #define TOCLIENTUNLOCK(hd) _MUTEX_UNLOCK( (hd)->to_client )