diff --git a/scfi/color_map.cpp b/scfi/color_map.cpp
index 587ea203500c2271da0ddb0745b060df6d174ef0..c0c9ec902753bc03f1c5067eeee2bfb31c0e5275 100644
--- a/scfi/color_map.cpp
+++ b/scfi/color_map.cpp
@@ -1,3 +1,36 @@
+// @HEADER_LANG C++ 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
+/*
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #include "color_map.hpp"
 
diff --git a/scfi/color_map.hpp b/scfi/color_map.hpp
index 2f78675d33dd1e858b8e9ae4ea563f55353e54bd..27e8aa1e52914ff87218aa1270f4541940e32ed1 100644
--- a/scfi/color_map.hpp
+++ b/scfi/color_map.hpp
@@ -1,22 +1,36 @@
+// @HEADER_LANG C++ 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
 /*
- * Copyright (c) 2014-2015 - Zephyr Software LLC
- *
- * This file may be used and modified for non-commercial purposes as long as
- * all copyright, permission, and nonwarranty notices are preserved.
- * Redistribution is prohibited without prior written consent from Zephyr
- * Software.
- *
- * Please contact the authors for restrictions applying to commercial use.
- *
- * THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Author: Zephyr Software
- * e-mail: jwd@zephyr-software.com
- * URL   : http://www.zephyr-software.com/
- *
- */
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #ifndef color_map_hpp
 #define color_map_hpp
diff --git a/scfi/scfi_driver.cpp b/scfi/scfi_driver.cpp
index 2e5d796074e9d9b32b041692cae3ac01d56b2c09..ec9b128a45d86c5e33d4b4aa4e5abe1d71928e03 100644
--- a/scfi/scfi_driver.cpp
+++ b/scfi/scfi_driver.cpp
@@ -1,22 +1,36 @@
+// @HEADER_LANG C++ 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
 /*
- * Copyright (c) 2014-2015 - Zephyr Software LLC
- *
- * This file may be used and modified for non-commercial purposes as long as
- * all copyright, permission, and nonwarranty notices are preserved.
- * Redistribution is prohibited without prior written consent from Zephyr
- * Software.
- *
- * Please contact the authors for restrictions applying to commercial use.
- *
- * THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Author: Zephyr Software
- * e-mail: jwd@zephyr-software.com
- * URL   : http://www.zephyr-software.com/
- *
- */
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #include <stdlib.h>
 #include <fstream>
diff --git a/scfi/scfi_instr.cpp b/scfi/scfi_instr.cpp
index cd5b1a5890da65e6a3109f117709a7f22642a75e..28eb43dec9585e6f2a82413ee0b947ced6160e6f 100644
--- a/scfi/scfi_instr.cpp
+++ b/scfi/scfi_instr.cpp
@@ -1,23 +1,36 @@
+// @HEADER_LANG C++ 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
 /*
- * Copyright (c) 2014-2015 - Zephyr Software LLC
- *
- * This file may be used and modified for non-commercial purposes as long as
- * all copyright, permission, and nonwarranty notices are preserved.
- * Redistribution is prohibited without prior written consent from Zephyr
- * Software.
- *
- * Please contact the authors for restrictions applying to commercial use.
- *
- * THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Author: Zephyr Software
- * e-mail: jwd@zephyr-software.com
- * URL   : http://www.zephyr-software.com/
- *
- */
-
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #include <algorithm>
 #include "scfi_instr.hpp"
diff --git a/scfi/scfi_instr.hpp b/scfi/scfi_instr.hpp
index fd4290e8a030ef90fa397f7a57e8fc91886e96de..956e902797dc5fdf827cbb5f14f1b7da4de29968 100644
--- a/scfi/scfi_instr.hpp
+++ b/scfi/scfi_instr.hpp
@@ -1,22 +1,36 @@
+// @HEADER_LANG C++ 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
 /*
- * Copyright (c) 2014-2015 - Zephyr Software LLC
- *
- * This file may be used and modified for non-commercial purposes as long as
- * all copyright, permission, and nonwarranty notices are preserved.
- * Redistribution is prohibited without prior written consent from Zephyr
- * Software.
- *
- * Please contact the authors for restrictions applying to commercial use.
- *
- * THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Author: Zephyr Software
- * e-mail: jwd@zephyr-software.com
- * URL   : http://www.zephyr-software.com/
- *
- */
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #ifndef scfi_instrument_hpp
 #define scfi_instrument_hpp
diff --git a/scfi/zest_cfi_runtime/dispatch.c b/scfi/zest_cfi_runtime/dispatch.c
index e6dd745b844fa0fe344ec75cc3aff3ee85dae2cb..2259432b07e5de9d761044b94f94fa9642bfc2fb 100644
--- a/scfi/zest_cfi_runtime/dispatch.c
+++ b/scfi/zest_cfi_runtime/dispatch.c
@@ -1,4 +1,36 @@
-
+// @HEADER_LANG C 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
+/*
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 #define _GNU_SOURCE         /* See feature_test_macros(7) */
 #include <link.h>
 #include <stdlib.h>
diff --git a/scfi/zest_cfi_runtime/dl_iterate.c b/scfi/zest_cfi_runtime/dl_iterate.c
index 66603234341cef63725d3da5b22dd1bbf605014c..f6972b996b82a2a3392f6eb8ba7cd9a673b47c28 100644
--- a/scfi/zest_cfi_runtime/dl_iterate.c
+++ b/scfi/zest_cfi_runtime/dl_iterate.c
@@ -1,4 +1,36 @@
-
+// @HEADER_LANG C 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
+/*
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #define _GNU_SOURCE
 #include <link.h>
diff --git a/scfi_plugin/nonce_relocs.cpp b/scfi_plugin/nonce_relocs.cpp
index 66b4e0dfe47d7f52406b591135d1ac63d82fa4e1..bd6696fbde55a9db0a0550a3098cbaae4587ed68 100644
--- a/scfi_plugin/nonce_relocs.cpp
+++ b/scfi_plugin/nonce_relocs.cpp
@@ -1,32 +1,36 @@
+// @HEADER_LANG C 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
 /*
- * Copyright (c)  2014  Zephyr Software LLC. All rights reserved.
- *
- * This software is furnished under a license and/or other restrictive
- * terms and may be used and copied only in accordance with such terms
- * and the inclusion of the above copyright notice. This software or
- * any other copies thereof may not be provided or otherwise made
- * available to any other person without the express written consent
- * of an authorized representative of Zephyr Software LCC. Title to,
- * ownership of, and all rights in the software is retained by
- * Zephyr Software LCC.
- *
- * Zephyr Software LLC. Proprietary Information
- *
- * Unless otherwise specified, the information contained in this
- * directory, following this legend, and/or referenced herein is
- * Zephyr Software LLC. (Zephyr) Proprietary Information.
- *
- * CONTACT
- *
- * For technical assistance, contact Zephyr Software LCC. at:
- *
- *
- * Zephyr Software, LLC
- * 2040 Tremont Rd
- * Charlottesville, VA 22911
- *
- * E-mail: jwd@zephyr-software.com
- **************************************************************************/
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 
 #include <string>
diff --git a/scfi_plugin/nonce_relocs.h b/scfi_plugin/nonce_relocs.h
index 55d7dae68e85ce411a7440bb13e9e23c5d64fc2d..3d23ebf6d4aeb8b5700b5fe720ec6c438e9a526f 100644
--- a/scfi_plugin/nonce_relocs.h
+++ b/scfi_plugin/nonce_relocs.h
@@ -1,32 +1,36 @@
+// @HEADER_LANG C 
+// @HEADER_COMPONENT cfi
+// @HEADER_BEGIN
 /*
- * Copyright (c)  2014  Zephyr Software LLC. All rights reserved.
- *
- * This software is furnished under a license and/or other restrictive
- * terms and may be used and copied only in accordance with such terms
- * and the inclusion of the above copyright notice. This software or
- * any other copies thereof may not be provided or otherwise made
- * available to any other person without the express written consent
- * of an authorized representative of Zephyr Software LCC. Title to,
- * ownership of, and all rights in the software is retained by
- * Zephyr Software LCC.
- *
- * Zephyr Software LLC. Proprietary Information
- *
- * Unless otherwise specified, the information contained in this
- * directory, following this legend, and/or referenced herein is
- * Zephyr Software LLC. (Zephyr) Proprietary Information.
- *
- * CONTACT
- *
- * For technical assistance, contact Zephyr Software LCC. at:
- *
- *
- * Zephyr Software, LLC
- * 2040 Tremont Rd
- * Charlottesville, VA 22911
- *
- * E-mail: jwd@zephyr-software.com
- **************************************************************************/
+* Copyright (c) 2014-2015 Zephyr Software LLC
+*
+* This file may be used and modified for non-commercial purposes as long as
+* all copyright, permission, and nonwarranty notices are preserved.
+* Redistribution is prohibited without prior written consent from Zephyr
+* Software.
+*
+* Please contact the authors for restrictions applying to commercial use.
+*
+* THIS SOURCE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+* MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+*
+* Author: Zephyr Software
+* e-mail: jwd@zephyr-software.com
+* URL   : http://www.zephyr-software.com/
+*
+* This software was developed with SBIR funding and is subject to SBIR Data Rights, 
+* as detailed below.
+*
+* SBIR DATA RIGHTS
+*
+* Contract No. __FA8750-17-C-0295___________________________.
+* Contractor Name __Zephyr Software LLC_____________________.
+* Address __4826 Stony Point Rd, Barboursville, VA 22923____.
+*
+*/
+
+// @HEADER_END
 
 #ifndef nonce_relocs_h
 #define nonce_relocs_h