Assume that NSS headers are under nss/.

client/PasswordListener.c

@@ -31,7 +31,7 @@
 
 #include <prerror.h>
 
-#include <ssl.h>
+#include <nss/ssl.h>
 
 #include <misc/offset.h>
 #include <misc/byteorder.h>

client/PasswordListener.h

@@ -39,8 +39,8 @@
 
 #include <prio.h>
 
-#include <cert.h>
-#include <keyhi.h>
+#include <nss/cert.h>
+#include <nss/keyhi.h>
 
 #include <misc/debug.h>
 #include <misc/sslsocket.h>

client/PeerChat.c

@@ -29,8 +29,8 @@
 
 #include <string.h>
 
-#include <ssl.h>
-#include <sslerr.h>
+#include <nss/ssl.h>
+#include <nss/sslerr.h>
 
 #include <misc/byteorder.h>
 #include <security/BRandom.h>

client/PeerChat.h

@@ -30,8 +30,8 @@
 #ifndef BADVPN_PEERCHAT_H
 #define BADVPN_PEERCHAT_H
 
-#include <cert.h>
-#include <keyhi.h>
+#include <nss/cert.h>
+#include <nss/keyhi.h>
 
 #include <protocol/packetproto.h>
 #include <protocol/scproto.h>

client/StreamPeerIO.c

@@ -29,8 +29,8 @@
 
 #include <stdlib.h>
 
-#include <ssl.h>
-#include <sslerr.h>
+#include <nss/ssl.h>
+#include <nss/sslerr.h>
 
 #include <misc/offset.h>
 #include <misc/byteorder.h>

client/StreamPeerIO.h

@@ -36,8 +36,8 @@
 
 #include <stdint.h>
 
-#include <cert.h>
-#include <keyhi.h>
+#include <nss/cert.h>
+#include <nss/keyhi.h>
 
 #include <misc/debug.h>
 #include <base/DebugObject.h>

cmake/modules/FindNSS.cmake

@@ -20,7 +20,7 @@ endif ()
 set(NSS_FOUND FALSE)
 
 if (WIN32)
-    find_path(NSS_FIND_INCLUDE_DIR nss.h)
+    find_path(NSS_FIND_INCLUDE_DIR nss/nss.h)
 
     FIND_LIBRARY_WITH_DEBUG(NSS_FIND_LIBRARIES_SSL WIN32_DEBUG_POSTFIX d NAMES ssl3)
     FIND_LIBRARY_WITH_DEBUG(NSS_FIND_LIBRARIES_SMIME WIN32_DEBUG_POSTFIX d NAMES smime3)

misc/nsskey.h

@@ -37,9 +37,9 @@
 #include <stdlib.h>
 
 #include <prerror.h>
-#include <cert.h>
-#include <keyhi.h>
-#include <pk11func.h>
+#include <nss/cert.h>
+#include <nss/keyhi.h>
+#include <nss/pk11func.h>
 
 #include <base/BLog.h>
 

nspr_support/BSSLConnection.c

@@ -28,7 +28,7 @@
  */
 
 #include <prerror.h>
-#include <ssl.h>
+#include <nss/ssl.h>
 
 #include <string.h>
 #include <stdlib.h>

nspr_support/BSSLConnection.h

@@ -31,7 +31,7 @@
 #define BADVPN_BSSLCONNECTION_H
 
 #include <prio.h>
-#include <ssl.h>
+#include <nss/ssl.h>
 
 #include <misc/debug.h>
 #include <misc/debugerror.h>

server/server.c

@@ -38,11 +38,11 @@
 #include <prio.h>
 #include <prerror.h>
 #include <prtypes.h>
-#include <nss.h>
-#include <ssl.h>
-#include <cert.h>
-#include <keyhi.h>
-#include <secasn1.h>
+#include <nss/nss.h>
+#include <nss/ssl.h>
+#include <nss/cert.h>
+#include <nss/keyhi.h>
+#include <nss/secasn1.h>
 
 // BadVPN
 #include <misc/version.h>

server_connection/ServerConnection.h

@@ -40,11 +40,11 @@
 #include <prio.h>
 #include <prerror.h>
 #include <prtypes.h>
-#include <nss.h>
-#include <ssl.h>
-#include <pk11func.h>
-#include <cert.h>
-#include <keyhi.h>
+#include <nss/nss.h>
+#include <nss/ssl.h>
+#include <nss/pk11func.h>
+#include <nss/cert.h>
+#include <nss/keyhi.h>
 
 #include <misc/debug.h>
 #include <misc/debugerror.h>