diff --git a/tools/lint/linenoise/linenoise.c b/tools/lint/linenoise/linenoise.c
index 135a712..f14d348 100644
--- a/tools/lint/linenoise/linenoise.c
+++ b/tools/lint/linenoise/linenoise.c
@@ -107,20 +107,19 @@
 
 #define _GNU_SOURCE
 
-#include <termios.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
+#include "linenoise.h"
+
 #include <ctype.h>
 #include <dirent.h>
-#include <sys/types.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
+#include <termios.h>
 #include <unistd.h>
-#include "linenoise.h"
 
 #define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
 #define LINENOISE_MAX_LINE 4096
diff --git a/tools/lint/linenoise/linenoise.h b/tools/lint/linenoise/linenoise.h
index c708990..2bebcf3 100644
--- a/tools/lint/linenoise/linenoise.h
+++ b/tools/lint/linenoise/linenoise.h
@@ -39,6 +39,8 @@
 #ifndef __LINENOISE_H
 #define __LINENOISE_H
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif