--- tagutil-3.1/src/compat/include/sys/queue.h.orig	2020-04-06 19:26:17.876055943 +0200
+++ tagutil-3.1/src/compat/include/sys/queue.h	2020-04-06 19:26:24.292746650 +0200
@@ -33,8 +33,6 @@
 #ifndef _SYS_QUEUE_H_
 #define	_SYS_QUEUE_H_
 
-#include <sys/cdefs.h>
-
 /*
  * This file defines four types of data structures: singly-linked lists,
  * singly-linked tail queues, lists and tail queues.
--- tagutil-3.1/src/compat/subr_sbuf.c.orig	2020-04-06 19:26:54.572881419 +0200
+++ tagutil-3.1/src/compat/subr_sbuf.c	2020-04-06 19:27:01.302916526 +0200
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
 /*
 __FBSDID("$FreeBSD: release/10.0.0/sys/kern/subr_sbuf.c 255805 2013-09-22 23:47:56Z des $");
 */
--- tagutil-3.1/src/CMakeLists.txt.orig	2020-04-06 19:30:20.403844481 +0200
+++ tagutil-3.1/src/CMakeLists.txt	2020-04-06 19:30:55.434019063 +0200
@@ -34,7 +34,7 @@
 add_compile_options(-fstack-protector-strong -o aslr -fpie)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 # Per build type flags.
-set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -O0 -g -fsanitize=undefined")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -O0 -g")
 # CMAKE_BUILD_TYPE=GRIM: *very* strict compiler options
 set(CMAKE_C_FLAGS_GRIM "${CMAKE_C_FLAGS_DEBUG} -Wextra -pedantic -Wconversion -Wstrict-prototypes -Wcast-qual -Wcast-align -Wshadow -Wredundant-decls -Wundef -Wfloat-equal -Wmissing-include-dirs -Wswitch-default -Wpointer-arith -Wbad-function-cast -Wnested-externs -Wold-style-definition -Wformat=2 -Winit-self -Wwrite-strings -Wmissing-prototypes")
 include(CheckCCompilerFlag)