diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000000000000000000000000000000000000..30ff57380a2cfa37e4f3fea6a61ec6082041b105
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,7 @@
+Zephyr Software, LLC IRDB SDK.
+Copyright 2017-2019 Zephyr Software, LLC
+
+This product includes software developed at
+Zephyr Software, LLC (http://www.zephyr-software.com/).
+
+
diff --git a/README.md b/README.md
index e5992e231eef9abbc782c9d79a6fb92fdd68ed74..882393917ce607a3a76f084ecb66144febd6311d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,27 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
 
-This is the IRDB SDK.  Include only files in include/, other files shall be included indirectly.
+   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.
+
+*/
+
+
+
+This is the IRDB SDK.  Include only the entry-point includes files, which are found in include/.  
+Other files shall be included indirectly via the entry-point includes..
 
 
 All of the interface is in the IRDB_SDK namespace.    
 
-Include file "irdb-<foo> needs to be linked against libIRDB-foo.
+Include file "irdb-<foo> needs to be linked against libirdb-foo.so.  Libraries are distributed 
+separately.  Additional information on obtainingt hese libraries is forthcoming.
diff --git a/include/inc-cfg/BasicBlock.hpp b/include/inc-cfg/BasicBlock.hpp
index 8d2437472aaad366a59548c0ae6aab8f9a8f81fa..622e3a042d9e9fea72225b89a96b6142d0bd97bd 100644
--- a/include/inc-cfg/BasicBlock.hpp
+++ b/include/inc-cfg/BasicBlock.hpp
@@ -1,22 +1,19 @@
 /*
- * Copyright (c) 2014 - 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 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #include <ostream>
 #include <set>
diff --git a/include/inc-cfg/CFG.hpp b/include/inc-cfg/CFG.hpp
index ad8fcce75992abaeade019b4b59bba7cd3761abc..6ebf6da24c94fe591c88a5d368eb392def02aaef 100644
--- a/include/inc-cfg/CFG.hpp
+++ b/include/inc-cfg/CFG.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-cfg/callgraph.hpp b/include/inc-cfg/callgraph.hpp
index a47a9c0a5c2a200aaaadf473f02600d0ad25183e..ec65ba01710e98037ab9fb3fc1bd5f81ae321d5f 100644
--- a/include/inc-cfg/callgraph.hpp
+++ b/include/inc-cfg/callgraph.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 
 namespace IRDB_SDK
diff --git a/include/inc-cfg/criticaledge.hpp b/include/inc-cfg/criticaledge.hpp
index 9b372be2070d9d359d60236ac8b2053455043958..3b0f8ddc1e5b7ca7773dd402f99fe8b2e19d7c8e 100644
--- a/include/inc-cfg/criticaledge.hpp
+++ b/include/inc-cfg/criticaledge.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-cfg/domgraph.hpp b/include/inc-cfg/domgraph.hpp
index f79468cb319c68ffe3a5a5a1c417c9dcea078a1c..98b517f4e80ee5be4ee2167e0432836a8870004a 100644
--- a/include/inc-cfg/domgraph.hpp
+++ b/include/inc-cfg/domgraph.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
@@ -21,11 +37,15 @@ namespace IRDB_SDK
 
 			virtual const BasicBlockSet_t& getDominators(const BasicBlock_t* node)                   const = 0 ;
 			virtual const BasicBlockSet_t& getDominated (const IRDB_SDK::BasicBlock_t* node)         const = 0 ;
+
+// These interfaces to be provided in future revisions:
 // 			virtual const BasicBlockSet_t& getPostDominators(const BasicBlock_t* node)               const = 0 ;
 // 			virtual const BasicBlockSet_t& getPostDominated (const BasicBlock_t* node)               const = 0 ;
 
 			virtual const BasicBlock_t*    getImmediateDominator(const BasicBlock_t* node)           const = 0 ;
                         virtual const BasicBlockSet_t& getImmediateDominated(const IRDB_SDK::BasicBlock_t* node) const = 0 ;
+
+// These interfaces to be provided in future revisions:
 // 			virtual const BasicBlock_t*    getImmediatePostDominator (const BasicBlock_t* node)      const = 0 ;
 // 			virtual const BasicBlockSet_t& getImmediatePostDominated (const BasicBlock_t* node)      const = 0 ;
 
diff --git a/include/inc-core/address.hpp b/include/inc-core/address.hpp
index 6aad94a23938d3c3582e1973f8b306e3997dbd8c..56413e1a4bb958ef9ee67983a3fc4d75e02702ad 100644
--- a/include/inc-core/address.hpp
+++ b/include/inc-core/address.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 	class AddressID_t : virtual public BaseObj_t
diff --git a/include/inc-core/archdesc.hpp b/include/inc-core/archdesc.hpp
index 3eb1eee4d015fc369d64c08c318e9654d9f8252d..237137b8397d39721b9089a131dbac6559b6b36d 100644
--- a/include/inc-core/archdesc.hpp
+++ b/include/inc-core/archdesc.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/baseobj.hpp b/include/inc-core/baseobj.hpp
index 7db336243b1b05889d13cf4bf1df034cdf3dad5e..9ab1c7756ebf473b11d8c379d769e2debed4aa56 100644
--- a/include/inc-core/baseobj.hpp
+++ b/include/inc-core/baseobj.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 	class BaseObj_t
diff --git a/include/inc-core/basetypes.hpp b/include/inc-core/basetypes.hpp
index f2978ceb0c3c79d220e343bb26445e216d0eed22..e75ebbb49e7aba1b11fb6c1b469976a122a2f056 100644
--- a/include/inc-core/basetypes.hpp
+++ b/include/inc-core/basetypes.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 	using namespace std;
diff --git a/include/inc-core/dbinterface.hpp b/include/inc-core/dbinterface.hpp
index 250ee9b5336005a337f3bea063c4ef32d8827673..f02dcad57e198c18ed0a597e48c414d357bc9724 100644
--- a/include/inc-core/dbinterface.hpp
+++ b/include/inc-core/dbinterface.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/decode.hpp b/include/inc-core/decode.hpp
index 81cca2bc01a7c577c38d6a90547d04e36d956a38..da365dc17037f4ead848bcf2b0e31bb8bb43551e 100644
--- a/include/inc-core/decode.hpp
+++ b/include/inc-core/decode.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/doip.hpp b/include/inc-core/doip.hpp
index 75cad9fbaf7e6ad1a3defedf7f8aa379dfd606b3..761eb065967d1df4f3cc8cb1fe9da40b41f90cf7 100644
--- a/include/inc-core/doip.hpp
+++ b/include/inc-core/doip.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 	class Doip_t 
diff --git a/include/inc-core/eh.hpp b/include/inc-core/eh.hpp
index de66dde36bce5125e6ac4611d8bf1af3087af5ed..affd43703074c0d18d76d1eecde7c67a6c78df39 100644
--- a/include/inc-core/eh.hpp
+++ b/include/inc-core/eh.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/file.hpp b/include/inc-core/file.hpp
index 6ccdbc1aac3c29ec999d554825c94c3c8308add6..1cf173a33aab0dee5f7be240c7d047e01a91dade 100644
--- a/include/inc-core/file.hpp
+++ b/include/inc-core/file.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-core/fileir.hpp b/include/inc-core/fileir.hpp
index ee9c49232015b4e804988c9ea5947f04b74da53d..d864d0d6950fd82eaaf14df6a4fa6b8c79cf8988 100644
--- a/include/inc-core/fileir.hpp
+++ b/include/inc-core/fileir.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/function.hpp b/include/inc-core/function.hpp
index 3e6cfb0defbe1e92a79d1ce03db1548f22201a2d..c7c963185fed05570dd7ca2c2e104baf46df4af7 100644
--- a/include/inc-core/function.hpp
+++ b/include/inc-core/function.hpp
@@ -1,4 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
 
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-core/icfs.hpp b/include/inc-core/icfs.hpp
index 4d451f1644d7a4b4993a668a3ef23e6498ddf1e1..6a7b4058099b577af9199bdf30c3eb8a07bb9091 100644
--- a/include/inc-core/icfs.hpp
+++ b/include/inc-core/icfs.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/instruction.hpp b/include/inc-core/instruction.hpp
index f1d551f64ebe53fd90816260c6747382b1613ab1..571e2c70046f522222a426e6f21d3bed6e5b2bf8 100644
--- a/include/inc-core/instruction.hpp
+++ b/include/inc-core/instruction.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 	using namespace std;
diff --git a/include/inc-core/irdbobjs.hpp b/include/inc-core/irdbobjs.hpp
index 3bebb6f34c75ebe48e90b3a66b36e5e1ad59ba4b..a332f565f88a7a1fea6bf368f9429016c5bc29c0 100644
--- a/include/inc-core/irdbobjs.hpp
+++ b/include/inc-core/irdbobjs.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 	using namespace std;
diff --git a/include/inc-core/pqxxdb.hpp b/include/inc-core/pqxxdb.hpp
index de79f176f241a00e76186e06821b7bc8eccc55f9..f35c3cccded77baf5a634051b11203005c2208ba 100644
--- a/include/inc-core/pqxxdb.hpp
+++ b/include/inc-core/pqxxdb.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-core/reloc.hpp b/include/inc-core/reloc.hpp
index f8e0a85b7a313ec69fd9eb3cc77dd8276564fe3a..cd5101425bc8e6d51f5c45130452092204e558a7 100644
--- a/include/inc-core/reloc.hpp
+++ b/include/inc-core/reloc.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-core/scoop.hpp b/include/inc-core/scoop.hpp
index 706cfcd7846f939e4554edfcaf13719d9226e5d2..f6d4e5b345c2e8ed879056fac0223a7a267a66ea 100644
--- a/include/inc-core/scoop.hpp
+++ b/include/inc-core/scoop.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 	using namespace std;
diff --git a/include/inc-core/transform_step.h b/include/inc-core/transform_step.h
index e8f3617fff86c01d73fa9e7211fad85d9872456d..7fb5ce9381d8ca4cd80ad21af8c46ce551442bc4 100644
--- a/include/inc-core/transform_step.h
+++ b/include/inc-core/transform_step.h
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 	using namespace std;
@@ -17,10 +34,10 @@ namespace IRDB_SDK
 }
 
 
-// Must also declare a getTransformStep global function in your thanos-enabled .so file
+// Must also declare a GetTransformStep global function in your thanos-enabled .so file
 // so that thanos can use it as a factory to create your transform class.  It must
 // follow this signature:
 //
-// extern "C" std::shared_ptr<TransformStep_t> getTransformStep(void);    
+// extern "C" std::shared_ptr<TransformStep_t> GetTransformStep(void);    
 
 
diff --git a/include/inc-core/type.hpp b/include/inc-core/type.hpp
index bd1aaed9fc6d0c37af1d4ce795f38f494020758f..2b9ca480821740af569e0546880ee99c99c0acba 100644
--- a/include/inc-core/type.hpp
+++ b/include/inc-core/type.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-core/variantid.hpp b/include/inc-core/variantid.hpp
index b7087c71f6fa6d846402d1e5f3d322d7ed5a04de..321ba9c3e07c06358b6ef8c208826c3cc44dbc5d 100644
--- a/include/inc-core/variantid.hpp
+++ b/include/inc-core/variantid.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-deep/deep.hpp b/include/inc-deep/deep.hpp
index cc0b6f1a3cf2e5aab2736680346adbcc5d5e0a02..dfacd1646d93b32e6d6cdf2bd9665f9f08803b08 100644
--- a/include/inc-deep/deep.hpp
+++ b/include/inc-deep/deep.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #include <irdb-core>
 #include <irdb-util>
diff --git a/include/inc-elfdep/elfdep.hpp b/include/inc-elfdep/elfdep.hpp
index fc81f0d279ab7a89e233104bdce637c6206ccbe4..53f85c357b7197c69d2b40c3c68544104e04a498 100644
--- a/include/inc-elfdep/elfdep.hpp
+++ b/include/inc-elfdep/elfdep.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #include <irdb-core>
 #include <irdb-transform>
diff --git a/include/inc-syscall/syscall.hpp b/include/inc-syscall/syscall.hpp
index bd351128b7b4e2500d963103915a8985a07ff3b5..c3624e0bdd5f242de247bde52846618441310c11 100644
--- a/include/inc-syscall/syscall.hpp
+++ b/include/inc-syscall/syscall.hpp
@@ -1,4 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
 
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-transform/rewrite_util.hpp b/include/inc-transform/rewrite_util.hpp
index c3925efea2f91de38b4c45396f743c1a8418be4e..efcd8b4ecc0a930234f6e795d39ea6a90daab6f5 100644
--- a/include/inc-transform/rewrite_util.hpp
+++ b/include/inc-transform/rewrite_util.hpp
@@ -1,28 +1,43 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
 
-#include <irdb-core>
+   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
 
-namespace IRDB_SDK 
-{
+       http://www.apache.org/licenses/LICENSE-2.0
 
-using namespace std;
+   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.
 
-Instruction_t* insertAssemblyBefore   (FileIR_t* firp, Instruction_t* before, string assembly, Instruction_t *target=nullptr);
-Instruction_t* insertAssemblyAfter    (FileIR_t* firp, Instruction_t* after , string assembly, Instruction_t *target=nullptr);
-Instruction_t* insertDataBitsBefore   (FileIR_t* firp, Instruction_t* before, string dataBits, Instruction_t *target=nullptr);
-Instruction_t* insertDataBitsAfter    (FileIR_t* firp, Instruction_t* after , string dataBits, Instruction_t *target=nullptr);
+*/
 
-Instruction_t* addNewDataBits         (FileIR_t* firp, string p_bits);
-Instruction_t* addNewAssembly         (FileIR_t* firp, string p_asm);
-Instruction_t* addNewDataBits         (FileIR_t* firp, Instruction_t* p_after, string p_bits);
-Instruction_t* addNewAssembly         (FileIR_t* firp, Instruction_t* p_after, string p_asm);
+#include <irdb-core>
 
-void setInstructionAssembly(
-		FileIR_t* firp, 
-		Instruction_t* instr, 
-		const string& p_asm, 
-		Instruction_t *p_new_fallthrough, 
-		Instruction_t* p_new_target=nullptr);
-void setInstructionAssembly(FileIR_t* firp, Instruction_t* instr, const string& p_asm);
+namespace IRDB_SDK 
+{
 
+	using namespace std;
+
+	extern Instruction_t* insertAssemblyBefore   (FileIR_t* firp, Instruction_t* before, string assembly, Instruction_t *target=nullptr);
+	extern Instruction_t* insertAssemblyAfter    (FileIR_t* firp, Instruction_t* after , string assembly, Instruction_t *target=nullptr);
+	extern Instruction_t* insertDataBitsBefore   (FileIR_t* firp, Instruction_t* before, string dataBits, Instruction_t *target=nullptr);
+	extern Instruction_t* insertDataBitsAfter    (FileIR_t* firp, Instruction_t* after , string dataBits, Instruction_t *target=nullptr);
+
+	extern Instruction_t* addNewDataBits         (FileIR_t* firp, string p_bits);
+	extern Instruction_t* addNewAssembly         (FileIR_t* firp, string p_asm);
+	extern Instruction_t* addNewDataBits         (FileIR_t* firp, Instruction_t* p_after, string p_bits);
+	extern Instruction_t* addNewAssembly         (FileIR_t* firp, Instruction_t* p_after, string p_asm);
+
+	void extern setInstructionAssembly(FileIR_t* firp, Instruction_t* instr, const string& p_asm);
+	extern void setInstructionAssembly(
+			FileIR_t* firp, 
+			Instruction_t* instr, 
+			const string& p_asm, 
+			Instruction_t *p_new_fallthrough, 
+			Instruction_t* p_new_target=nullptr);
 
 }
diff --git a/include/inc-transform/transform.hpp b/include/inc-transform/transform.hpp
index 2df6d8f2da5fc5c8297ca40d6524acfdde9cb0c9..afc85b1e23aae4d7609f64ce207cadb8293a00b4 100644
--- a/include/inc-transform/transform.hpp
+++ b/include/inc-transform/transform.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 #include <string>
 #include <set>
 #include <map>
diff --git a/include/inc-util/IBT_Provenance.hpp b/include/inc-util/IBT_Provenance.hpp
index d306e7ca50ef35cdf9524149267eb57ba9670bf6..5ae0692b6507d202b2053de57d931574bae5f27b 100644
--- a/include/inc-util/IBT_Provenance.hpp
+++ b/include/inc-util/IBT_Provenance.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-util/Provenance.hpp b/include/inc-util/Provenance.hpp
index cb5b9ff87237efbd9c520c034376e8c214d6186d..cbf99eaaa5dbe459567d4e6f874a1914870f8c02 100644
--- a/include/inc-util/Provenance.hpp
+++ b/include/inc-util/Provenance.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-util/insn_preds.hpp b/include/inc-util/insn_preds.hpp
index a95ca6bfec121dbd292d18ad6eaa1bc35d2b423b..f7b97a78a2e0e106060086664c817b318544a637 100644
--- a/include/inc-util/insn_preds.hpp
+++ b/include/inc-util/insn_preds.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 namespace IRDB_SDK
 {
 
diff --git a/include/inc-util/params.hpp b/include/inc-util/params.hpp
index 69703cbd5ac8524d2eeb275cf4f9a725c31197ba..5bca0e91ea119a69a8b80fd3e8aec91a0281afda 100644
--- a/include/inc-util/params.hpp
+++ b/include/inc-util/params.hpp
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-util/register.hpp b/include/inc-util/register.hpp
index e25f96def57c6c88d1ecbafcf7469ab84c2f2a2f..869b052c2465ba839f9218505c1d04da4026331e 100644
--- a/include/inc-util/register.hpp
+++ b/include/inc-util/register.hpp
@@ -1,6 +1,21 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
 
-#include <string>
+   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.
 
+*/
+
+#include <string>
 
 namespace IRDB_SDK
 {
diff --git a/include/inc-util/utils.hpp b/include/inc-util/utils.hpp
index ef63fab56f90ec0800f097f3707771ef711bec4d..5317a8c7b207700217b9d140a68f45b150be4720 100644
--- a/include/inc-util/utils.hpp
+++ b/include/inc-util/utils.hpp
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 #include <sstream>
 
 namespace IRDB_SDK
diff --git a/include/irdb-cfg b/include/irdb-cfg
index 21f4c5dc9ccb4175459de99c3877390657513dc4..faf8429414c56654431b7a7316d3be3ac8e3558f 100644
--- a/include/irdb-cfg
+++ b/include/irdb-cfg
@@ -1,22 +1,19 @@
 /*
- * Copyright (c) 2014 - 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 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #ifndef IRDB_SDK_cfg
 #define IRDB_SDK_cfg
diff --git a/include/irdb-core b/include/irdb-core
index e22f5646a2c997aed438cbdad55ddf1cdda6838e..d4deabe3eed1e9268341b32e5a8720747cd238b1 100644
--- a/include/irdb-core
+++ b/include/irdb-core
@@ -1,22 +1,19 @@
 /*
- * Copyright (c) 2014 - 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 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #ifndef IRDB_SDK_core
 #define IRDB_SDK_core
diff --git a/include/irdb-deep b/include/irdb-deep
index bc7e909cd5f3be077a98b5960af4494846b5f9f5..67f6b3920ac8c3c5bf6e85ae873af4b0a1457aad 100644
--- a/include/irdb-deep
+++ b/include/irdb-deep
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 
 #ifndef IRDB_SDK_deep
diff --git a/include/irdb-elfdep b/include/irdb-elfdep
index 25024599140d628c591c7e1b6beccb1c4b64d7f3..d1b08ae2c1d1170f04d3aae2f783671c681c78c9 100644
--- a/include/irdb-elfdep
+++ b/include/irdb-elfdep
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #ifndef IRDB_SDK_elfdep
 #define IRDB_SDK_elfdep
diff --git a/include/irdb-syscall b/include/irdb-syscall
index 7724d86d93c0de26412c14516cf137bd08f1eaee..39aaf4f57bb208b2735341f639680e56275e474b 100644
--- a/include/irdb-syscall
+++ b/include/irdb-syscall
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 #ifndef IRDB_SDK_syscall
 #define IRDB_SDK_syscall
diff --git a/include/irdb-transform b/include/irdb-transform
index a878e56fa3e1a5b47c36e212d8c52ed1f0e73524..10ee25b6cdc51cfc8559d08ec3a73e5dc06c768f 100644
--- a/include/irdb-transform
+++ b/include/irdb-transform
@@ -1,3 +1,19 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
 
 
 #ifndef IRDB_SDK_transform
diff --git a/include/irdb-util b/include/irdb-util
index b52c5de7f1bfd486acfbf2f22d1817c013e9a353..3e07ad9174ef98dff8ff483c9545f428392d53d3 100644
--- a/include/irdb-util
+++ b/include/irdb-util
@@ -1,3 +1,20 @@
+/*
+   Copyright 2018-2019 Zephyr Software, LLC.
+
+   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.
+
+*/
+
 #include <irdb-core>
 
 #ifndef IRDB_SDK_util