12 files changed, 39 insertions, 21 deletions
diff --git a/icd/common/icd-enumerate-drm.c b/icd/common/icd-enumerate-drm.c
index 47c1651e..3b5deb9f 100644
--- a/icd/common/icd-enumerate-drm.c
+++ b/icd/common/icd-enumerate-drm.c
@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *   Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ *
  */
 
 #include <stdlib.h>
diff --git a/icd/common/icd-enumerate-drm.h b/icd/common/icd-enumerate-drm.h
index 4f1419d6..58a15915 100644
--- a/icd/common/icd-enumerate-drm.h
+++ b/icd/common/icd-enumerate-drm.h
@@ -20,8 +20,9 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *   Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ * Author: Chia-I Wu <olv@lunarg.com>
+ *
  */
 
 #ifndef ICD_ENUMERATE_DRM_H
diff --git a/icd/common/icd-format.c b/icd/common/icd-format.c
index 2395f4cb..ef684ef1 100644
--- a/icd/common/icd-format.c
+++ b/icd/common/icd-format.c
@@ -20,8 +20,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ * Author: Chia-I Wu <olv@lunarg.com>
+ * Author: Jeremy Hayes <jeremy@lunarg.com>
+ * Author: Jon Ashburn <jon@lunarg.com>
+ *
  */
 
 #include <string.h> /* for memcpy */
diff --git a/icd/common/icd-format.h b/icd/common/icd-format.h
index fb87f4c8..f93e3ea9 100644
--- a/icd/common/icd-format.h
+++ b/icd/common/icd-format.h
@@ -20,8 +20,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ * Author: Chia-I Wu <olv@lunarg.com>
+ * Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
+ *
  */
 
 #ifndef ICD_FORMAT_H
diff --git a/icd/common/icd-instance.c b/icd/common/icd-instance.c
index ab980dcc..c888e6f2 100644
--- a/icd/common/icd-instance.c
+++ b/icd/common/icd-instance.c
@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *   Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olv@lunarg.com>
+ *
  */
 
 #define _ISOC11_SOURCE /* for aligned_alloc() */
diff --git a/icd/common/icd-instance.h b/icd/common/icd-instance.h
index fcaf9868..6b23ddb0 100644
--- a/icd/common/icd-instance.h
+++ b/icd/common/icd-instance.h
@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olv@lunarg.com>
+ *
  */
 
 #ifndef ICD_INSTANCE_H
diff --git a/icd/common/icd-spv.h b/icd/common/icd-spv.h
index 82252381..eafe25e6 100644
--- a/icd/common/icd-spv.h
+++ b/icd/common/icd-spv.h
@@ -20,9 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *   Courtney Goeltzenleuchter <courtney@lunarg.com>
- *   Chia-I Wu <olv@lunarg.com>
+ * Author: Cody Northrop <cody@lunarg.com>
+ *
  */
 
 #ifndef ICD_SPV_H
diff --git a/icd/common/icd-utils.c b/icd/common/icd-utils.c
index 3a3c43b3..22511e2e 100644
--- a/icd/common/icd-utils.c
+++ b/icd/common/icd-utils.c
@@ -20,8 +20,8 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ *
  */
 
 #include "icd-utils.h"
diff --git a/icd/common/icd-utils.h b/icd/common/icd-utils.h
index 24210504..40843fa6 100644
--- a/icd/common/icd-utils.h
+++ b/icd/common/icd-utils.h
@@ -20,8 +20,10 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ * Author: Chia-I Wu <olv@lunarg.com>
+ * Author: David Pinedo <david@lunarg.com>
+ *
  */
 
 #ifndef ICD_UTILS_H
diff --git a/icd/common/icd.h b/icd/common/icd.h
index 28fe7fed..3fc5e3ee 100644
--- a/icd/common/icd.h
+++ b/icd/common/icd.h
@@ -20,8 +20,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
+ * Author: Chia-I Wu <olvaffe@gmail.com>
+ * Author: Cody Northrop <cody@lunarg.com>
+ * Author: David Pinedo <david@lunarg.com>
+ * Author: Jon Ashburn <jon@lunarg.com>
+ *
  */
 
 #ifndef ICD_H
diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index b926176b..a80cc769 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -20,6 +20,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
+ * Author: Cody Northrop <cody@lunarg.com>
+ * Author: David Pinedo <david@lunarg.com>
+ * Author: Ian Elliott <ian@LunarG.com>
+ * Author: Tony Barbour <tony@LunarG.com>
+ *
  */
 
 #include "nulldrv.h"
diff --git a/icd/nulldrv/nulldrv.h b/icd/nulldrv/nulldrv.h
index 8b48bc5b..43001274 100644
--- a/icd/nulldrv/nulldrv.h
+++ b/icd/nulldrv/nulldrv.h
@@ -19,6 +19,9 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Cody Northrop <cody@lunarg.com>
+ * Author: David Pinedo <david@lunarg.com>
  */
 
 #ifndef NULLDRV_H