Strip directory from #include when it's not needed.

diff --git a/h/md5.h b/h/md5.h
index cc053ef..e190604 100644 (file)
--- a/h/md5.h
+++ b/h/md5.h
@@ -6,7 +6,7 @@
  * RSAREF types and constants
  */
 
-#include "h/nmh.h"
+#include "nmh.h"
 #include <inttypes.h>
 
 /* UINT4 defines a four byte word */

diff --git a/h/mf.h b/h/mf.h
index 8a5536d..13dd0ab 100644 (file)
--- a/h/mf.h
+++ b/h/mf.h
@@ -1,7 +1,7 @@
 /* mf.h -- include file for mailbox filters
  */
 
-#include "h/nmh.h"
+#include "nmh.h"
 
 #ifndef        NOTOK
 # define NOTOK (-1)

diff --git a/h/mh.h b/h/mh.h
index 83223a6..bf746f1 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -1,7 +1,7 @@
 /* mh.h -- main header file for all of nmh
  */
 
-#include "h/nmh.h"
+#include "nmh.h"
 
 /* It's undefined behaviour in C99 to convert from a function pointer to
  * a data-object pointer, e.g. void pointer.  gcc's -pedantic warns of
@@ -574,4 +574,4 @@ extern char *version_str;
 extern char *whatnowproc;
 extern char *whomproc;
 
-#include "h/prototypes.h"
+#include "prototypes.h"

diff --git a/sbr/ctype-checked.c b/sbr/ctype-checked.c
index 3c57664..651d06c 100644 (file)
--- a/sbr/ctype-checked.c
+++ b/sbr/ctype-checked.c
@@ -15,7 +15,7 @@
 #error "Please report this to nmh's authors."
 #endif
 
-#include "sbr/ctype-checked.h"
+#include "ctype-checked.h"
 
 /* ctype_identity returns its index less one allowing [EOF, 255] to be
  * used as indexes to ctype_identity + 1. */

diff --git a/sbr/icalendar.l b/sbr/icalendar.l
index 7e69138..0681f3a 100644 (file)
--- a/sbr/icalendar.l
+++ b/sbr/icalendar.l
@@ -10,8 +10,8 @@
 %{
 #include "h/mh.h"
 #include "h/icalendar.h"
-#include "sbr/icalparse.h"
-#include "sbr/base64.h"
+#include "icalparse.h"
+#include "base64.h"
 
 static char *unfold (char *, size_t *);
 static void destroy_icallex(void);

diff --git a/sbr/icalparse.y b/sbr/icalparse.y
index 0213fa9..7549aa6 100644 (file)
--- a/sbr/icalparse.y
+++ b/sbr/icalparse.y
@@ -34,7 +34,7 @@
     */
 
 #include "h/mh.h"
-#include "sbr/error.h"
+#include "error.h"
 #include "h/icalendar.h"
 #include "h/utils.h"