Header order hell

diff --git a/sysdeps/nacl/nacl-interfaces.c b/sysdeps/nacl/nacl-interfaces.c
index 95b722e080f1a9f9fa6f1eb1df3a36d42142994d..a863d87bf19b969167d19b582a4879f32dbd6cad 100644 (file)
--- a/sysdeps/nacl/nacl-interfaces.c
+++ b/sysdeps/nacl/nacl-interfaces.c
@@ -17,9 +17,8 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
-#include "nacl-interfaces.h"
-
-#include <native_client/src/untrusted/irt/irt.h>
+#include <nacl-interfaces.h>
+#include <ldsodefs.h>
 
 
 /* These magic symbols are provided implicitly by the linker to

diff --git a/sysdeps/nacl/nacl-interfaces.h b/sysdeps/nacl/nacl-interfaces.h
index 04545a52755933a4d4f87bb37b92aaed773d7900..e5fd5ed35cd96ac165d2f158fd8edc00b9e28c5d 100644 (file)
--- a/sysdeps/nacl/nacl-interfaces.h
+++ b/sysdeps/nacl/nacl-interfaces.h
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <ldsodefs.h>
 #include <sys/types.h>
 
 /* <nacl-irt.h> is massaged from native_client/src/untrusted/irt/irt.h so

diff --git a/sysdeps/nacl/nacl_interface_query.c b/sysdeps/nacl/nacl_interface_query.c
index a8fcc197b630825034dde37afdb75878834c9d5f..57ac09b65d02af21684158e48e8b9b416c925276 100644 (file)
--- a/sysdeps/nacl/nacl_interface_query.c
+++ b/sysdeps/nacl/nacl_interface_query.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <nacl-interfaces.h>
+#include <ldsodefs.h>
 
 #ifdef SHARED