diff --git a/cgpt/flash_ts.c b/cgpt/flash_ts.c
index e5e461d..f37c4ac 100644
--- a/cgpt/flash_ts.c
+++ b/cgpt/flash_ts.c
@@ -13,9 +13,10 @@
 
 #include "flash_ts.h"
 
-#include "errno.h"
-#include "stdio.h"
-#include "string.h"
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "utility.h"
 
 // These match the linux driver
diff --git a/cgpt/flash_ts_drv.c b/cgpt/flash_ts_drv.c
index 01a6895..4709b37 100644
--- a/cgpt/flash_ts_drv.c
+++ b/cgpt/flash_ts_drv.c
@@ -6,12 +6,12 @@
  * files for more details.
  */
 
-#include "flash_ts.h"
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
 
+#include "flash_ts.h"
 #include "cgpt.h"
-#include "errno.h"
-#include "stdio.h"
-#include "string.h"
 
 inline int page_to_sector(const nand_geom *nand, int page) {
   return page * (nand->szofpg / nand->szofsector);
diff --git a/tests/cgptlib_test.c b/tests/cgptlib_test.c
index e7a9748..be4c715 100644
--- a/tests/cgptlib_test.c
+++ b/tests/cgptlib_test.c
@@ -3,6 +3,7 @@
  * found in the LICENSE file.
  */
 
+#include <errno.h>
 #include <string.h>
 
 #include "../cgpt/cgpt.h"
@@ -11,7 +12,6 @@
 #include "cgptlib_test.h"
 #include "crc32.h"
 #include "crc32_test.h"
-#include "errno.h"
 #include "gpt.h"
 #include "mtdlib.h"
 #include "mtdlib_unused.h"