diff --git a/firmware/common/wm8731.cpp b/firmware/common/wm8731.cpp
index 85ba5533..f5c454c3 100644
--- a/firmware/common/wm8731.cpp
+++ b/firmware/common/wm8731.cpp
@@ -19,10 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <cstdint>
-#include <array>
-
 #include "wm8731.hpp"
+#include "utility.hpp"
 
 namespace wolfson {
 namespace wm8731 {
diff --git a/firmware/common/wm8731.hpp b/firmware/common/wm8731.hpp
index 6a1fa05e..a81e819c 100644
--- a/firmware/common/wm8731.hpp
+++ b/firmware/common/wm8731.hpp
@@ -23,11 +23,10 @@
 #define __WM8731_H__
 
 #include <cstdint>
+#include <array>
 
 #include "i2c_pp.hpp"
-#include "wm8731.hpp"
 
-#include "utility.hpp"
 #include "volume.hpp"
 
 namespace wolfson {