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