diff --git a/ndn-cpp/encoding/BinaryXMLEncoder.hpp b/ndn-cpp/encoding/BinaryXMLEncoder.hpp
index 1fd4244..0e9e62b 100644
--- a/ndn-cpp/encoding/BinaryXMLEncoder.hpp
+++ b/ndn-cpp/encoding/BinaryXMLEncoder.hpp
@@ -1,7 +1,6 @@
-/* 
- * Author: Jeff Thompson
- *
- * BSD license, See the LICENSE file for more information.
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
 #ifndef NDN_BINARYXMLENCODER_HPP
diff --git a/ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp b/ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp
index 1885cb3..eac9a8d 100644
--- a/ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp
+++ b/ndn-cpp/encoding/BinaryXMLStructureDecoder.hpp
@@ -1,7 +1,6 @@
-/* 
- * Author: Jeff Thompson
- *
- * BSD license, See the LICENSE file for more information.
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
 #ifndef BINARYXMLSTRUCTUREDECODER_HPP
diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp b/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
index e89afaf..714dd1d 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
+++ b/ndn-cpp/encoding/BinaryXMLWireFormat.cpp
@@ -1,7 +1,6 @@
-/* 
- * Author: Jeff Thompson
- *
- * BSD license, See the LICENSE file for more information.
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
 #include <stdexcept>
diff --git a/ndn-cpp/encoding/BinaryXMLWireFormat.hpp b/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
index 418a2ba..3a794c7 100644
--- a/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
+++ b/ndn-cpp/encoding/BinaryXMLWireFormat.hpp
@@ -1,10 +1,8 @@
-/* 
- * Author: Jeff Thompson
- *
- * BSD license, See the LICENSE file for more information.
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
-
 #ifndef NDN_BINARYXMLWIREFORMAT_HPP
 #define	NDN_BINARYXMLWIREFORMAT_HPP
 
diff --git a/ndn-cpp/encoding/WireFormat.cpp b/ndn-cpp/encoding/WireFormat.cpp
index f9694f5..f3906fd 100644
--- a/ndn-cpp/encoding/WireFormat.cpp
+++ b/ndn-cpp/encoding/WireFormat.cpp
@@ -1,7 +1,6 @@
-/* 
- * Author: Jeff Thompson
- *
- * BSD license, See the LICENSE file for more information.
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
 #include <stdexcept>
diff --git a/ndn-cpp/encoding/WireFormat.hpp b/ndn-cpp/encoding/WireFormat.hpp
index 2e56a2e..d9811cd 100644
--- a/ndn-cpp/encoding/WireFormat.hpp
+++ b/ndn-cpp/encoding/WireFormat.hpp
@@ -1,10 +1,8 @@
-/* 
- * Author: Jeff Thompson
- *
- * BSD license, See the LICENSE file for more information.
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
-
 #ifndef NDN_WIREFORMAT_HPP
 #define	NDN_WIREFORMAT_HPP