diff --git a/math/bitwuzla/Makefile b/math/bitwuzla/Makefile
index 47794503573c..51f72c7d8f09 100644
--- a/math/bitwuzla/Makefile
+++ b/math/bitwuzla/Makefile
@@ -1,37 +1,39 @@
 PORTNAME=	bitwuzla # successor of Boolector
 DISTVERSION=	0.7.0
 PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SMT solver for the theories of fixed-size bit-vectors
 WWW=		https://bitwuzla.github.io/ \
 		https://github.com/bitwuzla/bitwuzla
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gmp>0:math/gmp \
 		${LOCALBASE}/lib/symfpu.a:math/symfpu
 LIB_DEPENDS=	libcadical.so:math/cadical \
 		libgmp.so:math/gmp
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		compiler:c++17-lang localbase:ldflags meson pkgconfig python:build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
+CFLAGS+=	-I${LOCALBASE}/include/cadical
+CXXFLAGS+=	-I${LOCALBASE}/include/cadical
 LDFLAGS+=	-lcadical
 
 MESON_ARGS=	-Ddefault_library=shared \
 		-Dtesting=disabled
 
 BINARY_ALIAS=	git=false
 
 do-test: # 1 test hangs, see https://github.com/bitwuzla/bitwuzla/issues/117
 	@cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${CONFIGURE_ARGS} -Dtesting=enabled && \
 		cd ${BUILD_WRKSRC} && \
 		${DO_MAKE_BUILD} test
 
 .include <bsd.port.mk>
diff --git a/math/boolector/Makefile b/math/boolector/Makefile
index 4d654fa79dbf..f29a3ee06388 100644
--- a/math/boolector/Makefile
+++ b/math/boolector/Makefile
@@ -1,39 +1,42 @@
 PORTNAME=	boolector
 DISTVERSION=	3.2.4
 PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Satisfiability Modulo Theories (SMT) solver
 WWW=		https://boolector.github.io/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/liblgl.a:math/lingeling
 LIB_DEPENDS=	libbtor2parser.so:math/btor2tools \
 		libcadical.so:math/cadical \
 		libcryptominisat5.so:math/cryptominisat \
 		libminisat.so:math/minisat \
 		libpicosat.so:math/picosat \
 		libgmp.so:math/gmp
 TEST_DEPENDS=	bash:shells/bash
 
 USES=		cmake:noninja,testing compiler:c++11-lang cpe python:build,test shebangfix
 
 CPE_VENDOR=	boolector_project
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Boolector
 
 SHEBANG_GLOB=	*.sh
 
+CFLAGS+=	-I${LOCALBASE}/include/cadical
+CXXFLAGS+=	-I${LOCALBASE}/include/cadical
+
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		USE_GMP
 CMAKE_OFF=	TESTING
 CMAKE_TESTING_ON=	TESTING # 1 test hangs, see https://github.com/Boolector/boolector/issues/227
 CMAKE_ARGS=	-DCaDiCaL_INCLUDE_DIR=${LOCALBASE}/include
 
 BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD} # only for tests
 
 .include <bsd.port.mk>
diff --git a/math/cadical/Makefile b/math/cadical/Makefile
index 01262dfc3416..87a7893a07af 100644
--- a/math/cadical/Makefile
+++ b/math/cadical/Makefile
@@ -1,56 +1,63 @@
 PORTNAME=	cadical
 DISTVERSIONPREFIX=	rel-
 DISTVERSION=	2.1.3
+PORTREVISION=	1
 CATEGORIES=	math devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Simple CDCL satisfiability solver
 WWW=		https://fmv.jku.at/cadical/ \
 		https://github.com/arminbiere/cadical
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		compiler:c++0x gmake tar:xz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arminbiere
 
 GNU_CONFIGURE=	yes
 
 MAKEFILE=	makefile
 
+CFLAGS+=	-I${LOCALBASE}/include/cadical
+CXXFLAGS+=	-I${LOCALBASE}/include/cadical
+
 BINARY_ALIAS=	make=${GMAKE}
 
 EXES=		cadical mobical
 
 TEST_TARGET=	test
 
 PLIST_FILES=	${EXES:S/^/bin\//} \
-		include/cadical.hpp \
-		include/ccadical.h \
+		include/cadical/cadical.hpp \
+		include/cadical/ccadical.h \
+		include/cadical/tracer.hpp \
 		lib/libcadical.a \
 		lib/libcadical.so \
 		lib/libcadical.so.${DISTVERSION}
 
 post-build: # build shared library
 	@${ECHO} "==> Building the shared library"
 	cd ${WRKSRC}/src && ${CXX} \
 		-shared -Wl,-soname=lib${PORTNAME}.so.$(DISTVERSION) -fPIC \
 		-DNDEBUG \
 		${CXXFLAGS} ${LDFLAGS} \
 		`${ECHO} *.cpp | ${SED} -e "s/cadical\.cpp//; s/mobical\.cpp//"` \
 		-I ${WRKSRC}/build \
 		-o ${WRKSRC}/build/lib${PORTNAME}.so.${DISTVERSION}
 
 do-install: # workaround for https://github.com/arminbiere/cadical/issues/49
 .for e in ${EXES}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/${e} ${STAGEDIR}${PREFIX}/bin
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/src/cadical.hpp ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/src/ccadical.h ${STAGEDIR}${PREFIX}/include
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/cadical
+	${INSTALL_DATA} ${WRKSRC}/src/cadical.hpp ${STAGEDIR}${PREFIX}/include/cadical
+	${INSTALL_DATA} ${WRKSRC}/src/ccadical.h ${STAGEDIR}${PREFIX}/include/cadical
+	${INSTALL_DATA} ${WRKSRC}/src/tracer.hpp ${STAGEDIR}${PREFIX}/include/cadical
 	${INSTALL_DATA} ${WRKSRC}/build/libcadical.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/build/libcadical.so.${DISTVERSION} ${STAGEDIR}${PREFIX}/lib
 	cd ${STAGEDIR}${PREFIX}/lib && ${LN} -s libcadical.so.${DISTVERSION} libcadical.so
 
 .include <bsd.port.mk>