6 files changed, 32 insertions, 25 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 7b082c6..7e163ee 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -48,6 +48,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/alloca.m4 \
 	$(top_srcdir)/m4/atexit.m4 $(top_srcdir)/m4/closeout.m4 \
 	$(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/d-ino.m4 \
+	$(top_srcdir)/m4/dirname.m4 $(top_srcdir)/m4/dos.m4 \
 	$(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exclude.m4 \
 	$(top_srcdir)/m4/exitfail.m4 $(top_srcdir)/m4/extensions.m4 \
 	$(top_srcdir)/m4/fnmatch.m4 $(top_srcdir)/m4/fpending.m4 \
diff --git a/src/fid.c b/src/fid.c
index 0e77a28..b047233 100644
--- a/src/fid.c
+++ b/src/fid.c
@@ -23,12 +23,13 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <error.h>
+#include <pathmax.h>
+#include <xalloc.h>
+#include <alloca.h>
+
 #include "xnls.h"
 #include "idfile.h"
-#include "error.h"
-#include "pathmax.h"
-#include "xalloc.h"
-#include "alloca.h"
 #include "iduglobal.h"
 
 int get_file_index (char *file_name);
diff --git a/src/fnid.c b/src/fnid.c
index ddffcb2..4373fd8 100644
--- a/src/fnid.c
+++ b/src/fnid.c
@@ -24,12 +24,13 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "xalloc.h"
+#include <alloca.h>
+#include <xalloc.h>
+#include <pathmax.h>
+#include <error.h>
+
 #include "xnls.h"
 #include "idfile.h"
-#include "pathmax.h"
-#include "error.h"
-#include "alloca.h"
 #include "iduglobal.h"
 
 void scan_files (struct idhead *idhp);
diff --git a/src/lid.c b/src/lid.c
index a07173f..8182976 100644
--- a/src/lid.c
+++ b/src/lid.c
@@ -25,21 +25,22 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <assert.h>
-#include "getopt.h"
+#include <getopt.h>
 #include <limits.h>
 #include <string.h>
+#include <dirname.h>
 #include <unistd.h>
 #include <termios.h>
-#include "regex.h"
+#include <alloca.h>
+#include <regex.h>
+#include <xalloc.h>
+#include <pathmax.h>
+#include <error.h>
+
 #include "xnls.h"
-#include "xalloc.h"
 #include "idfile.h"
-#include "error.h"
-#include "pathmax.h"
-#include "alloca.h"
 #include "iduglobal.h"
 
-
 typedef void (*report_func_t) (char const *name, struct file_link **flinkv);
 typedef int (*query_func_t) (char const *arg, report_func_t);
 
diff --git a/src/mkid.c b/src/mkid.c
index 2261111..2c31fd8 100644
--- a/src/mkid.c
+++ b/src/mkid.c
@@ -25,17 +25,19 @@
 #include <sys/stat.h>
 #include <stddef.h>
 #include <unistd.h>
-#include "xnls.h"
-#include "pathmax.h"
+#include <pathmax.h>
 #include <string.h>
+#include <dirname.h>
+#include <alloca.h>
+#include <limits.h>
+#include <inttostr.h>
+#include <xalloc.h>
+#include <error.h>
+
+#include "xnls.h"
 #include "idfile.h"
-#include "xalloc.h"
 #include "hash.h"
 #include "scanners.h"
-#include "error.h"
-#include "alloca.h"
-#include <limits.h>
-#include "inttostr.h"
 #include "iduglobal.h"
 
 char* dirname(char* path);
diff --git a/src/xtokid.c b/src/xtokid.c
index f9be38d..fc3c4cf 100644
--- a/src/xtokid.c
+++ b/src/xtokid.c
@@ -22,12 +22,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "xalloc.h"
+#include <xalloc.h>
+#include <pathmax.h>
+#include <error.h>
+
 #include "xnls.h"
 #include "scanners.h"
 #include "idfile.h"
-#include "pathmax.h"
-#include "error.h"
 #include "iduglobal.h"
 
 void scan_files (struct idhead *idhp);