diff --git a/MasterPassword/C/mpw-algorithm_v0.c b/MasterPassword/C/mpw-algorithm_v0.c
index 7b8d1657..3873a9ff 100644
--- a/MasterPassword/C/mpw-algorithm_v0.c
+++ b/MasterPassword/C/mpw-algorithm_v0.c
@@ -6,11 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
-#include <objc/message.h>
 
 #include "mpw-types.h"
 #include "mpw-util.h"
diff --git a/MasterPassword/C/mpw-algorithm_v1.c b/MasterPassword/C/mpw-algorithm_v1.c
index 74923b9f..300002f5 100644
--- a/MasterPassword/C/mpw-algorithm_v1.c
+++ b/MasterPassword/C/mpw-algorithm_v1.c
@@ -6,10 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 
 #include "mpw-types.h"
 #include "mpw-util.h"
diff --git a/MasterPassword/C/mpw-algorithm_v2.c b/MasterPassword/C/mpw-algorithm_v2.c
index 123d5e66..25153b72 100644
--- a/MasterPassword/C/mpw-algorithm_v2.c
+++ b/MasterPassword/C/mpw-algorithm_v2.c
@@ -6,10 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 
 #include "mpw-types.h"
 #include "mpw-util.h"
diff --git a/MasterPassword/C/mpw-algorithm_v3.c b/MasterPassword/C/mpw-algorithm_v3.c
index a9ed37e0..30a21516 100644
--- a/MasterPassword/C/mpw-algorithm_v3.c
+++ b/MasterPassword/C/mpw-algorithm_v3.c
@@ -6,10 +6,8 @@
 //  Copyright (c) 2014 Lyndir. All rights reserved.
 //
 
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 
 #include "mpw-types.h"
 #include "mpw-util.h"
diff --git a/MasterPassword/C/mpw-bench.c b/MasterPassword/C/mpw-bench.c
index 987d6b74..67e6aaa5 100644
--- a/MasterPassword/C/mpw-bench.c
+++ b/MasterPassword/C/mpw-bench.c
@@ -16,7 +16,6 @@
 #include <bcrypt/ow-crypt.h>
 
 #include "mpw-algorithm.h"
-#include "mpw-util.h"
 
 #define MP_N                32768
 #define MP_r                8
diff --git a/MasterPassword/C/mpw-tests-util.c b/MasterPassword/C/mpw-tests-util.c
index 1636f994..1ae59c63 100644
--- a/MasterPassword/C/mpw-tests-util.c
+++ b/MasterPassword/C/mpw-tests-util.c
@@ -69,7 +69,7 @@ xmlChar *mpw_xmlTestCaseString(xmlNodePtr context, const char *nodeName) {
 uint32_t mpw_xmlTestCaseInteger(xmlNodePtr context, const char *nodeName) {
 
     xmlChar *string = mpw_xmlTestCaseString( context, nodeName );
-    uint32_t integer = atol( (char *)string );
+    uint32_t integer = (uint32_t)atol( (char *)string );
     xmlFree( string );
 
     return integer;