diff --git a/ndn-cpp/Interest.cpp b/ndn-cpp/Interest.cpp
index ceba502..f6abf52 100644
--- a/ndn-cpp/Interest.cpp
+++ b/ndn-cpp/Interest.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 "Interest.hpp"
diff --git a/ndn-cpp/Interest.hpp b/ndn-cpp/Interest.hpp
index f5a59ea..a481cca 100644
--- a/ndn-cpp/Interest.hpp
+++ b/ndn-cpp/Interest.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_INTEREST_HPP
diff --git a/ndn-cpp/Name.cpp b/ndn-cpp/Name.cpp
index 6098400..a5c8ade 100644
--- a/ndn-cpp/Name.cpp
+++ b/ndn-cpp/Name.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/Name.hpp b/ndn-cpp/Name.hpp
index 302c7da..fbb28d0 100644
--- a/ndn-cpp/Name.hpp
+++ b/ndn-cpp/Name.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_NAME_HPP
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.
  */
 
 /*
diff --git a/ndn-cpp/common.hpp b/ndn-cpp/common.hpp
index 39a73af..4b146db 100644
--- a/ndn-cpp/common.hpp
+++ b/ndn-cpp/common.hpp
@@ -1,13 +1,6 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
-/*
- * Copyright (c) 2013, Regents of the University of California
- *                     Alexander Afanasyev
- *                     Zhenkai Zhu
- *
- * BSD license, See the LICENSE file for more information
- *
- * Author: Zhenkai Zhu <zhenkai@cs.ucla.edu>
- *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+/**
+ * @author: Jeff Thompson
+ * See COPYING for copyright and distribution information.
  */
 
 #ifndef NDN_COMMON_HPP
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
 
diff --git a/ndn-cpp/version.h b/ndn-cpp/version.h
deleted file mode 100644
index 34b65de..0000000
--- a/ndn-cpp/version.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
-/*
- * Copyright (c) 2013, Regents of the University of California
- *                     Alexander Afanasyev
- *
- * BSD license, See the LICENSE file for more information
- *
- * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
- */
-
-#ifndef NDN_CXX_VERSION_H
-#define NDN_CXX_VERSION_H
-
-//  NDN_CXX_VERSION % 100 is the minor version
-//  NDN_CXX_VERSION / 100 % 1000 is the major version
-
-#define NDN_CXX_VERSION 0001
-
-#define NDN_CXX_VERSION_MAJOR  0
-#define NDN_CXX_VERSION_MINOR  1
-
-#endif // NDN_CXX_VERSION_H