diff --git a/canutils/canlib/canlib_getbaud.c b/canutils/canlib/canlib_getbaud.c
index c123403a1..22d62191b 100644
--- a/canutils/canlib/canlib_getbaud.c
+++ b/canutils/canlib/canlib_getbaud.c
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 /****************************************************************************
  * Name: canlib_getbaud
diff --git a/canutils/canlib/canlib_getloopback.c b/canutils/canlib/canlib_getloopback.c
index ccff4ea4c..2b0b5e019 100644
--- a/canutils/canlib/canlib_getloopback.c
+++ b/canutils/canlib/canlib_getloopback.c
@@ -46,7 +46,7 @@
 #include <stdbool.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 /****************************************************************************
  * Name: canlib_getloopback
diff --git a/canutils/canlib/canlib_getsilent.c b/canutils/canlib/canlib_getsilent.c
index 7b2eff1dc..d7bd187e5 100644
--- a/canutils/canlib/canlib_getsilent.c
+++ b/canutils/canlib/canlib_getsilent.c
@@ -46,7 +46,7 @@
 #include <stdbool.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 /****************************************************************************
  * Name: canlib_getsilent
diff --git a/canutils/canlib/canlib_setbaud.c b/canutils/canlib/canlib_setbaud.c
index adb7804cb..711827213 100644
--- a/canutils/canlib/canlib_setbaud.c
+++ b/canutils/canlib/canlib_setbaud.c
@@ -45,7 +45,7 @@
 #include <stdlib.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 /****************************************************************************
  * Name: canlib_setbaud
diff --git a/canutils/canlib/canlib_setloopback.c b/canutils/canlib/canlib_setloopback.c
index 06e0822a5..ac9461fc2 100644
--- a/canutils/canlib/canlib_setloopback.c
+++ b/canutils/canlib/canlib_setloopback.c
@@ -46,7 +46,7 @@
 #include <stdbool.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 /****************************************************************************
  * Name: canlib_setloopback
diff --git a/canutils/canlib/canlib_setsilent.c b/canutils/canlib/canlib_setsilent.c
index 74629427e..68afcd779 100644
--- a/canutils/canlib/canlib_setsilent.c
+++ b/canutils/canlib/canlib_setsilent.c
@@ -46,7 +46,7 @@
 #include <stdbool.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 /****************************************************************************
  * Name: canlib_setsilent
diff --git a/examples/can/can_main.c b/examples/can/can_main.c
index 09054a497..724a0455d 100644
--- a/examples/can/can_main.c
+++ b/examples/can/can_main.c
@@ -51,7 +51,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 
 #include "can.h"
 
diff --git a/examples/canard/canard_main.c b/examples/canard/canard_main.c
index d0ab0a7fd..7b64959da 100644
--- a/examples/canard/canard_main.c
+++ b/examples/canard/canard_main.c
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include <nuttx/can.h>
+#include <nuttx/drivers/can.h>
 #include <canard.h>
 #include <canard_nuttx.h>       /* CAN backend driver for nuttx, distributed
                                  * with Libcanard */