From 21630e919b3f0a18217e248b80314610b27e5944 Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Mon, 19 Jan 2015 23:21:10 -0500
Subject: [PATCH] Standardize includes for other POSIX platforms.

---
 MasterPassword/C/build              | 1 +
 MasterPassword/C/mpw-algorithm.h    | 2 +-
 MasterPassword/C/mpw-algorithm_v0.c | 2 +-
 MasterPassword/C/mpw-algorithm_v1.c | 2 +-
 MasterPassword/C/mpw-algorithm_v2.c | 2 +-
 MasterPassword/C/mpw-algorithm_v3.c | 2 +-
 MasterPassword/C/mpw-bench.c        | 1 -
 MasterPassword/C/mpw-cli.c          | 1 -
 MasterPassword/C/mpw-tests.c        | 1 -
 MasterPassword/C/mpw-types.h        | 1 +
 MasterPassword/C/mpw-util.h         | 2 ++
 11 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/MasterPassword/C/build b/MasterPassword/C/build
index 736aa82d..fc154d0b 100755
--- a/MasterPassword/C/build
+++ b/MasterPassword/C/build
@@ -280,6 +280,7 @@ mpw-tests() {
         # include paths
         -I"lib/include"
         -I"/usr/include/libxml2"
+        -I"/usr/local/include/libxml2"
     )
     LDFLAGS=(
         # scrypt
diff --git a/MasterPassword/C/mpw-algorithm.h b/MasterPassword/C/mpw-algorithm.h
index 2a541ef4..71fb0a01 100644
--- a/MasterPassword/C/mpw-algorithm.h
+++ b/MasterPassword/C/mpw-algorithm.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#import "mpw-types.h"
+#include "mpw-types.h"
 
 typedef enum(unsigned int, MPAlgorithmVersion) {
     /** V0 did math with chars whose signedness was platform-dependent. */
diff --git a/MasterPassword/C/mpw-algorithm_v0.c b/MasterPassword/C/mpw-algorithm_v0.c
index a2e52876..98e70e1c 100644
--- a/MasterPassword/C/mpw-algorithm_v0.c
+++ b/MasterPassword/C/mpw-algorithm_v0.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
diff --git a/MasterPassword/C/mpw-algorithm_v1.c b/MasterPassword/C/mpw-algorithm_v1.c
index ad80eaff..1a20107f 100644
--- a/MasterPassword/C/mpw-algorithm_v1.c
+++ b/MasterPassword/C/mpw-algorithm_v1.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
diff --git a/MasterPassword/C/mpw-algorithm_v2.c b/MasterPassword/C/mpw-algorithm_v2.c
index 823c72d9..1823c6ff 100644
--- a/MasterPassword/C/mpw-algorithm_v2.c
+++ b/MasterPassword/C/mpw-algorithm_v2.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
diff --git a/MasterPassword/C/mpw-algorithm_v3.c b/MasterPassword/C/mpw-algorithm_v3.c
index cc396ca7..72ba92cb 100644
--- a/MasterPassword/C/mpw-algorithm_v3.c
+++ b/MasterPassword/C/mpw-algorithm_v3.c
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
-#include "mpw-types.h"
 #include "mpw-util.h"
 
 #define MP_N                32768
diff --git a/MasterPassword/C/mpw-bench.c b/MasterPassword/C/mpw-bench.c
index a12d7387..05ca66f1 100644
--- a/MasterPassword/C/mpw-bench.c
+++ b/MasterPassword/C/mpw-bench.c
@@ -15,7 +15,6 @@
 #include <scrypt/sha256.h>
 #include <bcrypt/ow-crypt.h>
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 
diff --git a/MasterPassword/C/mpw-cli.c b/MasterPassword/C/mpw-cli.c
index 74f19744..3f651baa 100644
--- a/MasterPassword/C/mpw-cli.c
+++ b/MasterPassword/C/mpw-cli.c
@@ -15,7 +15,6 @@
 
 #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 
diff --git a/MasterPassword/C/mpw-tests.c b/MasterPassword/C/mpw-tests.c
index 4fbfa6ad..8755bd59 100644
--- a/MasterPassword/C/mpw-tests.c
+++ b/MasterPassword/C/mpw-tests.c
@@ -5,7 +5,6 @@
 
 #define ftl(...) do { fprintf( stderr, __VA_ARGS__ ); exit(2); } while (0)
 
-#include "mpw-types.h"
 #include "mpw-algorithm.h"
 #include "mpw-util.h"
 
diff --git a/MasterPassword/C/mpw-types.h b/MasterPassword/C/mpw-types.h
index 9f376bbb..2b17394d 100644
--- a/MasterPassword/C/mpw-types.h
+++ b/MasterPassword/C/mpw-types.h
@@ -7,6 +7,7 @@
 //
 
 #include <stdlib.h>
+#include <stdint.h>
 
 #ifdef NS_ENUM
 #define enum(_type, _name) NS_ENUM(_type, _name)
diff --git a/MasterPassword/C/mpw-util.h b/MasterPassword/C/mpw-util.h
index 8a9bc210..41eb6d8a 100644
--- a/MasterPassword/C/mpw-util.h
+++ b/MasterPassword/C/mpw-util.h
@@ -6,6 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
+#include <stdint.h>
+
 //// Logging.
 
 #ifdef DEBUG