diff --git a/build-root/emacs-lisp/dual-loop-skel.el b/build-root/emacs-lisp/dual-loop-skel.el
index fafd21aeb06..a501727a591 100644
--- a/build-root/emacs-lisp/dual-loop-skel.el
+++ b/build-root/emacs-lisp/dual-loop-skel.el
@@ -11,14 +11,13 @@ nil
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vnet/pg/pg.h>
-#include <clib/error.h>
 
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
 
-#include <clib/hash.h>
-#include <clib/error.h>
-#include <clib/elog.h>
+#include <vppinfra/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/elog.h>
 
 typedef struct {
   /* convenience */
diff --git a/build-root/emacs-lisp/pipe-skel.el b/build-root/emacs-lisp/pipe-skel.el
index 8ad25c0482d..bda6e97398d 100644
--- a/build-root/emacs-lisp/pipe-skel.el
+++ b/build-root/emacs-lisp/pipe-skel.el
@@ -10,7 +10,7 @@ nil
 '(setq nstages (skeleton-read "Number of pipeline stages: "))
 "
 #include <vlib/vlib.h>
-#include <clib/error.h>
+#include <vppinfra/error.h>
 
 /*
  * Dump these counters via the \"show error\" CLI command 
diff --git a/build-root/emacs-lisp/tunnel-encap-skel.el b/build-root/emacs-lisp/tunnel-encap-skel.el
index 5933153e16c..baf82415f9c 100644
--- a/build-root/emacs-lisp/tunnel-encap-skel.el
+++ b/build-root/emacs-lisp/tunnel-encap-skel.el
@@ -10,8 +10,8 @@ nil
 '(setq encap-stack (replace-regexp-in-string "_" "-" encap_stack))
 '(setq ENCAP-STACK (upcase encap-stack))
 "
-#include <clib/error.h>
-#include <clib/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/ethernet/ethernet.h>
diff --git a/build-root/emacs-lisp/tunnel-h-skel.el b/build-root/emacs-lisp/tunnel-h-skel.el
index 7e33309b3b1..f03d0405e64 100644
--- a/build-root/emacs-lisp/tunnel-h-skel.el
+++ b/build-root/emacs-lisp/tunnel-h-skel.el
@@ -12,8 +12,8 @@ nil
 #ifndef included_vnet_" encap_stack "_h
 #define included_vnet_" encap_stack "_h
 
-#include <clib/error.h>
-#include <clib/hash.h>
+#include <vppinfra/error.h>
+#include <vppinfra/hash.h>
 #include <vnet/vnet.h>
 #include <vnet/ip/ip.h>
 #include <vnet/l2/l2_input.h>