diff --git a/src/lib/uuid.c b/src/lib/uuid.c
index e313df992..d4eee69be 100644
--- a/src/lib/uuid.c
+++ b/src/lib/uuid.c
@@ -19,13 +19,14 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "uuid.h"
+#include "lib/uuid.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <string.h>
 
 void
 lumiera_uuid_set_ptr (lumiera_uuid* uuid, void* ptr)
diff --git a/src/lib/uuid.h b/src/lib/uuid.h
index a1ab6fa6a..d4cf8ce9d 100644
--- a/src/lib/uuid.h
+++ b/src/lib/uuid.h
@@ -20,7 +20,8 @@
 */
 #ifndef LUMIERA_UUID_H
 #define LUMIERA_UUID_H
-#include "lumiera.h"
+
+#include <stdlib.h>
 
 typedef unsigned char lumiera_uuid[16];
 
diff --git a/tests/library/test-uuid.c b/tests/library/test-uuid.c
index b5b3b6746..4a6050163 100644
--- a/tests/library/test-uuid.c
+++ b/tests/library/test-uuid.c
@@ -21,10 +21,12 @@
 //#include "cinelerra-config.h"
 
 //#include <stdio.h>
-//#include <string.h>
+
 
 #include "lib/uuid.h"
 
+#include <nobug.h>
+
 //CINELERRA_ERROR_DEFINE(TEST, "test error");
 
 int