diff --git a/include/ehp.hpp b/include/ehp.hpp
index d8d8d387aafb9691e985366c0dfac20ee30fa8f4..d0fcc333e204861db27b45e73f129d467157b00e 100644
--- a/include/ehp.hpp
+++ b/include/ehp.hpp
@@ -1,5 +1,9 @@
+// @HEADER_COMPONENT libehp
+// @HEADER_LANG C++
+// @HEADER_BEGIN
+
 /*
-   Copyright 2017-2018 University of Virginia
+   Copyright 2017-2019 University of Virginia
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -12,9 +16,10 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
 */
 
+// @HEADER_END
+
 #ifndef ehp_hpp
 #define ehp_hpp
 
diff --git a/src/SConscript b/src/SConscript
index 189ce76e6c58aadcd378399fe17a0af42c95086c..0f47fa00b73ff50d4e2e54567571eb7e49839279 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -1,16 +1,24 @@
-#   Copyright 2017-2018 University of Virginia
+# @HEADER_COMPONENT libehp
+# @HEADER_LANG python
+# @HEADER_BEGIN
+
+#
+#  Copyright 2017-2019 University of Virginia
 #
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+# @HEADER_END
 
 import os
 
diff --git a/src/SConstruct b/src/SConstruct
index 6cf1c07a67c1577163fbbde2ded21e59e51e33c2..55a05973edb9cd3fb883adde3991efa8879b9e7e 100644
--- a/src/SConstruct
+++ b/src/SConstruct
@@ -1,17 +1,24 @@
+# @HEADER_COMPONENT libehp
+# @HEADER_LANG python
+# @HEADER_BEGIN
 
-#   Copyright 2017-2018 University of Virginia
 #
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
+#  Copyright 2017-2019 University of Virginia
 #
-#       http://www.apache.org/licenses/LICENSE-2.0
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
 #
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+# @HEADER_END
 
 
 env=Environment()
diff --git a/src/ehp.cpp b/src/ehp.cpp
index e9f085a0148b0f4bf8e682b287baa3b6a15f0f14..dd1001cc76bd5d80ddccbddd83b9340c282dcb80 100644
--- a/src/ehp.cpp
+++ b/src/ehp.cpp
@@ -1,5 +1,9 @@
+// @HEADER_COMPONENT libehp
+// @HEADER_LANG C++
+// @HEADER_BEGIN
+
 /*
-   Copyright 2017-2018 University of Virginia
+   Copyright 2017-2019 University of Virginia
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -12,8 +16,10 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
 */
+
+// @HEADER_END
+
 #include <iostream>
 #include <iomanip>
 #include <fstream>
diff --git a/src/ehp_dwarf2.hpp b/src/ehp_dwarf2.hpp
index 2e07329d706243f4705251f7611b104f8ca0a26e..383a0f7371d0b9e1b2f98f0027db881317832df4 100644
--- a/src/ehp_dwarf2.hpp
+++ b/src/ehp_dwarf2.hpp
@@ -1,5 +1,9 @@
+// @HEADER_COMPONENT libehp
+// @HEADER_LANG C++
+// @HEADER_BEGIN
+
 /*
-   Copyright 2017-2018 University of Virginia
+   Copyright 2017-2019 University of Virginia
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -12,9 +16,10 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
 */
 
+// @HEADER_END
+
 #ifndef _DWARF2_H
 #define _DWARF2_H	1
 
diff --git a/src/ehp_priv.hpp b/src/ehp_priv.hpp
index 7f52e8c1f531cf3f69a74a02027a0fc2863064bc..f9e5cea5958183265aae3e54e974d58b5861f6be 100644
--- a/src/ehp_priv.hpp
+++ b/src/ehp_priv.hpp
@@ -1,5 +1,9 @@
+// @HEADER_COMPONENT libehp
+// @HEADER_LANG C++
+// @HEADER_BEGIN
+
 /*
-   Copyright 2017-2018 University of Virginia
+   Copyright 2017-2019 University of Virginia
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -13,6 +17,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 */
+
+// @HEADER_END
+
 #ifndef ehp_priv_hpp
 #define ehp_priv_hpp
 
diff --git a/src/scoop_replacement.hpp b/src/scoop_replacement.hpp
index daa7c20ff42cde145100aa2dde28591efe838f47..cafcd7a9af90f0b563984170c75d1a8486672aaa 100644
--- a/src/scoop_replacement.hpp
+++ b/src/scoop_replacement.hpp
@@ -1,5 +1,9 @@
+// @HEADER_COMPONENT libehp
+// @HEADER_LANG C++
+// @HEADER_BEGIN
+
 /*
-   Copyright 2017-2018 University of Virginia
+   Copyright 2017-2019 University of Virginia
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -12,8 +16,10 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
 */
+
+// @HEADER_END
+
 #ifndef scoop_replacement_hpp
 #define scoop_replacement_hpp
 
diff --git a/src/throw_assert.h b/src/throw_assert.h
index 1acdd514e4d57f2fe8aed01962a0930d5e525341..ae2075a4cd6ebeaf2197d1f0dc11310b06ed365b 100644
--- a/src/throw_assert.h
+++ b/src/throw_assert.h
@@ -1,4 +1,24 @@
+// @HEADER_COMPONENT libehp
+// @HEADER_LANG C++
+// @HEADER_BEGIN
 
+/*
+   Copyright 2017-2019 University of Virginia
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+// @HEADER_END
 
 #define use_throwing_assert