diff --git a/src/transport/stream-transport-impl.hpp b/src/transport/stream-transport-impl.hpp
index c2dab39..c8f1527 100644
--- a/src/transport/stream-transport-impl.hpp
+++ b/src/transport/stream-transport-impl.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).
@@ -24,7 +24,9 @@
 
 #include "transport.hpp"
 
-#include <boost/asio.hpp>
+#include <boost/asio/deadline_timer.hpp>
+#include <boost/asio/write.hpp>
+
 #include <list>
 
 namespace ndn {
@@ -38,7 +40,7 @@
 class StreamTransportImpl : public enable_shared_from_this<StreamTransportImpl<BaseTransport, Protocol>>
 {
 public:
-  typedef StreamTransportImpl<BaseTransport,Protocol> Impl;
+  typedef StreamTransportImpl<BaseTransport, Protocol> Impl;
   typedef std::list<Block> BlockSequence;
   typedef std::list<BlockSequence> TransmissionQueue;
 
diff --git a/src/transport/tcp-transport.hpp b/src/transport/tcp-transport.hpp
index d9ed7f2..6e8977f 100644
--- a/src/transport/tcp-transport.hpp
+++ b/src/transport/tcp-transport.hpp
@@ -25,13 +25,7 @@
 #include "transport.hpp"
 #include "../util/config-file.hpp"
 
-namespace boost {
-namespace asio {
-namespace ip {
-class tcp;
-} // namespace ip
-} // namespace asio
-} // namespace boost
+#include <boost/asio/ip/tcp.hpp>
 
 namespace ndn {
 
diff --git a/src/transport/transport.hpp b/src/transport/transport.hpp
index f656802..b177fad 100644
--- a/src/transport/transport.hpp
+++ b/src/transport/transport.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).
  *
@@ -24,15 +24,10 @@
 
 #include "../common.hpp"
 #include "../encoding/block.hpp"
+#include "../net/asio-fwd.hpp"
 
 #include <boost/system/error_code.hpp>
 
-namespace boost {
-namespace asio {
-class io_service;
-} // namespace asio
-} // namespace boost
-
 namespace ndn {
 
 /** \brief provides TLV-block delivery service
diff --git a/src/transport/unix-transport.hpp b/src/transport/unix-transport.hpp
index d54f02b..d337252 100644
--- a/src/transport/unix-transport.hpp
+++ b/src/transport/unix-transport.hpp
@@ -25,13 +25,7 @@
 #include "transport.hpp"
 #include "../util/config-file.hpp"
 
-namespace boost {
-namespace asio {
-namespace local {
-class stream_protocol;
-} // namespace local
-} // namespace asio
-} // namespace boost
+#include <boost/asio/local/stream_protocol.hpp>
 
 namespace ndn {