13 files changed, 13 insertions, 13 deletions
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)))