diff --git a/src/tool/luidgen.c b/src/tool/luidgen.c
index 730395b6c..84ed75588 100644
--- a/src/tool/luidgen.c
+++ b/src/tool/luidgen.c
@@ -19,7 +19,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "lib/safeclib.h"
+#include "lib/tmpbuf.h"
 #include "lib/luid.h"
 
 #include <unistd.h>
diff --git a/tests/tool/vgsuppression.c b/tests/tool/vgsuppression.c
index 7a3ca4c06..6557bdeb1 100644
--- a/tests/tool/vgsuppression.c
+++ b/tests/tool/vgsuppression.c
@@ -23,7 +23,7 @@
   just place any problematic calls where valgrind whines about in main (with comments please)
 */
 
-#include "lib/safeclib.h"
+#include "lib/tmpbuf.h"
 #include <stdint.h>
 
 struct lumiera_errorcontext_struct;