diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5f9103..931d735 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ add_executable(ensaht main.c mqtt.c bmp.c aht.c ens.c)
 # Add the standard include files to the build
 target_include_directories(ensaht PRIVATE
   ${CMAKE_CURRENT_LIST_DIR}
+  ${CMAKE_CURRENT_LIST_DIR}/inc
   ${CMAKE_CURRENT_LIST_DIR}/.. # for our common lwipopts or any other standard includes, if required
 )
 pico_set_program_name(ensaht "ensaht")
diff --git a/aht.c b/aht.c
index 08e4009..db41204 100644
--- a/aht.c
+++ b/aht.c
@@ -1,4 +1,4 @@
-#include "aht.h"
+#include "inc/aht.h"
 
 #include "hardware/i2c.h"
 #include "pico/stdlib.h" // IWYU pragma: keep
diff --git a/bmp.c b/bmp.c
index ad00658..78fd325 100644
--- a/bmp.c
+++ b/bmp.c
@@ -1,6 +1,6 @@
 // Copyright 2026 A.M. Rowsell <amr@frzn.dev>
 // SPDX-License-Identifier: MIT
-#include "./bmp.h"
+#include "inc/bmp.h"
 
 float bmp_cal_data_fp[15];
 
diff --git a/ens.c b/ens.c
index 3d6fc96..0070334 100644
--- a/ens.c
+++ b/ens.c
@@ -1,4 +1,4 @@
-#include "ens.h"
+#include "inc/ens.h"
 
 #include "hardware/i2c.h"
 #include "pico/stdlib.h" // IWYU pragma: keep
diff --git a/aht.h b/inc/aht.h
similarity index 100%
rename from aht.h
rename to inc/aht.h
diff --git a/bmp.h b/inc/bmp.h
similarity index 100%
rename from bmp.h
rename to inc/bmp.h
diff --git a/ens.h b/inc/ens.h
similarity index 100%
rename from ens.h
rename to inc/ens.h
diff --git a/lwipopts.h b/inc/lwipopts.h
similarity index 100%
rename from lwipopts.h
rename to inc/lwipopts.h
diff --git a/mbedtls_config.h b/inc/mbedtls_config.h
similarity index 100%
rename from mbedtls_config.h
rename to inc/mbedtls_config.h
diff --git a/mqtt.h b/inc/mqtt.h
similarity index 100%
rename from mqtt.h
rename to inc/mqtt.h
diff --git a/main.c b/main.c
index 812e16e..a875b0c 100644
--- a/main.c
+++ b/main.c
@@ -18,10 +18,10 @@
  *               the readings to Adafruit IO over MQTT using the Pico W.
  ******************************************************************************/
 
-#include "./aht.h"
-#include "./bmp.h"
-#include "./ens.h"
-#include "./mqtt.h"
+#include "inc/aht.h"
+#include "inc/bmp.h"
+#include "inc/ens.h"
+#include "inc/mqtt.h"
 #include "hardware/gpio.h"
 #include "hardware/i2c.h"
 #include "pico/cyw43_arch.h"
diff --git a/mqtt.c b/mqtt.c
index ff9c22e..bddcf0c 100644
--- a/mqtt.c
+++ b/mqtt.c
@@ -1,4 +1,4 @@
-#include "mqtt.h"
+#include "inc/mqtt.h"
 
 #include "lwip/altcp.h" // IWYU pragma: keep
 #include "lwip/altcp_tls.h"