diff --git a/src/repo-command-parameter.hpp b/src/repo-command-parameter.hpp
index 3648679..97208b6 100644
--- a/src/repo-command-parameter.hpp
+++ b/src/repo-command-parameter.hpp
@@ -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).
@@ -20,11 +20,12 @@
 #ifndef REPO_REPO_COMMAND_PARAMETER_HPP
 #define REPO_REPO_COMMAND_PARAMETER_HPP
 
+#include "repo-tlv.hpp"
+
 #include <ndn-cxx/encoding/encoding-buffer.hpp>
 #include <ndn-cxx/encoding/block-helpers.hpp>
 #include <ndn-cxx/name.hpp>
 #include <ndn-cxx/selectors.hpp>
-#include "repo-tlv.hpp"
 
 namespace repo {
 
@@ -244,7 +245,7 @@
     return m_hasInterestLifetime;
   }
 
-  template<bool T>
+  template<ndn::encoding::Tag T>
   size_t
   wireEncode(EncodingImpl<T>& block) const;
 
@@ -276,7 +277,7 @@
   mutable Block m_wire;
 };
 
-template<bool T>
+template<ndn::encoding::Tag T>
 inline size_t
 RepoCommandParameter::wireEncode(EncodingImpl<T>& encoder) const
 {