diff --git a/cdatapack/cdatapack.h b/cdatapack/cdatapack.h
--- a/cdatapack/cdatapack.h
+++ b/cdatapack/cdatapack.h
@@ -1,7 +1,10 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // cdatapack:
-//
 // no-check-code
 
 #ifndef CDATAPACK_CDATAPACK_H
diff --git a/cdatapack/cdatapack.c b/cdatapack/cdatapack.c
--- a/cdatapack/cdatapack.c
+++ b/cdatapack/cdatapack.c
@@ -1,7 +1,10 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // cdatapack.c: Datapack implementation in C.
-//
 // no-check-code
 
 #include "cdatapack/cdatapack.h"
diff --git a/cdatapack/cdatapack_dump.c b/cdatapack/cdatapack_dump.c
--- a/cdatapack/cdatapack_dump.c
+++ b/cdatapack/cdatapack_dump.c
@@ -1,8 +1,11 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // cdatapack_dump.c: Dump the entire contents of a datapack file by walking
 //                   the datapack file.
-//
 // no-check-code
 
 #include <inttypes.h>
diff --git a/cdatapack/cdatapack_get.c b/cdatapack/cdatapack_get.c
--- a/cdatapack/cdatapack_get.c
+++ b/cdatapack/cdatapack_get.c
@@ -1,7 +1,10 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // cdatapack_get.c: Use the index to dump a node's delta chain.
-//
 // no-check-code
 
 #include <inttypes.h>
diff --git a/clib/buffer.h b/clib/buffer.h
--- a/clib/buffer.h
+++ b/clib/buffer.h
@@ -1,8 +1,11 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // buffer.c: declarations for a generic mechanism to expand a heap-allocated
 //           buffer.  this is for internal use only.
-//
 // no-check-code
 
 #ifndef __FASTMANIFEST_BUFFER_H__
diff --git a/clib/buffer.c b/clib/buffer.c
--- a/clib/buffer.c
+++ b/clib/buffer.c
@@ -1,8 +1,11 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // buffer.c: implementation for a generic mechanism to expand a heap-allocated
 //           buffer.
-//
 // no-check-code
 
 #include <stdlib.h>
diff --git a/clib/convert.h b/clib/convert.h
--- a/clib/convert.h
+++ b/clib/convert.h
@@ -1,9 +1,11 @@
-/* convert.h - conversion utility methods
- *
- * Copyright 2016 Facebook, Inc.
- *
- * This software may be used and distributed according to the terms of the
- * GNU General Public License version 2 or any later version. */
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
+//
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
+// convert.h - conversion utility methods
+// no-check-code
 
 #ifdef __cplusplus
 #include <string>
diff --git a/clib/null_test.c b/clib/null_test.c
--- a/clib/null_test.c
+++ b/clib/null_test.c
@@ -1,7 +1,10 @@
-// Copyright 2016-present Facebook. All Rights Reserved.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
 // null_test.c: garbage test to make CLion happy.
-//
 // no-check-code
 
 int main(int argc, char *argv[]) {
diff --git a/clib/portability/inet.h b/clib/portability/inet.h
--- a/clib/portability/inet.h
+++ b/clib/portability/inet.h
@@ -1,3 +1,11 @@
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
+//
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
+// no-check-code
+
 #ifndef PORTABILITY_INET_H
 #define PORTABILITY_INET_H
 
diff --git a/clib/portability/portability.h b/clib/portability/portability.h
--- a/clib/portability/portability.h
+++ b/clib/portability/portability.h
@@ -1,3 +1,11 @@
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
+//
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
+// no-check-code
+
 #ifndef PORTABILITY_PORTABILITY_H
 #define PORTABILITY_PORTABILITY_H
 
diff --git a/clib/portability/unistd.h b/clib/portability/unistd.h
--- a/clib/portability/unistd.h
+++ b/clib/portability/unistd.h
@@ -1,3 +1,11 @@
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
+//
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
+// no-check-code
+
 #ifndef PORTABILITY_UNISTD_H
 #define PORTABILITY_UNISTD_H
 
diff --git a/cstore/datapackstore.h b/cstore/datapackstore.h
--- a/cstore/datapackstore.h
+++ b/cstore/datapackstore.h
@@ -1,10 +1,10 @@
-// datapackstore.h - c++ declarations for a data pack store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// datapackstore.h - c++ declarations for a data pack store
 // no-check-code
 
 #ifndef DATAPACKSTORE_H
diff --git a/cstore/datapackstore.cpp b/cstore/datapackstore.cpp
--- a/cstore/datapackstore.cpp
+++ b/cstore/datapackstore.cpp
@@ -1,10 +1,10 @@
-// datapackstore.cpp - implementation of a datapack store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// datapackstore.cpp - implementation of a datapack store
 // no-check-code
 
 #include "cstore/datapackstore.h"
diff --git a/cstore/key.h b/cstore/key.h
--- a/cstore/key.h
+++ b/cstore/key.h
@@ -1,10 +1,10 @@
-// key.h - c++ declarations for a key to pack data
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// key.h - c++ declarations for a key to pack data
 // no-check-code
 
 #ifndef KEY_H
diff --git a/cstore/match.h b/cstore/match.h
--- a/cstore/match.h
+++ b/cstore/match.h
@@ -1,12 +1,12 @@
-// match.h - c++ declarations for a data store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// match.h - c++ declarations for a data store
 // no-check-code
-//
+
 #ifndef MATCH_H
 #define MATCH_H
 
diff --git a/cstore/py-cdatapack.h b/cstore/py-cdatapack.h
--- a/cstore/py-cdatapack.h
+++ b/cstore/py-cdatapack.h
@@ -1,10 +1,10 @@
-// py-cdatapack.h - python extension for cdatapack
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// py-cdatapack.h - python extension for cdatapack
 // no-check-code
 
 // The PY_SSIZE_T_CLEAN define must be defined before the Python.h include,
diff --git a/cstore/py-cstore.cpp b/cstore/py-cstore.cpp
--- a/cstore/py-cstore.cpp
+++ b/cstore/py-cstore.cpp
@@ -1,10 +1,10 @@
-// py-cstore.cpp - C++ implementation of a store
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// py-cstore.cpp - C++ implementation of a store
 // no-check-code
 
 // The PY_SSIZE_T_CLEAN define must be defined before the Python.h include,
diff --git a/cstore/py-datapackstore.h b/cstore/py-datapackstore.h
--- a/cstore/py-datapackstore.h
+++ b/cstore/py-datapackstore.h
@@ -1,10 +1,10 @@
-// py-cstore.cpp - c++ implementation of a store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// py-cstore.cpp - c++ implementation of a store
 // no-check-code
 
 // The PY_SSIZE_T_CLEAN define must be defined before the Python.h include,
diff --git a/cstore/py-structs.h b/cstore/py-structs.h
--- a/cstore/py-structs.h
+++ b/cstore/py-structs.h
@@ -1,10 +1,10 @@
-// py-structs.h - c++ headers for store python objects
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// py-structs.h - c++ headers for store python objects
 // no-check-code
 
 #ifndef CSTORE_PY_STRUCTS
diff --git a/cstore/py-treemanifest.h b/cstore/py-treemanifest.h
--- a/cstore/py-treemanifest.h
+++ b/cstore/py-treemanifest.h
@@ -1,10 +1,10 @@
-// py-treemanifest.cpp - c++ implementation of a tree manifest
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// py-treemanifest.cpp - c++ implementation of a tree manifest
 // no-check-code
 
 // The PY_SSIZE_T_CLEAN define must be defined before the Python.h include,
diff --git a/cstore/pythonutil.h b/cstore/pythonutil.h
--- a/cstore/pythonutil.h
+++ b/cstore/pythonutil.h
@@ -1,10 +1,10 @@
-// pythonutil.h - utilities to glue C++ code to python
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// pythonutil.h - utilities to glue C++ code to python
 // no-check-code
 
 #ifndef REMOTEFILELOG_PYTHONOBJ_H
diff --git a/cstore/pythonutil.cpp b/cstore/pythonutil.cpp
--- a/cstore/pythonutil.cpp
+++ b/cstore/pythonutil.cpp
@@ -1,10 +1,10 @@
-// pythonutil.cpp - utilities to glue C++ code to python
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// pythonutil.cpp - utilities to glue C++ code to python
 // no-check-code
 
 #include "pythonutil.h"
diff --git a/cstore/store.h b/cstore/store.h
--- a/cstore/store.h
+++ b/cstore/store.h
@@ -1,12 +1,12 @@
-// store.h - c++ declarations for a data store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// store.h - c++ declarations for a data store
 // no-check-code
-//
+
 #ifndef STORE_H
 #define STORE_H
 
diff --git a/cstore/uniondatapackstore.h b/cstore/uniondatapackstore.h
--- a/cstore/uniondatapackstore.h
+++ b/cstore/uniondatapackstore.h
@@ -1,10 +1,10 @@
-// uniondatapackstore.h - c++ declarations for a union datapack store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// uniondatapackstore.h - c++ declarations for a union datapack store
 // no-check-code
 
 #ifndef UNIONDATAPACKSTORE_H
diff --git a/cstore/uniondatapackstore.cpp b/cstore/uniondatapackstore.cpp
--- a/cstore/uniondatapackstore.cpp
+++ b/cstore/uniondatapackstore.cpp
@@ -1,10 +1,10 @@
-// uniondatapackstore.cpp - implementation of a union datapack store
-//
-// Copyright 2017 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// uniondatapackstore.cpp - implementation of a union datapack store
 // no-check-code
 
 #include "cstore/uniondatapackstore.h"
diff --git a/ctreemanifest/manifest.h b/ctreemanifest/manifest.h
--- a/ctreemanifest/manifest.h
+++ b/ctreemanifest/manifest.h
@@ -1,10 +1,10 @@
-// manifest.h - c++ declarations for a single manifest
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// manifest.h - c++ declarations for a single manifest
 // no-check-code
 
 #ifndef REMOTEFILELOG_MANIFEST_H
diff --git a/ctreemanifest/manifest.cpp b/ctreemanifest/manifest.cpp
--- a/ctreemanifest/manifest.cpp
+++ b/ctreemanifest/manifest.cpp
@@ -1,10 +1,10 @@
-// manifest.cpp - c++ implementation of a single manifest
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// manifest.cpp - c++ implementation of a single manifest
 // no-check-code
 
 #include "ctreemanifest/manifest.h"
diff --git a/ctreemanifest/manifest_entry.h b/ctreemanifest/manifest_entry.h
--- a/ctreemanifest/manifest_entry.h
+++ b/ctreemanifest/manifest_entry.h
@@ -1,10 +1,10 @@
-// manifest_entry.h - c++ declaration for a single manifest entry
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// manifest_entry.h - c++ declaration for a single manifest entry
 // no-check-code
 
 #ifndef REMOTEFILELOG_MANIFEST_ENTRY_H
diff --git a/ctreemanifest/manifest_entry.cpp b/ctreemanifest/manifest_entry.cpp
--- a/ctreemanifest/manifest_entry.cpp
+++ b/ctreemanifest/manifest_entry.cpp
@@ -1,10 +1,10 @@
-// manifest_entry.cpp - c++ implementation of a single manifest entry
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// manifest_entry.cpp - c++ implementation of a single manifest entry
 // no-check-code
 
 #include "ctreemanifest/manifest_entry.h"
diff --git a/ctreemanifest/manifest_fetcher.h b/ctreemanifest/manifest_fetcher.h
--- a/ctreemanifest/manifest_fetcher.h
+++ b/ctreemanifest/manifest_fetcher.h
@@ -1,10 +1,10 @@
-// manifest_fetcher.h - c++ declarations for a fetcher for manifests
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// manifest_fetcher.h - c++ declarations for a fetcher for manifests
 // no-check-code
 
 #ifndef REMOTEFILELOG_MANIFEST_FETCHER_H
diff --git a/ctreemanifest/manifest_fetcher.cpp b/ctreemanifest/manifest_fetcher.cpp
--- a/ctreemanifest/manifest_fetcher.cpp
+++ b/ctreemanifest/manifest_fetcher.cpp
@@ -1,10 +1,10 @@
-// manifest_fetcher.cpp - c++ implementation of a fetcher for manifests
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// manifest_fetcher.cpp - c++ implementation of a fetcher for manifests
 // no-check-code
 
 #include "ctreemanifest/manifest_fetcher.h"
diff --git a/ctreemanifest/treemanifest.h b/ctreemanifest/treemanifest.h
--- a/ctreemanifest/treemanifest.h
+++ b/ctreemanifest/treemanifest.h
@@ -1,10 +1,10 @@
-// treemanifest.h - c++ declarations of a tree manifest
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// treemanifest.h - c++ declarations of a tree manifest
 // no-check-code
 
 #ifndef REMOTEFILELOG_TREEMANIFEST_H
diff --git a/ctreemanifest/treemanifest.cpp b/ctreemanifest/treemanifest.cpp
--- a/ctreemanifest/treemanifest.cpp
+++ b/ctreemanifest/treemanifest.cpp
@@ -1,10 +1,10 @@
-// treemanifest.cpp - c++ implementation of a tree manifest
-//
-// Copyright 2016 Facebook, Inc.
+// Copyright (c) 2004-present, Facebook, Inc.
+// All Rights Reserved.
 //
 // This software may be used and distributed according to the terms of the
 // GNU General Public License version 2 or any later version.
-//
+
+// treemanifest.cpp - c++ implementation of a tree manifest
 // no-check-code
 
 #include "ctreemanifest/treemanifest.h"
diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
--- a/tests/test-check-code-hg.t
+++ b/tests/test-check-code-hg.t
@@ -56,7 +56,11 @@
   Skipping cfastmanifest/tree_test.c it has no-che?k-code (glob)
   Skipping clib/buffer.c it has no-che?k-code (glob)
   Skipping clib/buffer.h it has no-che?k-code (glob)
+  Skipping clib/convert.h it has no-che?k-code (glob)
   Skipping clib/null_test.c it has no-che?k-code (glob)
+  Skipping clib/portability/inet.h it has no-che?k-code (glob)
+  Skipping clib/portability/portability.h it has no-che?k-code (glob)
+  Skipping clib/portability/unistd.h it has no-che?k-code (glob)
   Skipping clib/sha1.h it has no-che?k-code (glob)
   Skipping cstore/datapackstore.cpp it has no-che?k-code (glob)
   Skipping cstore/datapackstore.h it has no-che?k-code (glob)