diff --git a/project/config/cfgdefs.sh b/project/config/cfgdefs.sh
index 7fef196..4bf70bd 100644
--- a/project/config/cfgdefs.sh
+++ b/project/config/cfgdefs.sh
@@ -158,8 +158,6 @@ cfgdefs_perform_common_tests()
 	cfgtest_header_presence 'sys/sysmacros.h'
 	cfgtest_header_presence 'sys/uio.h'
 	cfgtest_header_presence 'sys/xattr.h'
-	cfgtest_header_presence 'uuid.h'
-	cfgtest_header_presence 'uuid/uuid.h'
 
 	# interfaces
 	mb_cfgtest_headers='sys/epoll.h'
@@ -283,6 +281,26 @@ cfgdefs_perform_common_tests()
 		cfgtest_ldflags_append '-Wl,--as-needed -luuid -Wl,--no-as-needed'
 	fi
 
+	# uuid
+	cfgtest_newline
+	cfgtest_comment 'uuid'
+
+	if cfgtest_header_presence 'uuid.h'; then
+		mb_uuid_header='uuid.h'
+
+	elif cfgtest_header_presence 'uuid/uuid.h'; then
+		mb_uuid_header='uuid/uuid.h'
+	else
+		mb_uuid_header=
+	fi
+
+	mb_cfgtest_headers="$mb_uuid_header"
+
+	cfgtest_interface_presence 'uuid_create'
+	cfgtest_interface_presence 'uuid_enc_be'
+	cfgtest_interface_presence 'uuid_generate_time_safe'
+
+
 	# ncurses
 	cfgtest_newline
 	cfgtest_comment 'ncurses/ncursesw'