diff --git a/cf-monitord/proc_net_parsing.c b/cf-monitord/proc_net_parsing.c
index b346ab00e3..c97378db51 100644
--- a/cf-monitord/proc_net_parsing.c
+++ b/cf-monitord/proc_net_parsing.c
@@ -23,6 +23,7 @@
 */
 
 #include <stdio.h>
+#include <string.h>						/* strchr() */
 #include <arpa/inet.h>
 
 #include <logging.h>
diff --git a/libntech b/libntech
index b6245f15b5..8fbfbfbcc9 160000
--- a/libntech
+++ b/libntech
@@ -1 +1 @@
-Subproject commit b6245f15b5752ce14060d94bb05b4907d247373c
+Subproject commit 8fbfbfbcc9b37b3d82adee5d66ecadec77340031
diff --git a/libpromises/extensions.c b/libpromises/extensions.c
index 78b8c4c410..0c95039887 100644
--- a/libpromises/extensions.c
+++ b/libpromises/extensions.c
@@ -22,8 +22,13 @@
   included file COSL.txt.
 */
 
+#include <platform.h>
 #include <enterprise_extension.h>
 
+#include <stdio.h>						/* sscanf() */
+#include <stdlib.h>						/* getenv() */
+#include <string.h>						/* strcmp() */
+
 #include <known_dirs.h>
 #include <misc_lib.h>
 
diff --git a/libpromises/extensions_template.c.pre b/libpromises/extensions_template.c.pre
index 08b6e782d2..e06ededf9c 100644
--- a/libpromises/extensions_template.c.pre
+++ b/libpromises/extensions_template.c.pre
@@ -26,6 +26,9 @@ BEGIN_MARKER // Do not include this file directly! Build process should replace
 
 #include <XextensionX_extension.h>
 
+#include <stdlib.h>             /* getenv() */
+#include <string.h>             /* strerror() */
+
 #include <logging.h>
 
 #include <pthread.h>
diff --git a/libpromises/extensions_template.h.pre b/libpromises/extensions_template.h.pre
index b46a2715f2..228f3b256c 100644
--- a/libpromises/extensions_template.h.pre
+++ b/libpromises/extensions_template.h.pre
@@ -91,6 +91,7 @@ BEGIN_MARKER // Do not include this file directly! Build process should replace
 #ifndef xEXTENSIONx_EXTENSION_H
 #define xEXTENSIONx_EXTENSION_H
 
+#include <platform.h>
 #include <extensions.h>
 
 #include <logging.h>
diff --git a/libpromises/shared_lib.c b/libpromises/shared_lib.c
index dc46129b2f..6d0f3da702 100644
--- a/libpromises/shared_lib.c
+++ b/libpromises/shared_lib.c
@@ -24,9 +24,12 @@
 
 #ifndef __MINGW32__
 
+#include <platform.h>
 #include <shared_lib.h>
 #include <logging.h>
 #include <mutex.h>
+#include <pthread.h>
+#include <sys/stat.h>
 
 #include <dlfcn.h>