diff --git a/lib/qmi.c b/lib/qmi.c
index 61ec80a..e700e23 100644
--- a/lib/qmi.c
+++ b/lib/qmi.c
@@ -28,12 +28,12 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <errno.h>
+#include <libqrtr.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "libqrtr.h"
 #include "logging.h"
 
 /**
diff --git a/lib/qrtr.c b/lib/qrtr.c
index 96756ba..b624e36 100644
--- a/lib/qrtr.c
+++ b/lib/qrtr.c
@@ -1,6 +1,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#include <libqrtr.h>
 #include <linux/qrtr.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -9,7 +10,6 @@
 #include <errno.h>
 #include <poll.h>
 
-#include "libqrtr.h"
 #include "logging.h"
 #include "ns.h"
 
diff --git a/src/addr.c b/src/addr.c
index 61417dd..913a9ac 100644
--- a/src/addr.c
+++ b/src/addr.c
@@ -1,5 +1,6 @@
 #include <err.h>
 #include <errno.h>
+#include <libqrtr.h>
 #include <linux/qrtr.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -9,7 +10,6 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "libqrtr.h"
 #include "logging.h"
 
 void qrtr_set_address(uint32_t addr)
diff --git a/src/cfg.c b/src/cfg.c
index 97a8352..d17adfe 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -1,6 +1,7 @@
 #include <err.h>
 #include <errno.h>
 #include <libgen.h>
+#include <libqrtr.h>
 #include <limits.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
@@ -13,7 +14,6 @@
 #include <unistd.h>
 
 #include "addr.h"
-#include "libqrtr.h"
 #include "logging.h"
 
 static void usage(const char *progname)
diff --git a/src/ns.c b/src/ns.c
index d2945f7..1e847a8 100644
--- a/src/ns.c
+++ b/src/ns.c
@@ -1,5 +1,6 @@
 #include <err.h>
 #include <errno.h>
+#include <libqrtr.h>
 #include <libgen.h>
 #include <limits.h>
 #include <linux/qrtr.h>
@@ -22,7 +23,6 @@
 #include "util.h"
 #include "waiter.h"
 
-#include "libqrtr.h"
 #include "logging.h"
 
 static const char *ctrl_pkt_strings[] = {