diff --git a/Makefile.am b/Makefile.am
index 0dff83e505..87ba4aff9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ AM_CFLAGS = \
 	# end
 AM_CPPFLAGS = \
 	-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/lib \
-	-I$(top_builddir) -I$(top_builddir)/include -I$(top_builddir)/lib \
+	-I$(top_builddir) \
 	$(LUA_INCLUDE) \
 	# end
 AM_LDFLAGS = \
diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index 71ac356585..df1998c4fc 100644
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #include "thread.h"
 #include "privs.h"
 #include "sigevent.h"
-#include "version.h"
+#include "lib/version.h"
 #include "command.h"
 #include "vty.h"
 #include "memory.h"
diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 0e5f506b3a..abe97571c5 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -34,7 +34,7 @@
 #include "lib_errors.h"
 #include "stream.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "jhash.h"
 #include "termtable.h"
 
diff --git a/bgpd/bgp_mplsvpn_snmp.c b/bgpd/bgp_mplsvpn_snmp.c
index 6f75856d54..7a2f618ce6 100644
--- a/bgpd/bgp_mplsvpn_snmp.c
+++ b/bgpd/bgp_mplsvpn_snmp.c
@@ -32,7 +32,7 @@
 #include "filter.h"
 #include "hook.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_route.h"
diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
index bb85ad393d..816ed88eec 100644
--- a/bgpd/bgp_rpki.c
+++ b/bgpd/bgp_rpki.c
@@ -57,7 +57,7 @@
 #endif
 #include "hook.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #ifndef VTYSH_EXTRACT_PL
 #include "bgpd/bgp_rpki_clippy.c"
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index 3afdbea908..61a6467ab6 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -32,7 +32,7 @@
 #include "filter.h"
 #include "hook.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "bgpd/bgpd.h"
 #include "bgpd/bgp_table.h"
diff --git a/fpm/fpm_pb.h b/fpm/fpm_pb.h
index 2e265511f2..659b5a64ac 100644
--- a/fpm/fpm_pb.h
+++ b/fpm/fpm_pb.h
@@ -29,7 +29,7 @@
 #ifndef _FPM_PB_H
 #define _FPM_PB_H
 
-#include "route_types.h"
+#include "lib/route_types.h"
 #include "qpb/qpb.h"
 
 #include "fpm/fpm.pb-c.h"
diff --git a/isisd/isis_snmp.c b/isisd/isis_snmp.c
index fe6a2f4052..1efe9f3bfb 100644
--- a/isisd/isis_snmp.c
+++ b/isisd/isis_snmp.c
@@ -36,7 +36,7 @@
 #include "memory.h"
 #include "smux.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "isisd/isis_constants.h"
 #include "isisd/isis_common.h"
diff --git a/ldpd/ldp_snmp.c b/ldpd/ldp_snmp.c
index 9fb4e46515..3932df48e0 100644
--- a/ldpd/ldp_snmp.c
+++ b/ldpd/ldp_snmp.c
@@ -36,7 +36,7 @@
 #include "memory.h"
 #include "smux.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "ldpd.h"
 #include "ldpe.h"
 
diff --git a/lib/agentx.c b/lib/agentx.c
index b5a035ee2b..6d4e68d651 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -30,7 +30,7 @@
 #include "smux.h"
 #include "memory.h"
 #include "linklist.h"
-#include "version.h"
+#include "lib/version.h"
 #include "lib_errors.h"
 #include "xref.h"
 
diff --git a/lib/command_lex.l b/lib/command_lex.l
index 0556605d63..9c096995f5 100644
--- a/lib/command_lex.l
+++ b/lib/command_lex.l
@@ -35,7 +35,7 @@
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wmissing-prototypes"
 
-#include "command_parse.h"
+#include "lib/command_parse.h"
 
 #define YY_USER_ACTION yylloc->last_column += yyleng;
 #define LOC_STEP do { if (yylloc) { \
diff --git a/lib/command_parse.y b/lib/command_parse.y
index 5ebc19b278..f5e42cc304 100644
--- a/lib/command_parse.y
+++ b/lib/command_parse.y
@@ -75,7 +75,7 @@
 
 %code provides {
   #ifndef FLEX_SCANNER
-  #include "command_lex.h"
+  #include "lib/command_lex.h"
   #endif
 
   extern void set_lexer_string (yyscan_t *scn, const char *string);
diff --git a/lib/defaults.c b/lib/defaults.c
index 7466aad5b1..fe099b6469 100644
--- a/lib/defaults.c
+++ b/lib/defaults.c
@@ -18,7 +18,7 @@
 #include <zebra.h>
 
 #include "defaults.h"
-#include "version.h"
+#include "lib/version.h"
 
 static char df_version[128] = FRR_VER_SHORT, df_profile[128] = DFLT_NAME;
 static struct frr_default *dflt_first = NULL, **dflt_next = &dflt_first;
diff --git a/lib/libfrr.c b/lib/libfrr.c
index 5b0a523fb5..c8f2540db5 100644
--- a/lib/libfrr.c
+++ b/lib/libfrr.c
@@ -29,7 +29,7 @@
 #include "privs.h"
 #include "vty.h"
 #include "command.h"
-#include "version.h"
+#include "lib/version.h"
 #include "lib_vty.h"
 #include "log_vty.h"
 #include "zclient.h"
diff --git a/lib/module.c b/lib/module.c
index d2491a3479..1d51a6396d 100644
--- a/lib/module.c
+++ b/lib/module.c
@@ -25,7 +25,7 @@
 
 #include "module.h"
 #include "memory.h"
-#include "version.h"
+#include "lib/version.h"
 
 DEFINE_MTYPE_STATIC(LIB, MODULE_LOADNAME, "Module loading name");
 DEFINE_MTYPE_STATIC(LIB, MODULE_LOADARGS, "Module loading arguments");
diff --git a/lib/northbound_cli.c b/lib/northbound_cli.c
index f88c2161da..81e30bce49 100644
--- a/lib/northbound_cli.c
+++ b/lib/northbound_cli.c
@@ -20,7 +20,7 @@
 #include <zebra.h>
 
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "defaults.h"
 #include "log.h"
 #include "lib_errors.h"
diff --git a/lib/northbound_confd.c b/lib/northbound_confd.c
index 3d8771ffbc..403537e043 100644
--- a/lib/northbound_confd.c
+++ b/lib/northbound_confd.c
@@ -24,7 +24,7 @@
 #include "command.h"
 #include "debug.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "northbound.h"
 
 #include <confd_lib.h>
diff --git a/lib/northbound_grpc.cpp b/lib/northbound_grpc.cpp
index d042e15dad..58f4e42516 100644
--- a/lib/northbound_grpc.cpp
+++ b/lib/northbound_grpc.cpp
@@ -23,7 +23,7 @@
 
 #include "log.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "command.h"
 #include "lib_errors.h"
 #include "northbound.h"
diff --git a/lib/northbound_sysrepo.c b/lib/northbound_sysrepo.c
index 9fc640ceea..fc1af092d0 100644
--- a/lib/northbound_sysrepo.c
+++ b/lib/northbound_sysrepo.c
@@ -25,7 +25,7 @@
 #include "debug.h"
 #include "memory.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "northbound.h"
 
 #include <sysrepo.h>
diff --git a/lib/pid_output.c b/lib/pid_output.c
index bd1d89a94c..b82dde8258 100644
--- a/lib/pid_output.c
+++ b/lib/pid_output.c
@@ -22,7 +22,7 @@
 #include <zebra.h>
 #include <fcntl.h>
 #include <log.h>
-#include "version.h"
+#include "lib/version.h"
 #include "network.h"
 #include "lib_errors.h"
 
diff --git a/lib/version.h.in b/lib/version.h.in
index d535d131c8..5078f3ad6e 100644
--- a/lib/version.h.in
+++ b/lib/version.h.in
@@ -25,7 +25,7 @@
 #define _ZEBRA_VERSION_H
 
 #ifdef GIT_VERSION
-#include "gitversion.h"
+#include "lib/gitversion.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/lib/zebra.h b/lib/zebra.h
index 5c3d91ba74..33364f1471 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -312,7 +312,7 @@ struct in_pktinfo {
 #include "compiler.h"
 
 /* Zebra route's types are defined in route_types.h */
-#include "route_types.h"
+#include "lib/route_types.h"
 
 #define strmatch(a,b) (!strcmp((a), (b)))
 
diff --git a/nhrpd/nhrp_main.c b/nhrpd/nhrp_main.c
index 5c819017f4..e9bce3e09a 100644
--- a/nhrpd/nhrp_main.c
+++ b/nhrpd/nhrp_main.c
@@ -18,7 +18,7 @@
 #include "getopt.h"
 #include "thread.h"
 #include "sigevent.h"
-#include "version.h"
+#include "lib/version.h"
 #include "log.h"
 #include "memory.h"
 #include "command.h"
diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index b9d413c3df..dcf76c7038 100644
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -30,7 +30,7 @@
 #include "vrf.h"
 #include "smux.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "ospf6_proto.h"
 #include "ospf6_lsa.h"
diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 43b998ac5b..432f95f9dd 100644
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -34,7 +34,7 @@
 #include "memory.h"
 #include "smux.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "ospfd/ospfd.h"
 #include "ospfd/ospf_interface.h"
diff --git a/pathd/path_pcep.c b/pathd/path_pcep.c
index d6cd48ecdb..1c650737b2 100644
--- a/pathd/path_pcep.c
+++ b/pathd/path_pcep.c
@@ -24,7 +24,7 @@
 #include "command.h"
 #include "libfrr.h"
 #include "printfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "northbound.h"
 #include "frr_pthread.h"
 #include "jhash.h"
diff --git a/pathd/path_pcep_cli.c b/pathd/path_pcep_cli.c
index 14404b1d08..2e4e331ad9 100644
--- a/pathd/path_pcep_cli.c
+++ b/pathd/path_pcep_cli.c
@@ -25,7 +25,7 @@
 #include "command.h"
 #include "libfrr.h"
 #include "printfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "northbound.h"
 #include "frr_pthread.h"
 #include "jhash.h"
diff --git a/pathd/path_pcep_controller.c b/pathd/path_pcep_controller.c
index db7d2b55a5..528dcc3539 100644
--- a/pathd/path_pcep_controller.c
+++ b/pathd/path_pcep_controller.c
@@ -22,7 +22,7 @@
 #include "command.h"
 #include "libfrr.h"
 #include "printfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "northbound.h"
 #include "frr_pthread.h"
 #include "jhash.h"
diff --git a/pathd/path_pcep_pcc.c b/pathd/path_pcep_pcc.c
index a2c1e7cd4c..9af2148819 100644
--- a/pathd/path_pcep_pcc.c
+++ b/pathd/path_pcep_pcc.c
@@ -33,7 +33,7 @@
 #include "command.h"
 #include "libfrr.h"
 #include "printfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "northbound.h"
 #include "frr_pthread.h"
 #include "jhash.h"
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index 70c233848a..96132c4425 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -21,7 +21,7 @@
 
 #include "log.h"
 #include "privs.h"
-#include "version.h"
+#include "lib/version.h"
 #include <getopt.h>
 #include "command.h"
 #include "thread.h"
@@ -32,7 +32,7 @@
 #include "filter.h"
 #include "vty.h"
 #include "sigevent.h"
-#include "version.h"
+#include "lib/version.h"
 #include "prefix.h"
 #include "plist.h"
 #include "vrf.h"
diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index b922d66912..d49d360b7e 100644
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -31,7 +31,7 @@
 #include "table.h"
 #include "smux.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "ripd/ripd.h"
 
diff --git a/version.h b/version.h
new file mode 100644
index 0000000000..28e0238dfd
--- /dev/null
+++ b/version.h
@@ -0,0 +1,3 @@
+#include "lib/compiler.h"
+CPP_NOTICE("Trying to include version.h.  Please fix to use lib/version.h.")
+#include "lib/version.h"
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index 600fc3f2fc..66a6bd0545 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -51,7 +51,7 @@
 #include "privs.h"
 #include "libfrr.h"
 #include "lib_errors.h"
-#include "version.h"
+#include "lib/version.h"
 #include "zebra/interface.h"
 #include "zebra/rtadv.h"
 #include "zebra/rib.h"
diff --git a/zebra/zebra_fpm.c b/zebra/zebra_fpm.c
index 5fe8934a82..07a8288605 100644
--- a/zebra/zebra_fpm.c
+++ b/zebra/zebra_fpm.c
@@ -29,7 +29,7 @@
 #include "thread.h"
 #include "network.h"
 #include "command.h"
-#include "version.h"
+#include "lib/version.h"
 #include "jhash.h"
 
 #include "zebra/rib.h"
diff --git a/zebra/zebra_mlag_private.c b/zebra/zebra_mlag_private.c
index aaf93b4dc1..b1bba831d2 100644
--- a/zebra/zebra_mlag_private.c
+++ b/zebra/zebra_mlag_private.c
@@ -28,7 +28,7 @@
 #include "thread.h"
 #include "frr_pthread.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 #include "network.h"
 
 #include "lib/stream.h"
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index bea855d1af..37d9399054 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -31,7 +31,7 @@
 #include "ptm_lib.h"
 #include "rib.h"
 #include "stream.h"
-#include "version.h"
+#include "lib/version.h"
 #include "vrf.h"
 #include "vty.h"
 #include "lib_errors.h"
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 6a42c682ad..d07a49fb6e 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -30,7 +30,7 @@
 #include "plist.h"
 #include "nexthop.h"
 #include "northbound_cli.h"
-#include "route_types.h"
+#include "lib/route_types.h"
 #include "vrf.h"
 #include "frrstr.h"
 
diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
index 3e08d83724..6fe24dfa54 100644
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -36,7 +36,7 @@
 #include "vrf.h"
 #include "hook.h"
 #include "libfrr.h"
-#include "version.h"
+#include "lib/version.h"
 
 #include "zebra/rib.h"
 #include "zebra/zserv.h"