diff --git a/crypto777/nanosrc/aio/usock_posix.h b/crypto777/nanosrc/aio/usock_posix.h
index de3095f20..9286dcf24 100755
--- a/crypto777/nanosrc/aio/usock_posix.h
+++ b/crypto777/nanosrc/aio/usock_posix.h
@@ -25,11 +25,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-//#ifndef __PNACL
 #include <sys/uio.h>
-//#else
-//#include <glibc-compat/sys/uio.h>
-#endif
 
 struct nn_usock {
 
diff --git a/crypto777/nanosrc/devices/tcpmuxd.c b/crypto777/nanosrc/devices/tcpmuxd.c
index aea9c5139..ba2ba3a23 100755
--- a/crypto777/nanosrc/devices/tcpmuxd.c
+++ b/crypto777/nanosrc/devices/tcpmuxd.c
@@ -53,12 +53,7 @@ int nn_tcpmuxd (int port)
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <sys/time.h>
-//#ifndef __PNACL
 #include <sys/un.h>
-//#else
-//#include <glibc-compat/sys/un.h>
-//#include <glibc-compat/sys/uio.h>
-//#endif
 #include <stddef.h>
 #include <ctype.h>
 #include <poll.h>
diff --git a/crypto777/nanosrc/nn_config.h b/crypto777/nanosrc/nn_config.h
index f25bb74f7..52c9107c4 100755
--- a/crypto777/nanosrc/nn_config.h
+++ b/crypto777/nanosrc/nn_config.h
@@ -47,23 +47,12 @@
 #define NN_HAVE_MSG_CONTROL 0
 //#define STANDALONE 1
 
-#ifdef __PNACL
-//#define FD_CLOEXEC 1
-
-#define PNACL_message printf
-//void PNACL_message(const char* format, ...);
-#include <sys/uio.h>
-#include <sys/un.h>
-//#include <glibc-compat/sys/uio.h>
-//#include <glibc-compat/sys/un.h>
-#else
 #if !defined(WIN32)
 //#define NN_ENABLE_EXTRA 1
 #define PNACL_message printf
 #include <sys/uio.h>
 #include <sys/un.h>
 #endif
-#endif
 
 /*  Size of the buffer used for batch-reads of inbound data. To keep the
  performance optimal make sure that this value is larger than network MTU. */
diff --git a/crypto777/nanosrc/tests/testutil.h b/crypto777/nanosrc/tests/testutil.h
index fd3d5b68c..04d26edbb 100755
--- a/crypto777/nanosrc/tests/testutil.h
+++ b/crypto777/nanosrc/tests/testutil.h
@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef __PNACL
-#define printf PostMessage
-#endif
+//#ifdef __PNACL
+//#define printf PostMessage
+//#endif
 
 #include "../utils/attr.h"
 #include "../utils/err.h"
diff --git a/crypto777/nanosrc/transports/ipc/bipc.c b/crypto777/nanosrc/transports/ipc/bipc.c
index 6dac6eae1..8527e45a6 100755
--- a/crypto777/nanosrc/transports/ipc/bipc.c
+++ b/crypto777/nanosrc/transports/ipc/bipc.c
@@ -39,12 +39,8 @@
 #include "../../utils/win.h"
 #else
 #include <unistd.h>
-//#ifndef __PNACL
 #include <sys/uio.h>
 #include <sys/un.h>
-//#else
-//#include <glibc-compat/sys/un.h>
-//#endif
 #include <fcntl.h>
 #endif
 
diff --git a/crypto777/nanosrc/transports/ipc/cipc.c b/crypto777/nanosrc/transports/ipc/cipc.c
index 95dbea034..1f6c3b7de 100755
--- a/crypto777/nanosrc/transports/ipc/cipc.c
+++ b/crypto777/nanosrc/transports/ipc/cipc.c
@@ -39,13 +39,8 @@
 #include "../../utils/win.h"
 #else
 #include <unistd.h>
-//#ifndef __PNACL
 #include <sys/uio.h>
 #include <sys/un.h>
-//#else
-//#include <glibc-compat/sys/uio.h>
-//#include <glibc-compat/sys/un.h>
-//#endif
 #endif
 
 #define NN_CIPC_STATE_IDLE 1
diff --git a/crypto777/nanosrc/transports/ipc/ipc.c b/crypto777/nanosrc/transports/ipc/ipc.c
index 444db69fb..45d3851ce 100755
--- a/crypto777/nanosrc/transports/ipc/ipc.c
+++ b/crypto777/nanosrc/transports/ipc/ipc.c
@@ -37,11 +37,7 @@
 #include "../../utils/win.h"
 #else
 #include <sys/socket.h>
-//#ifndef __PNACL
 #include <sys/uio.h>
-//#else
-//#include <glibc-compat/sys/un.h>
-//#endif
 #include <unistd.h>
 #endif
 
diff --git a/crypto777/nanosrc/transports/tcpmux/btcpmux.c b/crypto777/nanosrc/transports/tcpmux/btcpmux.c
index 8093b611b..2dd554272 100755
--- a/crypto777/nanosrc/transports/tcpmux/btcpmux.c
+++ b/crypto777/nanosrc/transports/tcpmux/btcpmux.c
@@ -44,12 +44,8 @@
 #include "../../utils/win.h"
 #else
 #include <unistd.h>
-//#ifndef __PNACL
 #include <sys/uio.h>
 #include <sys/un.h>
-//#else
-//#include <glibc-compat/sys/un.h>
-//#endif
 #include <arpa/inet.h>
 #endif
 
diff --git a/crypto777/nanosrc/transports/utils/tcpmux.c b/crypto777/nanosrc/transports/utils/tcpmux.c
index 1b8b03942..b6cd7c24b 100755
--- a/crypto777/nanosrc/transports/utils/tcpmux.c
+++ b/crypto777/nanosrc/transports/utils/tcpmux.c
@@ -28,11 +28,7 @@
 #else
 #include <unistd.h>
 #include <sys/socket.h>
-//#ifndef __PNACL
 #include <sys/un.h>
-//#else
-//#include <glibc-compat/sys/un.h>
-//#endif
 #endif
 
 #include "tcpmux.h"