diff --git a/examples/consumer-with-timer.cpp b/examples/consumer-with-timer.cpp
index 8c82cf6..fc43044 100644
--- a/examples/consumer-with-timer.cpp
+++ b/examples/consumer-with-timer.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -27,9 +27,11 @@
 #include "face.hpp"
 #include "util/scheduler.hpp"
 
+#include <iostream>
+
 // Enclosing code in ndn simplifies coding (can also use `using namespace ndn`)
 namespace ndn {
-// Additional nested namespace could be used to prevent/limit name contentions
+// Additional nested namespaces can be used to prevent/limit name conflicts
 namespace examples {
 
 class ConsumerWithTimer : noncopyable
@@ -111,8 +113,6 @@
   Scheduler m_scheduler;
 };
 
-
-
 } // namespace examples
 } // namespace ndn
 
diff --git a/examples/consumer.cpp b/examples/consumer.cpp
index 0e0ff43..dfb6955 100644
--- a/examples/consumer.cpp
+++ b/examples/consumer.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2016 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -25,9 +25,11 @@
 // #include <ndn-cxx/face.hpp>
 #include "face.hpp"
 
+#include <iostream>
+
 // Enclosing code in ndn simplifies coding (can also use `using namespace ndn`)
 namespace ndn {
-// Additional nested namespace could be used to prevent/limit name contentions
+// Additional nested namespaces can be used to prevent/limit name conflicts
 namespace examples {
 
 class Consumer : noncopyable
diff --git a/examples/producer.cpp b/examples/producer.cpp
index 81df7df..278cc96 100644
--- a/examples/producer.cpp
+++ b/examples/producer.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+/*
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -24,13 +24,14 @@
 // correct way to include ndn-cxx headers
 // #include <ndn-cxx/face.hpp>
 // #include <ndn-cxx/security/key-chain.hpp>
-
 #include "face.hpp"
 #include "security/key-chain.hpp"
 
+#include <iostream>
+
 // Enclosing code in ndn simplifies coding (can also use `using namespace ndn`)
 namespace ndn {
-// Additional nested namespace could be used to prevent/limit name contentions
+// Additional nested namespaces can be used to prevent/limit name conflicts
 namespace examples {
 
 class Producer : noncopyable
diff --git a/src/util/logging.cpp b/src/util/logging.cpp
index 13fd36d..9961598 100644
--- a/src/util/logging.cpp
+++ b/src/util/logging.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
@@ -23,10 +23,12 @@
 #include "logger.hpp"
 
 #include <boost/log/expressions.hpp>
-#include <boost/range/algorithm/copy.hpp>
 #include <boost/range/adaptor/map.hpp>
+#include <boost/range/algorithm/copy.hpp>
+
 #include <cstdlib>
-#include <fstream>
+#include <iostream>
+#include <sstream>
 
 namespace ndn {
 namespace util {
diff --git a/tests/integrated/encoding-benchmark.cpp b/tests/integrated/encoding-benchmark.cpp
index bd24f77..d18fa29 100644
--- a/tests/integrated/encoding-benchmark.cpp
+++ b/tests/integrated/encoding-benchmark.cpp
@@ -27,9 +27,12 @@
 
 #include "boost-test.hpp"
 #include "timed-execute.hpp"
+
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
 
+#include <iostream>
+
 namespace ndn {
 namespace tlv {
 namespace tests {
diff --git a/tests/integrated/scheduler-benchmark.cpp b/tests/integrated/scheduler-benchmark.cpp
index 3074d22..5fa57b7 100644
--- a/tests/integrated/scheduler-benchmark.cpp
+++ b/tests/integrated/scheduler-benchmark.cpp
@@ -28,6 +28,8 @@
 #include "boost-test.hpp"
 #include "timed-execute.hpp"
 
+#include <iostream>
+
 namespace ndn {
 namespace util {
 namespace scheduler {
diff --git a/tools/ndnsec/util.hpp b/tools/ndnsec/util.hpp
index 0173b51..cb95718 100644
--- a/tools/ndnsec/util.hpp
+++ b/tools/ndnsec/util.hpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
@@ -164,13 +164,13 @@
       *m_store = *val;
   }
 
-#if BOOST_VERSION >= 105900
+#if (BOOST_VERSION >= 105900) && (BOOST_VERSION < 106500)
   bool
   adjacent_tokens_only() const final
   {
     return false;
   }
-#endif // BOOST_VERSION >= 105900
+#endif // (BOOST_VERSION >= 105900) && (BOOST_VERSION < 106500)
 
 private:
   T* m_store;