diff --git a/include/ndn-cpp/encoding/tlv.hpp b/include/ndn-cpp/encoding/tlv.hpp
index 0edf94a..fabf571 100644
--- a/include/ndn-cpp/encoding/tlv.hpp
+++ b/include/ndn-cpp/encoding/tlv.hpp
@@ -10,6 +10,7 @@
 #ifndef NDN_TLV_HPP
 #define NDN_TLV_HPP
 
+#include <stdexcept>
 #include "buffer.hpp"
 #include "endian.h"
 
diff --git a/include/ndn-cpp/security/certificate/public-key.hpp b/include/ndn-cpp/security/certificate/public-key.hpp
index 1fac1ec..ed0687a 100644
--- a/include/ndn-cpp/security/certificate/public-key.hpp
+++ b/include/ndn-cpp/security/certificate/public-key.hpp
@@ -9,6 +9,7 @@
 #ifndef NDN_PUBLIC_KEY_HPP
 #define NDN_PUBLIC_KEY_HPP
 
+#include <stdexcept>
 #include "../../encoding/oid.hpp"
 #include "../../encoding/buffer.hpp"
 #include "../security-common.hpp"
diff --git a/src/encoding/cryptopp/asn_ext.hpp b/src/encoding/cryptopp/asn_ext.hpp
index c698495..57538f4 100644
--- a/src/encoding/cryptopp/asn_ext.hpp
+++ b/src/encoding/cryptopp/asn_ext.hpp
@@ -16,12 +16,13 @@
 #pragma clang diagnostic ignored "-Wunused-variable"
 #pragma clang diagnostic ignored "-Wunused-function"
 #elif __GNUC__
-#pragma GCC diagnostic ignored "-Wreorder"
-#pragma GCC diagnostic ignored "-Wtautological-compare"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wreorder" 
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
 
+#include <stdexcept>
 #include <ndn-cpp/common.hpp>
 #include <cryptopp/asn.h>
 
diff --git a/src/interest.cpp b/src/interest.cpp
index b9048ed..c9be23d 100644
--- a/src/interest.cpp
+++ b/src/interest.cpp
@@ -17,7 +17,6 @@
 #pragma clang diagnostic ignored "-Wunused-function"
 #elif __GNUC__
 #pragma GCC diagnostic ignored "-Wreorder"
-#pragma GCC diagnostic ignored "-Wtautological-compare"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
diff --git a/src/security/certificate/certificate-extension.cpp b/src/security/certificate/certificate-extension.cpp
index e2636db..daa1e52 100644
--- a/src/security/certificate/certificate-extension.cpp
+++ b/src/security/certificate/certificate-extension.cpp
@@ -14,7 +14,6 @@
 #pragma clang diagnostic ignored "-Wunused-function"
 #elif __GNUC__
 #pragma GCC diagnostic ignored "-Wreorder"
-#pragma GCC diagnostic ignored "-Wtautological-compare"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
diff --git a/src/security/certificate/certificate-subject-description.cpp b/src/security/certificate/certificate-subject-description.cpp
index c91cb6a..ed62b82 100644
--- a/src/security/certificate/certificate-subject-description.cpp
+++ b/src/security/certificate/certificate-subject-description.cpp
@@ -14,7 +14,6 @@
 #pragma clang diagnostic ignored "-Wunused-function"
 #elif __GNUC__
 #pragma GCC diagnostic ignored "-Wreorder"
-#pragma GCC diagnostic ignored "-Wtautological-compare"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
diff --git a/src/security/certificate/certificate.cpp b/src/security/certificate/certificate.cpp
index 73827a3..1708f70 100644
--- a/src/security/certificate/certificate.cpp
+++ b/src/security/certificate/certificate.cpp
@@ -14,7 +14,6 @@
 #pragma clang diagnostic ignored "-Wunused-function"
 #elif __GNUC__
 #pragma GCC diagnostic ignored "-Wreorder"
-#pragma GCC diagnostic ignored "-Wtautological-compare"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
diff --git a/src/security/certificate/public-key.cpp b/src/security/certificate/public-key.cpp
index 6666783..3d178d0 100644
--- a/src/security/certificate/public-key.cpp
+++ b/src/security/certificate/public-key.cpp
@@ -14,7 +14,6 @@
 #pragma clang diagnostic ignored "-Wunused-function"
 #elif __GNUC__
 #pragma GCC diagnostic ignored "-Wreorder"
-#pragma GCC diagnostic ignored "-Wtautological-compare"
 #pragma GCC diagnostic ignored "-Wunused-variable"
 #pragma GCC diagnostic ignored "-Wunused-function"
 #endif
diff --git a/src/transport/unix-transport.cpp b/src/transport/unix-transport.cpp
index dd81109..0463916 100644
--- a/src/transport/unix-transport.cpp
+++ b/src/transport/unix-transport.cpp
@@ -10,7 +10,7 @@
 
 #include <ndn-cpp/face.hpp>
 #include <ndn-cpp/transport/unix-transport.hpp>
-#include <ndn-cpp/c/util/ndn_memory.h>
+#include "../c/util/ndn_memory.h"
 
 #include <boost/asio.hpp>
 #if NDN_CPP_HAVE_CXX11
diff --git a/src/util/time.hpp b/src/util/time.hpp
index 16bc4db..90482d9 100644
--- a/src/util/time.hpp
+++ b/src/util/time.hpp
@@ -9,7 +9,7 @@
 #define NDN_TIME_HPP
 
 #include <stdexcept>
-#include <ndn-cpp/c/util/time.h>
+#include "../c/util/time.h"
 
 namespace ndn {