diff --git a/tools/ndngetfile.cpp b/tools/ndngetfile.cpp
index 1f59a36..125eab0 100644
--- a/tools/ndngetfile.cpp
+++ b/tools/ndngetfile.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017, Regents of the University of California.
  *
  * This file is part of NDN repo-ng (Next generation of NDN repository).
@@ -18,8 +18,11 @@
  */
 
 #include "ndngetfile.hpp"
-#include <boost/lexical_cast.hpp>
+
 #include <fstream>
+#include <iostream>
+
+#include <boost/lexical_cast.hpp>
 
 namespace repo {
 
diff --git a/tools/ndnputfile.cpp b/tools/ndnputfile.cpp
index 078be77..908a885 100644
--- a/tools/ndnputfile.cpp
+++ b/tools/ndnputfile.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017, Regents of the University of California.
  *
  * This file is part of NDN repo-ng (Next generation of NDN repository).
@@ -24,10 +24,14 @@
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/security/signing-helpers.hpp>
 #include <ndn-cxx/util/scheduler.hpp>
-#include <fstream>
-#include <string>
-#include <stdlib.h>
+
 #include <stdint.h>
+#include <stdlib.h>
+
+#include <fstream>
+#include <iostream>
+#include <string>
+
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/asio.hpp>
diff --git a/tools/ndnrepowatch.cpp b/tools/ndnrepowatch.cpp
index 4d2d9c5..63a26ca 100644
--- a/tools/ndnrepowatch.cpp
+++ b/tools/ndnrepowatch.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017, Regents of the University of California.
  *
  * This file is part of NDN repo-ng (Next generation of NDN repository).
@@ -24,10 +24,13 @@
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/security/signing-helpers.hpp>
 #include <ndn-cxx/util/scheduler.hpp>
-#include <fstream>
-#include <string>
-#include <stdlib.h>
+
 #include <stdint.h>
+#include <stdlib.h>
+
+#include <fstream>
+#include <iostream>
+#include <string>
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/tools/repo-ng-ls.cpp b/tools/repo-ng-ls.cpp
index 3a916a3..1dc4410 100644
--- a/tools/repo-ng-ls.cpp
+++ b/tools/repo-ng-ls.cpp
@@ -1,5 +1,5 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
  * Copyright (c) 2014-2017, Regents of the University of California.
  *
  * This file is part of NDN repo-ng (Next generation of NDN repository).
@@ -19,10 +19,14 @@
 
 #include "../src/common.hpp"
 #include "config.hpp"
+
+#include <iostream>
 #include <string>
-#include <sqlite3.h>
-#include <boost/property_tree/ptree.hpp>
+
 #include <boost/property_tree/info_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <sqlite3.h>
 
 namespace repo {