[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[UNIKRAFT PATCH 1/8] Correct license headers introduced by NEC Laboratories Europe GmbH



This commit removes the additional clause
"THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY"
from BSD license headers that got introduced by mistake
with the following commits:
 d7ab6740e - lib/ukunistd: Introduce ukunistd library
 154a9b466 - lib/ukallocbbuddy: Add binary buddy allocator implementation
 cfa2c08ae - lib/ukboot: Add Unikraft bootstrapping
 17327dfe6 - lib/ukargparse: Add argument parser
 1e1a8f5b5 - lib/ukschedcoop: Add cooperative round-robin scheduler
 c327e9713 - lib/uknetdev: Introduce Netbufs
 3c3dc48b5 - plat/xen: Add Xen (x86_64, ARM) platform code
 1fa094ed7 - plat/kvm: Introduce platform configuration struct
 a8cb90f65 - lib/ukalloc: Add abstraction library for memory allocators
 feb280521 - plat/xen: Split emergency and hypervisor console
 c722184e9 - include: Introduce <uk/prio.h>
 0bc9633a0 - plat/xen: Add console support for x86_64
 3b94c37a5 - plat/*: Add binary system call feature and API
 06cb4527f - plat/common: Add cpu.h for Arm32
 463baa06a - lib/vfscore: Automount option
 27af93b6d - lib/ukalloc: Move internal functions to new header
 1760d9ef4 - lib/nolibc: Add nolibc, a minimal subset of libc functions
 2c9108854 - plat/kvm: Add KVM (x86_64) platform code
 eacdeffea - arch: Add architecture interface
 8dba9141b - lib/nolibc: Provide assertions (assert.h)
 e6d46e521 - plat/kvm: System call trap handler (x86_64)
 8277edb38 - build: Add build and configuration framework
 3afda62dd - lib/ukdebug: Do not rely on libc for uk_pr_*()
 7c7518d28 - plat/linuxu: Add linux userspace (x86_64, ARM) platform code
 347cb7db4 - lib/ukdebug: Add printing and debug helpers
 1353814b3 - lib/uksched: Add abstraction library for schedulers
 828efb76e - plat: Add platform interface
 bd4825025 - lib/ukmmap: mmap trick for Go
 ef5245754 - plat/common: Split ARM generic timer implementation
 1717ee104 - lib/ukbus: Introduce abstraction for device buses
 71ee3e521 - plat/common: Introduce virtio standard header
 2d39b41ca - lib/ukmpi: Introduce mailboxes with libukmpi
 67e70a93b - plat/drivers: Introduce virtio PCI device
 00292f747 - include/uk: Introduce init table
 b49cc5403 - plat/drivers: Introduce the virtio bus
 ae22ad94c - plat/kvm: Add initial PCI bus driver for x86_64
 415e1ed05 - lib/ukswrand: Introduce libukswrand
 87880cde9 - plat/drivers: Reintroduce the virtio ring
 15bea914c - lib/uklibparam: Introduce the library parameter
 80928b929 - lib/uklock: Introduce semaphores and mutexes with libuklock
 340cd8ef6 - plat/common: virt to phys addr conversion
 bb7d1651e - arch: provide thread-local storage helper functions
 fcc07a3cd - lib/nolibc: move shared definitions to special include file
 4c2afee22 - plat: Add global struct to keep x86 CPU information
 11ac352a7 - plat: switch thread-local storage area on context switch
 00b652b41 - lib/vfscore: update license header for imported files
 740fc6014 - lib/ukdebug: save actual data into tracebuffer
 2bc4d9df7 - lib/ukdebug: trace.h - introduce UK_FOREACH and UK_NARGS macros
 917d23a75 - support/scripts: fetch trace data from running Unikraft
 b3fbde2b3 - lib/vfscore: implement fops for std(out|err)
 ccb39b566 - lib/syscall_shim: introduce syscalls macro layer
 146c13e04 - lib/vfscore: introduce vfscore

On the one hand, this additional clause is redundant because
the BSD license already states that it must remain and the
copyright notice must be kept.
On the other hand, the clause freezes the file header
and prohibits future contributors from extending the
copyright notice for their contributions. This additional
clause is not part of the official BSD 3-clause.

The original author or affiliation consents to the change
with a `Signed-off-by` or `Reviewed-by` tag to this
commit.

Signed-off-by: Simon Kuenzer <simon.kuenzer@xxxxxxxxx>
---
 arch/arm/arm/include/uk/asm/intsizes.h          | 2 --
 arch/arm/arm/include/uk/asm/tls.h               | 2 --
 arch/arm/arm64/include/uk/asm/tls.h             | 2 --
 arch/x86/x86_64/include/uk/asm/intsizes.h       | 2 --
 arch/x86/x86_64/include/uk/asm/tls.h            | 2 --
 include/uk/arch/lcpu.h                          | 2 --
 include/uk/arch/limits.h                        | 2 --
 include/uk/arch/time.h                          | 2 --
 include/uk/arch/tls.h                           | 2 --
 include/uk/arch/types.h                         | 2 --
 include/uk/config.h                             | 2 --
 include/uk/errptr.h                             | 2 --
 include/uk/essentials.h                         | 2 --
 include/uk/init.h                               | 2 --
 include/uk/plat/bootstrap.h                     | 2 --
 include/uk/plat/config.h                        | 2 --
 include/uk/plat/io.h                            | 2 --
 include/uk/plat/lcpu.h                          | 2 --
 include/uk/plat/memory.h                        | 2 --
 include/uk/plat/syscall.h                       | 2 --
 include/uk/plat/thread.h                        | 2 --
 include/uk/plat/time.h                          | 2 --
 include/uk/prio.h                               | 2 --
 lib/nolibc/errno.c                              | 2 --
 lib/nolibc/include/assert.h                     | 2 --
 lib/nolibc/include/errno.h                      | 2 --
 lib/nolibc/include/inttypes.h                   | 2 --
 lib/nolibc/include/limits.h                     | 2 --
 lib/nolibc/include/nolibc-internal/shareddefs.h | 2 --
 lib/nolibc/include/stdarg.h                     | 2 --
 lib/nolibc/include/stddef.h                     | 2 --
 lib/nolibc/include/stdint.h                     | 2 --
 lib/nolibc/include/stdio.h                      | 2 --
 lib/nolibc/include/string.h                     | 2 --
 lib/nolibc/include/sys/mount.h                  | 2 --
 lib/nolibc/include/sys/types.h                  | 2 --
 lib/nolibc/include/sys/uio.h                    | 2 --
 lib/nolibc/include/unistd.h                     | 2 --
 lib/nolibc/malloc.c                             | 2 --
 lib/nolibc/string.c                             | 2 --
 lib/posix-user/user.c                           | 2 --
 lib/syscall_shim/include/uk/syscall.h           | 2 --
 lib/ukalloc/include/uk/alloc.h                  | 2 --
 lib/ukalloc/include/uk/alloc_impl.h             | 2 --
 lib/ukallocbbuddy/include/uk/allocbbuddy.h      | 2 --
 lib/ukargparse/argparse.c                       | 2 --
 lib/ukargparse/include/uk/argparse.h            | 2 --
 lib/ukboot/boot.c                               | 2 --
 lib/ukbus/bus.c                                 | 2 --
 lib/ukbus/include/uk/bus.h                      | 2 --
 lib/ukdebug/hexdump.c                           | 2 --
 lib/ukdebug/include/uk/assert.h                 | 2 --
 lib/ukdebug/include/uk/hexdump.h                | 2 --
 lib/ukdebug/include/uk/print.h                  | 2 --
 lib/ukdebug/include/uk/trace.h                  | 2 --
 lib/ukdebug/snprintf.h                          | 2 --
 lib/ukdebug/trace.c                             | 2 --
 lib/uklibparam/include/uk/libparam.h            | 2 --
 lib/uklibparam/param.c                          | 2 --
 lib/uklock/include/uk/mutex.h                   | 2 --
 lib/ukmmap/mmap.c                               | 2 --
 lib/ukmpi/include/uk/mbox.h                     | 2 --
 lib/uknetdev/include/uk/netbuf.h                | 2 --
 lib/uknetdev/netbuf.c                           | 2 --
 lib/uksched/include/uk/sched.h                  | 2 --
 lib/uksched/sched.c                             | 2 --
 lib/ukschedcoop/include/uk/schedcoop.h          | 2 --
 lib/ukswrand/include/uk/swrand.h                | 2 --
 lib/ukswrand/mwc.c                              | 2 --
 lib/vfscore/fd.c                                | 2 --
 lib/vfscore/file.c                              | 2 --
 lib/vfscore/fops.c                              | 2 --
 lib/vfscore/include/vfscore/dentry.h            | 2 --
 lib/vfscore/include/vfscore/file.h              | 2 --
 lib/vfscore/include/vfscore/prex.h              | 2 --
 lib/vfscore/rootfs.c                            | 2 --
 lib/vfscore/stdio.c                             | 2 --
 plat/common/arm/generic_timer.c                 | 2 --
 plat/common/include/arm/arm/cpu.h               | 2 --
 plat/common/include/pci/pci_bus.h               | 2 --
 plat/common/include/uk/plat/common/sw_ctx.h     | 2 --
 plat/common/include/uk/plat/common/tls.h        | 2 --
 plat/common/include/x86/tls.h                   | 2 --
 plat/common/pci_bus.c                           | 2 --
 plat/common/sw_ctx.c                            | 2 --
 plat/common/thread.c                            | 2 --
 plat/common/x86/cpu_features.c                  | 2 --
 plat/common/x86/syscall.S                       | 2 --
 plat/drivers/include/virtio/virtio_bus.h        | 2 --
 plat/drivers/include/virtio/virtio_config.h     | 2 --
 plat/drivers/include/virtio/virtqueue.h         | 2 --
 plat/drivers/virtio/virtio_bus.c                | 2 --
 plat/drivers/virtio/virtio_pci.c                | 2 --
 plat/drivers/virtio/virtio_ring.c               | 2 --
 plat/kvm/include/kvm/config.h                   | 2 --
 plat/kvm/io.c                                   | 2 --
 plat/kvm/x86/lcpu.c                             | 2 --
 plat/kvm/x86/time.c                             | 2 --
 plat/linuxu/arm/entry32.S                       | 2 --
 plat/linuxu/console.c                           | 2 --
 plat/linuxu/include/linuxu/console.h            | 2 --
 plat/linuxu/include/linuxu/ioctl.h              | 2 --
 plat/linuxu/include/linuxu/setup.h              | 2 --
 plat/linuxu/include/linuxu/syscall-arm_32.h     | 2 --
 plat/linuxu/include/linuxu/syscall-x86_64.h     | 2 --
 plat/linuxu/include/linuxu/syscall.h            | 2 --
 plat/linuxu/include/linuxu/tls.h                | 2 --
 plat/linuxu/io.c                                | 2 --
 plat/linuxu/lcpu.c                              | 2 --
 plat/linuxu/memory.c                            | 2 --
 plat/linuxu/setup.c                             | 2 --
 plat/linuxu/shutdown.c                          | 2 --
 plat/linuxu/time.c                              | 2 --
 plat/linuxu/x86/entry64.S                       | 2 --
 plat/xen/console.c                              | 2 --
 plat/xen/emg_console.c                          | 2 --
 plat/xen/emg_console.h                          | 2 --
 plat/xen/hv_console.c                           | 2 --
 plat/xen/hv_console.h                           | 2 --
 plat/xen/include/common/console.h               | 2 --
 plat/xen/include/xen-arm/setup.h                | 2 --
 plat/xen/include/xen-arm/smp.h                  | 2 --
 plat/xen/include/xen-arm/traps.h                | 2 --
 plat/xen/include/xen-x86/setup.h                | 2 --
 plat/xen/io.c                                   | 2 --
 plat/xen/lcpu.c                                 | 2 --
 plat/xen/memory.c                               | 2 --
 plat/xen/shutdown.c                             | 2 --
 support/scripts/uk-gdb.py                       | 2 --
 support/scripts/uk_trace/parse.py               | 2 --
 support/scripts/uk_trace/trace.py               | 2 --
 131 files changed, 262 deletions(-)

diff --git a/arch/arm/arm/include/uk/asm/intsizes.h 
b/arch/arm/arm/include/uk/asm/intsizes.h
index 0051c0ad1..1c4dfbca7 100644
--- a/arch/arm/arm/include/uk/asm/intsizes.h
+++ b/arch/arm/arm/include/uk/asm/intsizes.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #if ((!defined __UKARCH_TYPES_H__) && (!defined __UKARCH_LIMITS_H__))
diff --git a/arch/arm/arm/include/uk/asm/tls.h 
b/arch/arm/arm/include/uk/asm/tls.h
index 67d6f264f..6492863d6 100644
--- a/arch/arm/arm/include/uk/asm/tls.h
+++ b/arch/arm/arm/include/uk/asm/tls.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_TLS_H__
diff --git a/arch/arm/arm64/include/uk/asm/tls.h 
b/arch/arm/arm64/include/uk/asm/tls.h
index 6cc23f1c9..f092e1971 100644
--- a/arch/arm/arm64/include/uk/asm/tls.h
+++ b/arch/arm/arm64/include/uk/asm/tls.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_TLS_H__
diff --git a/arch/x86/x86_64/include/uk/asm/intsizes.h 
b/arch/x86/x86_64/include/uk/asm/intsizes.h
index 946ceca65..4b0eb61f9 100644
--- a/arch/x86/x86_64/include/uk/asm/intsizes.h
+++ b/arch/x86/x86_64/include/uk/asm/intsizes.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #if ((!defined __UKARCH_TYPES_H__) && (!defined __UKARCH_LIMITS_H__))
diff --git a/arch/x86/x86_64/include/uk/asm/tls.h 
b/arch/x86/x86_64/include/uk/asm/tls.h
index 116d8a1de..156107835 100644
--- a/arch/x86/x86_64/include/uk/asm/tls.h
+++ b/arch/x86/x86_64/include/uk/asm/tls.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_TLS_H__
diff --git a/include/uk/arch/lcpu.h b/include/uk/arch/lcpu.h
index c52162877..72a30f098 100644
--- a/include/uk/arch/lcpu.h
+++ b/include/uk/arch/lcpu.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_LCPU_H__
diff --git a/include/uk/arch/limits.h b/include/uk/arch/limits.h
index c4d4bc229..dbfc490e2 100644
--- a/include/uk/arch/limits.h
+++ b/include/uk/arch/limits.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_LIMITS_H__
diff --git a/include/uk/arch/time.h b/include/uk/arch/time.h
index ac2078874..f1726ffd2 100644
--- a/include/uk/arch/time.h
+++ b/include/uk/arch/time.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_TIME_H__
diff --git a/include/uk/arch/tls.h b/include/uk/arch/tls.h
index bfbcd5fcf..c8545baa6 100644
--- a/include/uk/arch/tls.h
+++ b/include/uk/arch/tls.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_TLS_H__
diff --git a/include/uk/arch/types.h b/include/uk/arch/types.h
index c409b9a3b..8329070aa 100644
--- a/include/uk/arch/types.h
+++ b/include/uk/arch/types.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKARCH_TYPES_H__
diff --git a/include/uk/config.h b/include/uk/config.h
index 9628b7baf..0edc9810a 100644
--- a/include/uk/config.h
+++ b/include/uk/config.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_CONFIG_H__
diff --git a/include/uk/errptr.h b/include/uk/errptr.h
index 6e8599441..857967247 100644
--- a/include/uk/errptr.h
+++ b/include/uk/errptr.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_ERRPTR_H__
diff --git a/include/uk/essentials.h b/include/uk/essentials.h
index 6bcee2e60..8f8b9d982 100644
--- a/include/uk/essentials.h
+++ b/include/uk/essentials.h
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_ESSENTIALS_H__
diff --git a/include/uk/init.h b/include/uk/init.h
index ba3f3b3db..18677dc74 100644
--- a/include/uk/init.h
+++ b/include/uk/init.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef _UK_INIT_H
 #define _UK_INIT_H
diff --git a/include/uk/plat/bootstrap.h b/include/uk/plat/bootstrap.h
index 0652ccd17..6af18ca0e 100644
--- a/include/uk/plat/bootstrap.h
+++ b/include/uk/plat/bootstrap.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKPLAT_BOOTSTRAP__
diff --git a/include/uk/plat/config.h b/include/uk/plat/config.h
index 9753d7545..7886d9a85 100644
--- a/include/uk/plat/config.h
+++ b/include/uk/plat/config.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_ARCH_CONFIG_H__
diff --git a/include/uk/plat/io.h b/include/uk/plat/io.h
index 6a9218663..f6c4765fd 100644
--- a/include/uk/plat/io.h
+++ b/include/uk/plat/io.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __UKPLAT_IO_H__
 #define __UKPLAT_IO_H__
diff --git a/include/uk/plat/lcpu.h b/include/uk/plat/lcpu.h
index 77e584665..457dc6cee 100644
--- a/include/uk/plat/lcpu.h
+++ b/include/uk/plat/lcpu.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKPLAT_LCPU_H__
diff --git a/include/uk/plat/memory.h b/include/uk/plat/memory.h
index 4c4e4dc42..ac3a1896f 100644
--- a/include/uk/plat/memory.h
+++ b/include/uk/plat/memory.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKPLAT_MEMORY_H__
diff --git a/include/uk/plat/syscall.h b/include/uk/plat/syscall.h
index f62ddfe3e..c6860bdd6 100644
--- a/include/uk/plat/syscall.h
+++ b/include/uk/plat/syscall.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKPLAT_SYSCALL__
diff --git a/include/uk/plat/thread.h b/include/uk/plat/thread.h
index 4b349ea7f..980747f13 100644
--- a/include/uk/plat/thread.h
+++ b/include/uk/plat/thread.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 /*
diff --git a/include/uk/plat/time.h b/include/uk/plat/time.h
index ad3fd9545..f1dc9b94f 100644
--- a/include/uk/plat/time.h
+++ b/include/uk/plat/time.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKPLAT_TIME_H__
diff --git a/include/uk/prio.h b/include/uk/prio.h
index c49b784fb..a94e7b458 100644
--- a/include/uk/prio.h
+++ b/include/uk/prio.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __UK_PRIO_H__
 #define __UK_PRIO_H__
diff --git a/lib/nolibc/errno.c b/lib/nolibc/errno.c
index d6c2dc894..29475ad9e 100644
--- a/lib/nolibc/errno.c
+++ b/lib/nolibc/errno.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <errno.h>
diff --git a/lib/nolibc/include/assert.h b/lib/nolibc/include/assert.h
index 1e1115951..f19e8fc0c 100644
--- a/lib/nolibc/include/assert.h
+++ b/lib/nolibc/include/assert.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __ASSERT_H__
diff --git a/lib/nolibc/include/errno.h b/lib/nolibc/include/errno.h
index 29f4c8b31..c02090db1 100644
--- a/lib/nolibc/include/errno.h
+++ b/lib/nolibc/include/errno.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __ERRNO_H__
diff --git a/lib/nolibc/include/inttypes.h b/lib/nolibc/include/inttypes.h
index ba9ea81a3..03aa1c176 100644
--- a/lib/nolibc/include/inttypes.h
+++ b/lib/nolibc/include/inttypes.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __INTTYPES_H__
diff --git a/lib/nolibc/include/limits.h b/lib/nolibc/include/limits.h
index e66bbace6..8613cbbbf 100644
--- a/lib/nolibc/include/limits.h
+++ b/lib/nolibc/include/limits.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __LIMITS_H__
diff --git a/lib/nolibc/include/nolibc-internal/shareddefs.h 
b/lib/nolibc/include/nolibc-internal/shareddefs.h
index d386820e5..3a6e41053 100644
--- a/lib/nolibc/include/nolibc-internal/shareddefs.h
+++ b/lib/nolibc/include/nolibc-internal/shareddefs.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 /* This header does by design not have include guards, so that it can be
diff --git a/lib/nolibc/include/stdarg.h b/lib/nolibc/include/stdarg.h
index 752269853..16eb15bf2 100644
--- a/lib/nolibc/include/stdarg.h
+++ b/lib/nolibc/include/stdarg.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __STDARG_H__
diff --git a/lib/nolibc/include/stddef.h b/lib/nolibc/include/stddef.h
index 9fb27b179..5abede766 100644
--- a/lib/nolibc/include/stddef.h
+++ b/lib/nolibc/include/stddef.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __STDDEF_H__
diff --git a/lib/nolibc/include/stdint.h b/lib/nolibc/include/stdint.h
index a6a55c49d..3b516a709 100644
--- a/lib/nolibc/include/stdint.h
+++ b/lib/nolibc/include/stdint.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __STDINT_H__
diff --git a/lib/nolibc/include/stdio.h b/lib/nolibc/include/stdio.h
index f844ffa8d..6c08d2db3 100644
--- a/lib/nolibc/include/stdio.h
+++ b/lib/nolibc/include/stdio.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __STDIO_H__
diff --git a/lib/nolibc/include/string.h b/lib/nolibc/include/string.h
index 2644aea4c..b7d542091 100644
--- a/lib/nolibc/include/string.h
+++ b/lib/nolibc/include/string.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __STRING_H__
diff --git a/lib/nolibc/include/sys/mount.h b/lib/nolibc/include/sys/mount.h
index c8b1fe274..01be0f78f 100644
--- a/lib/nolibc/include/sys/mount.h
+++ b/lib/nolibc/include/sys/mount.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef _SYS_MOUNT_H
diff --git a/lib/nolibc/include/sys/types.h b/lib/nolibc/include/sys/types.h
index 4da777c8e..fc42ee310 100644
--- a/lib/nolibc/include/sys/types.h
+++ b/lib/nolibc/include/sys/types.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 
diff --git a/lib/nolibc/include/sys/uio.h b/lib/nolibc/include/sys/uio.h
index d1a4b48dd..984b98071 100644
--- a/lib/nolibc/include/sys/uio.h
+++ b/lib/nolibc/include/sys/uio.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef _SYS_UIO_H
diff --git a/lib/nolibc/include/unistd.h b/lib/nolibc/include/unistd.h
index 1a5a49253..8ee8878e9 100644
--- a/lib/nolibc/include/unistd.h
+++ b/lib/nolibc/include/unistd.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UNISTD_H__
diff --git a/lib/nolibc/malloc.c b/lib/nolibc/malloc.c
index faf880521..0a939111f 100644
--- a/lib/nolibc/malloc.c
+++ b/lib/nolibc/malloc.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stddef.h>
diff --git a/lib/nolibc/string.c b/lib/nolibc/string.c
index 327efcca9..9bcaea821 100644
--- a/lib/nolibc/string.c
+++ b/lib/nolibc/string.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 /* For the parts taken from musl (marked as such below), the MIT licence
  * applies instead:
diff --git a/lib/posix-user/user.c b/lib/posix-user/user.c
index e7c60dadc..2bede9fb3 100644
--- a/lib/posix-user/user.c
+++ b/lib/posix-user/user.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <unistd.h>
diff --git a/lib/syscall_shim/include/uk/syscall.h 
b/lib/syscall_shim/include/uk/syscall.h
index 70eebe7da..c58bae58c 100644
--- a/lib/syscall_shim/include/uk/syscall.h
+++ b/lib/syscall_shim/include/uk/syscall.h
@@ -30,8 +30,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_SYSCALL_H__
diff --git a/lib/ukalloc/include/uk/alloc.h b/lib/ukalloc/include/uk/alloc.h
index 14579220b..a4feb3f4f 100644
--- a/lib/ukalloc/include/uk/alloc.h
+++ b/lib/ukalloc/include/uk/alloc.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_ALLOC_H__
diff --git a/lib/ukalloc/include/uk/alloc_impl.h 
b/lib/ukalloc/include/uk/alloc_impl.h
index b15f49e73..844eca9a2 100644
--- a/lib/ukalloc/include/uk/alloc_impl.h
+++ b/lib/ukalloc/include/uk/alloc_impl.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 /*
diff --git a/lib/ukallocbbuddy/include/uk/allocbbuddy.h 
b/lib/ukallocbbuddy/include/uk/allocbbuddy.h
index d7afef4c1..3d7558b80 100644
--- a/lib/ukallocbbuddy/include/uk/allocbbuddy.h
+++ b/lib/ukallocbbuddy/include/uk/allocbbuddy.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKALLOCBBUDDY_H__
diff --git a/lib/ukargparse/argparse.c b/lib/ukargparse/argparse.c
index db7ed1309..435504cf1 100644
--- a/lib/ukargparse/argparse.c
+++ b/lib/ukargparse/argparse.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/argparse.h>
diff --git a/lib/ukargparse/include/uk/argparse.h 
b/lib/ukargparse/include/uk/argparse.h
index 7a8420c94..a1e1a59d7 100644
--- a/lib/ukargparse/include/uk/argparse.h
+++ b/lib/ukargparse/include/uk/argparse.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_ARGPARSE__
diff --git a/lib/ukboot/boot.c b/lib/ukboot/boot.c
index 2f7ab24a0..960fdd310 100644
--- a/lib/ukboot/boot.c
+++ b/lib/ukboot/boot.c
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/config.h>
diff --git a/lib/ukbus/bus.c b/lib/ukbus/bus.c
index 1d63f4dce..311890f2d 100644
--- a/lib/ukbus/bus.c
+++ b/lib/ukbus/bus.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/bus.h>
diff --git a/lib/ukbus/include/uk/bus.h b/lib/ukbus/include/uk/bus.h
index fcb684210..e192e7dda 100644
--- a/lib/ukbus/include/uk/bus.h
+++ b/lib/ukbus/include/uk/bus.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_BUS__
diff --git a/lib/ukdebug/hexdump.c b/lib/ukdebug/hexdump.c
index 0708489d9..696db6948 100644
--- a/lib/ukdebug/hexdump.c
+++ b/lib/ukdebug/hexdump.c
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <string.h>
diff --git a/lib/ukdebug/include/uk/assert.h b/lib/ukdebug/include/uk/assert.h
index d81f42f9e..6732e5d47 100644
--- a/lib/ukdebug/include/uk/assert.h
+++ b/lib/ukdebug/include/uk/assert.h
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKDEBUG_ASSERT_H__
diff --git a/lib/ukdebug/include/uk/hexdump.h b/lib/ukdebug/include/uk/hexdump.h
index 2e91edb2d..676ae8da7 100644
--- a/lib/ukdebug/include/uk/hexdump.h
+++ b/lib/ukdebug/include/uk/hexdump.h
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKDEBUG_HEXDUMP_H__
diff --git a/lib/ukdebug/include/uk/print.h b/lib/ukdebug/include/uk/print.h
index 30e3efe4a..c3c95f411 100644
--- a/lib/ukdebug/include/uk/print.h
+++ b/lib/ukdebug/include/uk/print.h
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKDEBUG_PRINT_H__
diff --git a/lib/ukdebug/include/uk/trace.h b/lib/ukdebug/include/uk/trace.h
index bc8da435a..6ca1b0663 100644
--- a/lib/ukdebug/include/uk/trace.h
+++ b/lib/ukdebug/include/uk/trace.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef _UK_TRACE_H_
diff --git a/lib/ukdebug/snprintf.h b/lib/ukdebug/snprintf.h
index fa167e687..edebb52c6 100644
--- a/lib/ukdebug/snprintf.h
+++ b/lib/ukdebug/snprintf.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UKDEBUG_INTERNAL_SNPRINTF_H__
diff --git a/lib/ukdebug/trace.c b/lib/ukdebug/trace.c
index 0a1358193..2572560c1 100644
--- a/lib/ukdebug/trace.c
+++ b/lib/ukdebug/trace.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stddef.h>
diff --git a/lib/uklibparam/include/uk/libparam.h 
b/lib/uklibparam/include/uk/libparam.h
index f8f8ba4b6..0bf9fc320 100644
--- a/lib/uklibparam/include/uk/libparam.h
+++ b/lib/uklibparam/include/uk/libparam.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __UK_LIBPARAM_H
 #define __UK_LIBPARAM_H
diff --git a/lib/uklibparam/param.c b/lib/uklibparam/param.c
index 948150cd4..09fe48b23 100644
--- a/lib/uklibparam/param.c
+++ b/lib/uklibparam/param.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #include <string.h>
 #include <stdlib.h>
diff --git a/lib/uklock/include/uk/mutex.h b/lib/uklock/include/uk/mutex.h
index d4435ebdb..050cecb72 100644
--- a/lib/uklock/include/uk/mutex.h
+++ b/lib/uklock/include/uk/mutex.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_MUTEX_H__
diff --git a/lib/ukmmap/mmap.c b/lib/ukmmap/mmap.c
index ea0173a98..34f73a888 100644
--- a/lib/ukmmap/mmap.c
+++ b/lib/ukmmap/mmap.c
@@ -30,8 +30,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <sys/mman.h>
diff --git a/lib/ukmpi/include/uk/mbox.h b/lib/ukmpi/include/uk/mbox.h
index 19b1ecc0b..bff551e08 100644
--- a/lib/ukmpi/include/uk/mbox.h
+++ b/lib/ukmpi/include/uk/mbox.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 
diff --git a/lib/uknetdev/include/uk/netbuf.h b/lib/uknetdev/include/uk/netbuf.h
index 5212614aa..f79a36218 100644
--- a/lib/uknetdev/include/uk/netbuf.h
+++ b/lib/uknetdev/include/uk/netbuf.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __UK_NETBUF__
 #define __UK_NETBUF__
diff --git a/lib/uknetdev/netbuf.c b/lib/uknetdev/netbuf.c
index d87af0530..81ad3af33 100644
--- a/lib/uknetdev/netbuf.c
+++ b/lib/uknetdev/netbuf.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #include <uk/netbuf.h>
 #include <uk/essentials.h>
diff --git a/lib/uksched/include/uk/sched.h b/lib/uksched/include/uk/sched.h
index 36ef76d7c..2e9368df5 100644
--- a/lib/uksched/include/uk/sched.h
+++ b/lib/uksched/include/uk/sched.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_SCHED_H__
diff --git a/lib/uksched/sched.c b/lib/uksched/sched.c
index 5a58629b8..86e6f6ee4 100644
--- a/lib/uksched/sched.c
+++ b/lib/uksched/sched.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdlib.h>
diff --git a/lib/ukschedcoop/include/uk/schedcoop.h 
b/lib/ukschedcoop/include/uk/schedcoop.h
index b0b6b06bb..62bc8f6d9 100644
--- a/lib/ukschedcoop/include/uk/schedcoop.h
+++ b/lib/ukschedcoop/include/uk/schedcoop.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 /*
  * Non-preemptive (cooperative) Round Robin scheduler.
diff --git a/lib/ukswrand/include/uk/swrand.h b/lib/ukswrand/include/uk/swrand.h
index 69579a1aa..1172e6cb1 100644
--- a/lib/ukswrand/include/uk/swrand.h
+++ b/lib/ukswrand/include/uk/swrand.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __UK_SWRAND__
diff --git a/lib/ukswrand/mwc.c b/lib/ukswrand/mwc.c
index f032e950a..bfe67fc91 100644
--- a/lib/ukswrand/mwc.c
+++ b/lib/ukswrand/mwc.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <string.h>
diff --git a/lib/vfscore/fd.c b/lib/vfscore/fd.c
index 956846ffc..a5562ca18 100644
--- a/lib/vfscore/fd.c
+++ b/lib/vfscore/fd.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <string.h>
diff --git a/lib/vfscore/file.c b/lib/vfscore/file.c
index bc8b0dc85..c5c4d3f74 100644
--- a/lib/vfscore/file.c
+++ b/lib/vfscore/file.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <unistd.h>
diff --git a/lib/vfscore/fops.c b/lib/vfscore/fops.c
index 0cef2c12c..065bca0b3 100644
--- a/lib/vfscore/fops.c
+++ b/lib/vfscore/fops.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #define _GNU_SOURCE
diff --git a/lib/vfscore/include/vfscore/dentry.h 
b/lib/vfscore/include/vfscore/dentry.h
index 2c356530e..46444aa3d 100644
--- a/lib/vfscore/include/vfscore/dentry.h
+++ b/lib/vfscore/include/vfscore/dentry.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef _OSV_DENTRY_H
diff --git a/lib/vfscore/include/vfscore/file.h 
b/lib/vfscore/include/vfscore/file.h
index d630ccb8d..bf2510f13 100644
--- a/lib/vfscore/include/vfscore/file.h
+++ b/lib/vfscore/include/vfscore/file.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __VFSCORE_FILE_H__
diff --git a/lib/vfscore/include/vfscore/prex.h 
b/lib/vfscore/include/vfscore/prex.h
index 1ba8f9698..627d70739 100644
--- a/lib/vfscore/include/vfscore/prex.h
+++ b/lib/vfscore/include/vfscore/prex.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef _UK_PREX_H
diff --git a/lib/vfscore/rootfs.c b/lib/vfscore/rootfs.c
index 4b9512a4e..8a6e099f4 100644
--- a/lib/vfscore/rootfs.c
+++ b/lib/vfscore/rootfs.c
@@ -32,8 +32,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #include <errno.h>
 #include <uk/config.h>
diff --git a/lib/vfscore/stdio.c b/lib/vfscore/stdio.c
index 62a7a6074..b59a9ee3d 100644
--- a/lib/vfscore/stdio.c
+++ b/lib/vfscore/stdio.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <vfscore/file.h>
diff --git a/plat/common/arm/generic_timer.c b/plat/common/arm/generic_timer.c
index 58a9f4036..6ea8b8734 100644
--- a/plat/common/arm/generic_timer.c
+++ b/plat/common/arm/generic_timer.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #include <stdlib.h>
 #include <uk/assert.h>
diff --git a/plat/common/include/arm/arm/cpu.h 
b/plat/common/include/arm/arm/cpu.h
index c966cb41f..c9a169157 100644
--- a/plat/common/include/arm/arm/cpu.h
+++ b/plat/common/include/arm/arm/cpu.h
@@ -32,8 +32,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef _PLAT_COMMON_ARM_ARM_CPU_H_
 #define _PLAT_COMMON_ARM_ARM_CPU_H_
diff --git a/plat/common/include/pci/pci_bus.h 
b/plat/common/include/pci/pci_bus.h
index db406a1b1..86cab11b8 100644
--- a/plat/common/include/pci/pci_bus.h
+++ b/plat/common/include/pci/pci_bus.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 /*
  * Copyright(c) 2010-2015 Intel Corporation.
diff --git a/plat/common/include/uk/plat/common/sw_ctx.h 
b/plat/common/include/uk/plat/common/sw_ctx.h
index 366c6a8f8..63ffb6741 100644
--- a/plat/common/include/uk/plat/common/sw_ctx.h
+++ b/plat/common/include/uk/plat/common/sw_ctx.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __PLAT_CMN_SW_CTX_H__
 #define __PLAT_CMN_SW_CTX_H__
diff --git a/plat/common/include/uk/plat/common/tls.h 
b/plat/common/include/uk/plat/common/tls.h
index 6fb78d249..492066eee 100644
--- a/plat/common/include/uk/plat/common/tls.h
+++ b/plat/common/include/uk/plat/common/tls.h
@@ -26,8 +26,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __PLAT_CMN_TLS_H__
 #define __PLAT_CMN_TLS_H__
diff --git a/plat/common/include/x86/tls.h b/plat/common/include/x86/tls.h
index 5811bcd70..af3bd3359 100644
--- a/plat/common/include/x86/tls.h
+++ b/plat/common/include/x86/tls.h
@@ -26,8 +26,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __PLAT_CMN_X86_TLS_H__
 #define __PLAT_CMN_X86_TLS_H__
diff --git a/plat/common/pci_bus.c b/plat/common/pci_bus.c
index 7a66e94f8..86aeee6ba 100644
--- a/plat/common/pci_bus.c
+++ b/plat/common/pci_bus.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 /* Some code was derived from Solo5: */
 /*
diff --git a/plat/common/sw_ctx.c b/plat/common/sw_ctx.c
index 482e99e61..2c4fc613d 100644
--- a/plat/common/sw_ctx.c
+++ b/plat/common/sw_ctx.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdint.h>
diff --git a/plat/common/thread.c b/plat/common/thread.c
index ccfeb2966..80074e5d2 100644
--- a/plat/common/thread.c
+++ b/plat/common/thread.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdlib.h>
diff --git a/plat/common/x86/cpu_features.c b/plat/common/x86/cpu_features.c
index 070973971..1e44901c0 100644
--- a/plat/common/x86/cpu_features.c
+++ b/plat/common/x86/cpu_features.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <x86/cpu.h>
diff --git a/plat/common/x86/syscall.S b/plat/common/x86/syscall.S
index b367a5d73..71613b073 100644
--- a/plat/common/x86/syscall.S
+++ b/plat/common/x86/syscall.S
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/arch/lcpu.h>
diff --git a/plat/drivers/include/virtio/virtio_bus.h 
b/plat/drivers/include/virtio/virtio_bus.h
index b3bb83314..953a6090c 100644
--- a/plat/drivers/include/virtio/virtio_bus.h
+++ b/plat/drivers/include/virtio/virtio_bus.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __PLAT_DRV_VIRTIO_H
diff --git a/plat/drivers/include/virtio/virtio_config.h 
b/plat/drivers/include/virtio/virtio_config.h
index 1221bbc57..99005fa8a 100644
--- a/plat/drivers/include/virtio/virtio_config.h
+++ b/plat/drivers/include/virtio/virtio_config.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __PLAT_DRV_VIRTIO_CONFIG_H
diff --git a/plat/drivers/include/virtio/virtqueue.h 
b/plat/drivers/include/virtio/virtqueue.h
index 147982883..3055549aa 100644
--- a/plat/drivers/include/virtio/virtqueue.h
+++ b/plat/drivers/include/virtio/virtqueue.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __PLAT_DRV_VIRTQUEUE_H__
diff --git a/plat/drivers/virtio/virtio_bus.c b/plat/drivers/virtio/virtio_bus.c
index 1c34487f9..f41c75435 100644
--- a/plat/drivers/virtio/virtio_bus.c
+++ b/plat/drivers/virtio/virtio_bus.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/config.h>
diff --git a/plat/drivers/virtio/virtio_pci.c b/plat/drivers/virtio/virtio_pci.c
index c0c9032f6..fe21e6a1c 100644
--- a/plat/drivers/virtio/virtio_pci.c
+++ b/plat/drivers/virtio/virtio_pci.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/config.h>
diff --git a/plat/drivers/virtio/virtio_ring.c 
b/plat/drivers/virtio/virtio_ring.c
index 0a5c3f3ea..1579e91c6 100644
--- a/plat/drivers/virtio/virtio_ring.c
+++ b/plat/drivers/virtio/virtio_ring.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 /**
  * Inspired from the FreeBSD.
diff --git a/plat/kvm/include/kvm/config.h b/plat/kvm/include/kvm/config.h
index 37136820a..e5844b329 100644
--- a/plat/kvm/include/kvm/config.h
+++ b/plat/kvm/include/kvm/config.h
@@ -31,8 +31,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __KVM_CONFIG_H__
diff --git a/plat/kvm/io.c b/plat/kvm/io.c
index fca55fb50..14a8c01a9 100644
--- a/plat/kvm/io.c
+++ b/plat/kvm/io.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/plat/io.h>
diff --git a/plat/kvm/x86/lcpu.c b/plat/kvm/x86/lcpu.c
index 42e2faa35..ed359e5c0 100644
--- a/plat/kvm/x86/lcpu.c
+++ b/plat/kvm/x86/lcpu.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdint.h>
diff --git a/plat/kvm/x86/time.c b/plat/kvm/x86/time.c
index 333ad9f3d..fde42653c 100644
--- a/plat/kvm/x86/time.c
+++ b/plat/kvm/x86/time.c
@@ -36,8 +36,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdlib.h>
diff --git a/plat/linuxu/arm/entry32.S b/plat/linuxu/arm/entry32.S
index 5080ff22a..9e0e8a94a 100644
--- a/plat/linuxu/arm/entry32.S
+++ b/plat/linuxu/arm/entry32.S
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 .section .text
diff --git a/plat/linuxu/console.c b/plat/linuxu/console.c
index 6f27787b4..5d2885678 100644
--- a/plat/linuxu/console.c
+++ b/plat/linuxu/console.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <inttypes.h>
diff --git a/plat/linuxu/include/linuxu/console.h 
b/plat/linuxu/include/linuxu/console.h
index acae389f7..4b88d9a73 100644
--- a/plat/linuxu/include/linuxu/console.h
+++ b/plat/linuxu/include/linuxu/console.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __CONSOLE_H__
diff --git a/plat/linuxu/include/linuxu/ioctl.h 
b/plat/linuxu/include/linuxu/ioctl.h
index 3fc5c251d..ada62ea87 100644
--- a/plat/linuxu/include/linuxu/ioctl.h
+++ b/plat/linuxu/include/linuxu/ioctl.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __IOCTL_H__
diff --git a/plat/linuxu/include/linuxu/setup.h 
b/plat/linuxu/include/linuxu/setup.h
index 571d66cd1..a4f23f37e 100644
--- a/plat/linuxu/include/linuxu/setup.h
+++ b/plat/linuxu/include/linuxu/setup.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __SETUP_H__
diff --git a/plat/linuxu/include/linuxu/syscall-arm_32.h 
b/plat/linuxu/include/linuxu/syscall-arm_32.h
index ef9323bea..399e167e8 100644
--- a/plat/linuxu/include/linuxu/syscall-arm_32.h
+++ b/plat/linuxu/include/linuxu/syscall-arm_32.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __SYSCALL_ARM_32_H__
diff --git a/plat/linuxu/include/linuxu/syscall-x86_64.h 
b/plat/linuxu/include/linuxu/syscall-x86_64.h
index 553f0ba4a..3e43b3f17 100644
--- a/plat/linuxu/include/linuxu/syscall-x86_64.h
+++ b/plat/linuxu/include/linuxu/syscall-x86_64.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __SYSCALL_X86_64_H__
diff --git a/plat/linuxu/include/linuxu/syscall.h 
b/plat/linuxu/include/linuxu/syscall.h
index 0dca7c5c0..949c04253 100644
--- a/plat/linuxu/include/linuxu/syscall.h
+++ b/plat/linuxu/include/linuxu/syscall.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __SYSCALL_H__
diff --git a/plat/linuxu/include/linuxu/tls.h b/plat/linuxu/include/linuxu/tls.h
index 97474104b..225739e86 100644
--- a/plat/linuxu/include/linuxu/tls.h
+++ b/plat/linuxu/include/linuxu/tls.h
@@ -26,8 +26,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 #ifndef __PLAT_LINUXU_TLS_H__
 #define __PLAT_LINUXU_TLS_H__
diff --git a/plat/linuxu/io.c b/plat/linuxu/io.c
index 978aacb44..67ad95d55 100644
--- a/plat/linuxu/io.c
+++ b/plat/linuxu/io.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/plat/io.h>
diff --git a/plat/linuxu/lcpu.c b/plat/linuxu/lcpu.c
index b545ca8d2..fbf8c5e7a 100644
--- a/plat/linuxu/lcpu.c
+++ b/plat/linuxu/lcpu.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdlib.h>
diff --git a/plat/linuxu/memory.c b/plat/linuxu/memory.c
index 9b5479e83..5b3df9b3a 100644
--- a/plat/linuxu/memory.c
+++ b/plat/linuxu/memory.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <errno.h>
diff --git a/plat/linuxu/setup.c b/plat/linuxu/setup.c
index 4e224a3dc..329a3e6fd 100644
--- a/plat/linuxu/setup.c
+++ b/plat/linuxu/setup.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/config.h>
diff --git a/plat/linuxu/shutdown.c b/plat/linuxu/shutdown.c
index 8eef53bb5..988fcace7 100644
--- a/plat/linuxu/shutdown.c
+++ b/plat/linuxu/shutdown.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <errno.h>
diff --git a/plat/linuxu/time.c b/plat/linuxu/time.c
index c6a5b349f..4e4dcb5f9 100644
--- a/plat/linuxu/time.c
+++ b/plat/linuxu/time.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <string.h>
diff --git a/plat/linuxu/x86/entry64.S b/plat/linuxu/x86/entry64.S
index f111a9526..e76b411e4 100644
--- a/plat/linuxu/x86/entry64.S
+++ b/plat/linuxu/x86/entry64.S
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 .section .text
diff --git a/plat/xen/console.c b/plat/xen/console.c
index 437e128cd..74ebb7941 100644
--- a/plat/xen/console.c
+++ b/plat/xen/console.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <uk/config.h>
diff --git a/plat/xen/emg_console.c b/plat/xen/emg_console.c
index 5cd0d2464..d5868a120 100644
--- a/plat/xen/emg_console.c
+++ b/plat/xen/emg_console.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 /*
diff --git a/plat/xen/emg_console.h b/plat/xen/emg_console.h
index d98387481..0a6e395ce 100644
--- a/plat/xen/emg_console.h
+++ b/plat/xen/emg_console.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __XEN_EMG_CONSOLE_H__
diff --git a/plat/xen/hv_console.c b/plat/xen/hv_console.c
index c32a41576..7ee23a089 100644
--- a/plat/xen/hv_console.c
+++ b/plat/xen/hv_console.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 /*
diff --git a/plat/xen/hv_console.h b/plat/xen/hv_console.h
index 69be1edee..836866591 100644
--- a/plat/xen/hv_console.h
+++ b/plat/xen/hv_console.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __XEN_HV_CONSOLE_H__
diff --git a/plat/xen/include/common/console.h 
b/plat/xen/include/common/console.h
index 23c6b32e4..add6a63d7 100644
--- a/plat/xen/include/common/console.h
+++ b/plat/xen/include/common/console.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __CONSOLE_H__
diff --git a/plat/xen/include/xen-arm/setup.h b/plat/xen/include/xen-arm/setup.h
index 550e77e18..eb6154cd2 100644
--- a/plat/xen/include/xen-arm/setup.h
+++ b/plat/xen/include/xen-arm/setup.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __SETUP_H__
diff --git a/plat/xen/include/xen-arm/smp.h b/plat/xen/include/xen-arm/smp.h
index f825f27dd..5f15c8a44 100644
--- a/plat/xen/include/xen-arm/smp.h
+++ b/plat/xen/include/xen-arm/smp.h
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef PLAT_XEN_INCLUDE_XEN_ARM_SMP_H_
diff --git a/plat/xen/include/xen-arm/traps.h b/plat/xen/include/xen-arm/traps.h
index 4fd435185..993664e27 100644
--- a/plat/xen/include/xen-arm/traps.h
+++ b/plat/xen/include/xen-arm/traps.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef _TRAPS_H_
diff --git a/plat/xen/include/xen-x86/setup.h b/plat/xen/include/xen-x86/setup.h
index 7a5719014..0d9eecb07 100644
--- a/plat/xen/include/xen-x86/setup.h
+++ b/plat/xen/include/xen-x86/setup.h
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #ifndef __SETUP_H__
diff --git a/plat/xen/io.c b/plat/xen/io.c
index 3fd1be2ba..57c87d4d9 100644
--- a/plat/xen/io.c
+++ b/plat/xen/io.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdint.h>
diff --git a/plat/xen/lcpu.c b/plat/xen/lcpu.c
index d7158dfa9..d6b18f7a5 100644
--- a/plat/xen/lcpu.c
+++ b/plat/xen/lcpu.c
@@ -28,8 +28,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <stdint.h>
diff --git a/plat/xen/memory.c b/plat/xen/memory.c
index 8e7a7ddad..b390aab62 100644
--- a/plat/xen/memory.c
+++ b/plat/xen/memory.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <string.h>
diff --git a/plat/xen/shutdown.c b/plat/xen/shutdown.c
index c7bf12d74..ba6c3fad4 100644
--- a/plat/xen/shutdown.c
+++ b/plat/xen/shutdown.c
@@ -29,8 +29,6 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- *
- * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
  */
 
 #include <inttypes.h>
diff --git a/support/scripts/uk-gdb.py b/support/scripts/uk-gdb.py
index 14aa9aafd..db1655313 100644
--- a/support/scripts/uk-gdb.py
+++ b/support/scripts/uk-gdb.py
@@ -29,8 +29,6 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
 
 import gdb
 import pickle
diff --git a/support/scripts/uk_trace/parse.py 
b/support/scripts/uk_trace/parse.py
index 8142bc454..02f0efd32 100644
--- a/support/scripts/uk_trace/parse.py
+++ b/support/scripts/uk_trace/parse.py
@@ -28,8 +28,6 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
 
 import struct
 import sys
diff --git a/support/scripts/uk_trace/trace.py 
b/support/scripts/uk_trace/trace.py
index 5fafca632..40c560297 100755
--- a/support/scripts/uk_trace/trace.py
+++ b/support/scripts/uk_trace/trace.py
@@ -29,8 +29,6 @@
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
-#
-# THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
 
 import click
 import os, sys
-- 
2.20.1



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.