diff --git a/src/exclude.cpp b/src/exclude.cpp
index 88e51db..900d933 100644
--- a/src/exclude.cpp
+++ b/src/exclude.cpp
@@ -25,6 +25,7 @@
 #include "encoding/block-helpers.hpp"
 
 #include <boost/range/adaptor/reversed.hpp>
+#include <sstream>
 
 namespace ndn {
 
diff --git a/src/exclude.hpp b/src/exclude.hpp
index 23dac46..e3494f2 100644
--- a/src/exclude.hpp
+++ b/src/exclude.hpp
@@ -27,7 +27,6 @@
 #include "name-component.hpp"
 #include "encoding/encoding-buffer.hpp"
 
-#include <sstream>
 #include <map>
 
 namespace ndn {
diff --git a/src/interest.cpp b/src/interest.cpp
index 3f8352b..26b564e 100644
--- a/src/interest.cpp
+++ b/src/interest.cpp
@@ -24,6 +24,7 @@
 #include "data.hpp"
 
 #include <cstring>
+#include <sstream>
 
 namespace ndn {
 
@@ -169,6 +170,14 @@
   }
 }
 
+std::string
+Interest::toUri() const
+{
+  std::ostringstream os;
+  os << *this;
+  return os.str();
+}
+
 // ---- matching ----
 
 bool
diff --git a/src/interest.hpp b/src/interest.hpp
index 1ee2cda..121541b 100644
--- a/src/interest.hpp
+++ b/src/interest.hpp
@@ -341,14 +341,6 @@
 std::ostream&
 operator<<(std::ostream& os, const Interest& interest);
 
-inline std::string
-Interest::toUri() const
-{
-  std::ostringstream os;
-  os << *this;
-  return os.str();
-}
-
 inline bool
 operator==(const Interest& lhs, const Interest& rhs)
 {
diff --git a/src/name-component.cpp b/src/name-component.cpp
index 045d5f2..6bccced 100644
--- a/src/name-component.cpp
+++ b/src/name-component.cpp
@@ -31,6 +31,7 @@
 #include "util/string-helper.hpp"
 
 #include <boost/algorithm/string/trim.hpp>
+#include <sstream>
 
 namespace ndn {
 namespace name {
diff --git a/src/net/face-uri.cpp b/src/net/face-uri.cpp
index d550fd5..11e4fe5 100644
--- a/src/net/face-uri.cpp
+++ b/src/net/face-uri.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,
  *                         Arizona Board of Regents,
  *                         Colorado State University,
@@ -33,6 +33,7 @@
 #include <boost/mpl/for_each.hpp>
 #include <boost/regex.hpp>
 #include <set>
+#include <sstream>
 
 namespace ndn {
 
diff --git a/src/security/transform/stream-sink.cpp b/src/security/transform/stream-sink.cpp
index 58208c0..543e532 100644
--- a/src/security/transform/stream-sink.cpp
+++ b/src/security/transform/stream-sink.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).
  *
@@ -21,6 +21,8 @@
 
 #include "stream-sink.hpp"
 
+#include <ostream>
+
 namespace ndn {
 namespace security {
 namespace transform {
diff --git a/src/security/transform/stream-sink.hpp b/src/security/transform/stream-sink.hpp
index f384dc4..ae5d567 100644
--- a/src/security/transform/stream-sink.hpp
+++ b/src/security/transform/stream-sink.hpp
@@ -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).
  *
@@ -23,7 +23,6 @@
 #define NDN_CXX_SECURITY_TRANSFORM_STREAM_SINK_HPP
 
 #include "transform-base.hpp"
-#include <iostream>
 
 namespace ndn {
 namespace security {
diff --git a/src/security/transform/stream-source.cpp b/src/security/transform/stream-source.cpp
index 539506e..33b26ae 100644
--- a/src/security/transform/stream-source.cpp
+++ b/src/security/transform/stream-source.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).
  *
@@ -20,6 +20,8 @@
  */
 
 #include "stream-source.hpp"
+
+#include <istream>
 #include <vector>
 
 namespace ndn {
diff --git a/src/security/transform/stream-source.hpp b/src/security/transform/stream-source.hpp
index 5dcefdd..d19daec 100644
--- a/src/security/transform/stream-source.hpp
+++ b/src/security/transform/stream-source.hpp
@@ -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).
  *
@@ -23,7 +23,6 @@
 #define NDN_CXX_SECURITY_TRANSFORM_STREAM_SOURCE_HPP
 
 #include "transform-base.hpp"
-#include <iostream>
 
 namespace ndn {
 namespace security {
diff --git a/src/util/io.hpp b/src/util/io.hpp
index cad5a26..5a8034a 100644
--- a/src/util/io.hpp
+++ b/src/util/io.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).
@@ -25,7 +25,6 @@
 #include "concepts.hpp"
 #include "../encoding/block.hpp"
 
-#include <iostream>
 #include <fstream>
 
 namespace ndn {
diff --git a/src/util/time.cpp b/src/util/time.cpp
index 8452075..6f669cb 100644
--- a/src/util/time.cpp
+++ b/src/util/time.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,6 +23,7 @@
 #include "time-custom-clock.hpp"
 
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <sstream>
 
 namespace ndn {
 namespace time {
diff --git a/tests/unit-tests/encoding/nfd-constants.t.cpp b/tests/unit-tests/encoding/nfd-constants.t.cpp
index c3fe54a..9a354fa 100644
--- a/tests/unit-tests/encoding/nfd-constants.t.cpp
+++ b/tests/unit-tests/encoding/nfd-constants.t.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).
@@ -22,7 +22,9 @@
 #include "encoding/nfd-constants.hpp"
 
 #include "boost-test.hpp"
+
 #include <boost/lexical_cast.hpp>
+#include <sstream>
 
 namespace ndn {
 namespace nfd {
diff --git a/tests/unit-tests/encoding/tlv.t.cpp b/tests/unit-tests/encoding/tlv.t.cpp
index 8138e8a..52b46ad 100644
--- a/tests/unit-tests/encoding/tlv.t.cpp
+++ b/tests/unit-tests/encoding/tlv.t.cpp
@@ -26,6 +26,7 @@
 #include <array>
 #include <deque>
 #include <list>
+#include <sstream>
 #include <boost/concept_archetype.hpp>
 #include <boost/iostreams/stream.hpp>
 #include <boost/iostreams/device/array.hpp>
diff --git a/tests/unit-tests/security/transform/base64-decode.t.cpp b/tests/unit-tests/security/transform/base64-decode.t.cpp
index 05c9e56..a8c2dee 100644
--- a/tests/unit-tests/security/transform/base64-decode.t.cpp
+++ b/tests/unit-tests/security/transform/base64-decode.t.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).
  *
@@ -24,7 +24,6 @@
 #include "security/transform/step-source.hpp"
 #include "security/transform/stream-sink.hpp"
 #include "encoding/buffer-stream.hpp"
-#include <iostream>
 
 #include "boost-test.hpp"
 
@@ -77,7 +76,6 @@
     "AAECAwQFBgcICQoLDA0ODwABAgMEBQYHCAkKCwwNDg8AAQIDBAUGBwgJCgsMDQ4P"
     "AAECAwQFBgcICQoLDA0ODwABAgMEBQYHCAkKCwwNDg8=";
 
-
   uint8_t out[] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
diff --git a/tests/unit-tests/security/transform/base64-encode.t.cpp b/tests/unit-tests/security/transform/base64-encode.t.cpp
index 8d383ab..f0df4e4 100644
--- a/tests/unit-tests/security/transform/base64-encode.t.cpp
+++ b/tests/unit-tests/security/transform/base64-encode.t.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).
  *
@@ -24,7 +24,6 @@
 #include "security/transform/step-source.hpp"
 #include "security/transform/stream-sink.hpp"
 #include "encoding/buffer-stream.hpp"
-#include <iostream>
 
 #include "boost-test.hpp"
 
diff --git a/tests/unit-tests/security/transform/hex-decode.t.cpp b/tests/unit-tests/security/transform/hex-decode.t.cpp
index 4a9c78e..d1e0af3 100644
--- a/tests/unit-tests/security/transform/hex-decode.t.cpp
+++ b/tests/unit-tests/security/transform/hex-decode.t.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).
  *
@@ -24,7 +24,6 @@
 #include "security/transform/step-source.hpp"
 #include "security/transform/stream-sink.hpp"
 #include "encoding/buffer-stream.hpp"
-#include <iostream>
 
 #include "boost-test.hpp"
 
diff --git a/tests/unit-tests/security/transform/hex-encode.t.cpp b/tests/unit-tests/security/transform/hex-encode.t.cpp
index 5edcaaa..527fc75 100644
--- a/tests/unit-tests/security/transform/hex-encode.t.cpp
+++ b/tests/unit-tests/security/transform/hex-encode.t.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).
  *
@@ -24,7 +24,6 @@
 #include "security/transform/step-source.hpp"
 #include "security/transform/stream-sink.hpp"
 #include "encoding/buffer-stream.hpp"
-#include <iostream>
 
 #include "boost-test.hpp"
 
diff --git a/tests/unit-tests/security/transform/private-key.t.cpp b/tests/unit-tests/security/transform/private-key.t.cpp
index f8932de..d1ab196 100644
--- a/tests/unit-tests/security/transform/private-key.t.cpp
+++ b/tests/unit-tests/security/transform/private-key.t.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,11 @@
 #include "security/transform.hpp"
 #include "security/key-params.hpp"
 #include "encoding/buffer-stream.hpp"
-#include <iostream>
 
-#include <boost/mpl/list.hpp>
 #include "boost-test.hpp"
+#include <boost/mpl/list.hpp>
+
+#include <sstream>
 
 namespace ndn {
 namespace security {
diff --git a/tests/unit-tests/security/transform/strip-space.t.cpp b/tests/unit-tests/security/transform/strip-space.t.cpp
index d916f8d..bea3191 100644
--- a/tests/unit-tests/security/transform/strip-space.t.cpp
+++ b/tests/unit-tests/security/transform/strip-space.t.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).
  *
@@ -23,7 +23,6 @@
 #include "security/transform/step-source.hpp"
 #include "security/transform/stream-sink.hpp"
 #include "encoding/buffer-stream.hpp"
-#include <iostream>
 
 #include "boost-test.hpp"
 
diff --git a/tests/unit-tests/util/io.t.cpp b/tests/unit-tests/util/io.t.cpp
index 20e9412..b2ec66b 100644
--- a/tests/unit-tests/util/io.t.cpp
+++ b/tests/unit-tests/util/io.t.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,8 +23,8 @@
 
 #include "boost-test.hpp"
 #include "identity-management-fixture.hpp"
+
 #include <boost/filesystem.hpp>
-#include <fstream>
 
 namespace ndn {
 namespace tests {
diff --git a/tests/unit-tests/util/sha256.t.cpp b/tests/unit-tests/util/sha256.t.cpp
index 6e42201..2fec00f 100644
--- a/tests/unit-tests/util/sha256.t.cpp
+++ b/tests/unit-tests/util/sha256.t.cpp
@@ -25,6 +25,8 @@
 
 #include "boost-test.hpp"
 
+#include <sstream>
+
 namespace ndn {
 namespace util {
 namespace test {