diff --git a/ndn-cpp/c/Interest.h b/ndn-cpp/c/Interest.h
index 24abe7b..36d873b 100644
--- a/ndn-cpp/c/Interest.h
+++ b/ndn-cpp/c/Interest.h
@@ -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_INTEREST_H
diff --git a/ndn-cpp/c/Name.h b/ndn-cpp/c/Name.h
index 969880d..8096393 100644
--- a/ndn-cpp/c/Name.h
+++ b/ndn-cpp/c/Name.h
@@ -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_NAME_H
diff --git a/ndn-cpp/c/encoding/BinaryXML.h b/ndn-cpp/c/encoding/BinaryXML.h
index e39c785..587b2fc 100644
--- a/ndn-cpp/c/encoding/BinaryXML.h
+++ b/ndn-cpp/c/encoding/BinaryXML.h
@@ -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_BINARYXML_H
diff --git a/ndn-cpp/c/encoding/BinaryXMLDecoder.c b/ndn-cpp/c/encoding/BinaryXMLDecoder.c
index 556fcfd..311b30a 100644
--- a/ndn-cpp/c/encoding/BinaryXMLDecoder.c
+++ b/ndn-cpp/c/encoding/BinaryXMLDecoder.c
@@ -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 "BinaryXML.h"
diff --git a/ndn-cpp/c/encoding/BinaryXMLDecoder.h b/ndn-cpp/c/encoding/BinaryXMLDecoder.h
index 120613c..9c83c3b 100644
--- a/ndn-cpp/c/encoding/BinaryXMLDecoder.h
+++ b/ndn-cpp/c/encoding/BinaryXMLDecoder.h
@@ -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_BINARYXMLDECODER_H
diff --git a/ndn-cpp/c/encoding/BinaryXMLEncoder.c b/ndn-cpp/c/encoding/BinaryXMLEncoder.c
index c8a55f5..cf35741 100644
--- a/ndn-cpp/c/encoding/BinaryXMLEncoder.c
+++ b/ndn-cpp/c/encoding/BinaryXMLEncoder.c
@@ -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 "../util/ndn_memory.h"
diff --git a/ndn-cpp/c/encoding/BinaryXMLEncoder.h b/ndn-cpp/c/encoding/BinaryXMLEncoder.h
index 8c5047c..2805d81 100644
--- a/ndn-cpp/c/encoding/BinaryXMLEncoder.h
+++ b/ndn-cpp/c/encoding/BinaryXMLEncoder.h
@@ -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_H
diff --git a/ndn-cpp/c/encoding/BinaryXMLInterest.c b/ndn-cpp/c/encoding/BinaryXMLInterest.c
index 96077d3..a00d3be 100644
--- a/ndn-cpp/c/encoding/BinaryXMLInterest.c
+++ b/ndn-cpp/c/encoding/BinaryXMLInterest.c
@@ -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 "BinaryXMLEncoder.h"
diff --git a/ndn-cpp/c/encoding/BinaryXMLInterest.h b/ndn-cpp/c/encoding/BinaryXMLInterest.h
index 2b23e0d..12de088 100644
--- a/ndn-cpp/c/encoding/BinaryXMLInterest.h
+++ b/ndn-cpp/c/encoding/BinaryXMLInterest.h
@@ -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_BINARYXMLINTEREST_H
diff --git a/ndn-cpp/c/encoding/BinaryXMLName.c b/ndn-cpp/c/encoding/BinaryXMLName.c
index 799e93d..9c2ea6a 100644
--- a/ndn-cpp/c/encoding/BinaryXMLName.c
+++ b/ndn-cpp/c/encoding/BinaryXMLName.c
@@ -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 "BinaryXMLEncoder.h"
diff --git a/ndn-cpp/c/encoding/BinaryXMLName.h b/ndn-cpp/c/encoding/BinaryXMLName.h
index c943f4b..764fc1e 100644
--- a/ndn-cpp/c/encoding/BinaryXMLName.h
+++ b/ndn-cpp/c/encoding/BinaryXMLName.h
@@ -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_BINARYXMLNAME_H
diff --git a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c b/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
index a2fd405..571db24 100644
--- a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
+++ b/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.c
@@ -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 "../util/ndn_memory.h"
diff --git a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h b/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h
index 504a1bd..2d91562 100644
--- a/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h
+++ b/ndn-cpp/c/encoding/BinaryXMLStructureDecoder.h
@@ -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_BINARYXMLSTRUCTUREDECODER_H
diff --git a/ndn-cpp/c/util/DynamicUCharArray.c b/ndn-cpp/c/util/DynamicUCharArray.c
index 83016ce..30b0814 100644
--- a/ndn-cpp/c/util/DynamicUCharArray.c
+++ b/ndn-cpp/c/util/DynamicUCharArray.c
@@ -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 "DynamicUCharArray.h"
diff --git a/ndn-cpp/c/util/DynamicUCharArray.h b/ndn-cpp/c/util/DynamicUCharArray.h
index f5270d4..6647680 100644
--- a/ndn-cpp/c/util/DynamicUCharArray.h
+++ b/ndn-cpp/c/util/DynamicUCharArray.h
@@ -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_DYNAMICUCHARARRAY_H
diff --git a/ndn-cpp/c/util/ndn_memory.c b/ndn-cpp/c/util/ndn_memory.c
index 8699309..d0e8bf4 100644
--- a/ndn-cpp/c/util/ndn_memory.c
+++ b/ndn-cpp/c/util/ndn_memory.c
@@ -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 "ndn_memory.h"
diff --git a/ndn-cpp/c/util/ndn_memory.h b/ndn-cpp/c/util/ndn_memory.h
index 9051a02..378b6b7 100644
--- a/ndn-cpp/c/util/ndn_memory.h
+++ b/ndn-cpp/c/util/ndn_memory.h
@@ -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.
  */
 
 /*