diff --git a/tools/dump/ndndump.cpp b/tools/dump/ndndump.cpp
index e018cd6..cf8f839 100644
--- a/tools/dump/ndndump.cpp
+++ b/tools/dump/ndndump.cpp
@@ -1,5 +1,22 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
+ * Copyright (c) 2014-2015,  Regents of the University of California.
+ *
+ * This file is part of ndn-tools (Named Data Networking Essential Tools).
+ * See AUTHORS.md for complete list of ndn-tools authors and contributors.
+ *
+ * ndn-tools is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * ndn-tools is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ndn-tools, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/**
  * Copyright (c) 2011-2014, Regents of the University of California,
  *
  * This file is part of ndndump, the packet capture and analysis tool for Named Data
@@ -19,22 +36,19 @@
 
 #include "ndndump.hpp"
 
-#include "config.hpp"
-
 #include "tcpdump/tcpdump-stdinc.h"
 
 namespace ndn {
-namespace tools {
-// namespace is necessary for now to prevent clashing with system includes
-// this will not be needed after ndn-cxx/common.hpp will stop including <boost/asio.hpp>
+namespace dump {
+// namespace is necessary to prevent clashing with system includes
 
 #include "tcpdump/ether.h"
 #include "tcpdump/ip.h"
 #include "tcpdump/udp.h"
 #include "tcpdump/tcp.h"
 
-} // namespace tools
 } // namespace ndn
+} // namespace dump
 
 #include <boost/lexical_cast.hpp>
 
@@ -44,7 +58,7 @@
 #include <ndn-cxx/data.hpp>
 
 namespace ndn {
-namespace tools {
+namespace dump {
 
 // const uint8_t NDNLP_HEADER[] = {'N', 'd', 'n', 'l', 'p'};
 
@@ -334,5 +348,5 @@
   return 0;
 }
 
-} // namespace tools
+} // namespace dump
 } // namespace ndn