diff --git a/CHANGELOG b/CHANGELOG
index 5a3e8f17f84479303ebc7f9b61743ae78d92f3a5..2f5fe91bb0c870aa6d2c6c64fd6a107630b60d53 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,12 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Remove unnnecessary #include <linux/types.h> from include/asm-*/u-boot.h
+
 * Allow use of include/image.h and include/asm-*/u-boot.h in proprietary code.
   The COPYING file was extended to make clear that these files can be
   used in non-GPL code, too.
+  Also, a corresponding note was placed in the headers of the affected files.
 
 * Add support for Prodrive P3P440 board:
   - Added onboard PPC440 DDR autodetection in cpu/ppc/sdram.c
diff --git a/include/asm-arm/u-boot.h b/include/asm-arm/u-boot.h
index c3b0e4a6ba3cb699416f4c016285da4affeaa9ee..146934cf0cbd887e0e7ce7727bd973dfc26a6d9f 100644
--- a/include/asm-arm/u-boot.h
+++ b/include/asm-arm/u-boot.h
@@ -24,6 +24,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef _U_BOOT_H_
diff --git a/include/asm-i386/u-boot.h b/include/asm-i386/u-boot.h
index 346673228ec61e0bab5de4062f920f2f2681ea13..1e19f8f3d29a8eaf9605ea70ae50c8bffdc8cca9 100644
--- a/include/asm-i386/u-boot.h
+++ b/include/asm-i386/u-boot.h
@@ -24,6 +24,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef _U_BOOT_H_
diff --git a/include/asm-m68k/u-boot.h b/include/asm-m68k/u-boot.h
index 3a21fd287efcb14abdd2472e60c08dd867ecdc87..7a6a8c1ff1b05de6a76e7a0de22be9741be2b6e1 100644
--- a/include/asm-m68k/u-boot.h
+++ b/include/asm-m68k/u-boot.h
@@ -16,6 +16,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef __U_BOOT_H__
@@ -28,7 +35,6 @@
  */
 
 #ifndef __ASSEMBLY__
-#include <linux/types.h>
 
 typedef struct bd_info {
 	unsigned long	bi_memstart;	/* start of DRAM memory */
diff --git a/include/asm-microblaze/u-boot.h b/include/asm-microblaze/u-boot.h
index 4531e724f945d2984191dd1f6b3054c0b11e78a6..e2035bd79c5d283cb336cdd05f00a158610e79db 100644
--- a/include/asm-microblaze/u-boot.h
+++ b/include/asm-microblaze/u-boot.h
@@ -20,6 +20,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef _U_BOOT_H_
diff --git a/include/asm-mips/u-boot.h b/include/asm-mips/u-boot.h
index 0de0b4da8a119aa4891d642e46797d021582672d..d1273a4535663f781d5b7780f81fe287c452c9d6 100644
--- a/include/asm-mips/u-boot.h
+++ b/include/asm-mips/u-boot.h
@@ -19,6 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef _U_BOOT_H_
diff --git a/include/asm-nios/u-boot.h b/include/asm-nios/u-boot.h
index 94007dc2ceb4c1be272b680b6192f35ab54f7584..aae4be13c463f89da84b535a244be6cd4889b393 100644
--- a/include/asm-nios/u-boot.h
+++ b/include/asm-nios/u-boot.h
@@ -20,6 +20,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef _U_BOOT_H_
diff --git a/include/asm-nios2/u-boot.h b/include/asm-nios2/u-boot.h
index b820e4ca819dbfb952d70c8c5797092f8d5842f9..3f299624ab2dc7e12ecccc19b33028ea6edc26eb 100644
--- a/include/asm-nios2/u-boot.h
+++ b/include/asm-nios2/u-boot.h
@@ -19,6 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef __ASM_NIOS2_U_BOOT_H_
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index 091d06c26801f61f7537582d114d31c11e63c4c4..f7aa55f33437635160a36fac765fe352e3174f92 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -16,6 +16,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef __U_BOOT_H__
@@ -28,7 +35,6 @@
  */
 
 #ifndef __ASSEMBLY__
-#include <linux/types.h>
 
 typedef struct bd_info {
 	unsigned long	bi_memstart;	/* start of DRAM memory */
diff --git a/include/image.h b/include/image.h
index 4c23f0e5b5293652391b81c2cf364e10ba77f030..af37bcad5aae712549fc38cd764ed59f95849ca4 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000
+ * (C) Copyright 2000-2005
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
@@ -19,6 +19,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
  * MA 02111-1307 USA
+ *
+ ********************************************************************
+ * NOTE: This header file defines an interface to U-Boot. Including
+ * this (unmodified) header file in another file is considered normal
+ * use of U-Boot, and does *not* fall under the heading of "derived
+ * work".
+ ********************************************************************
  */
 
 #ifndef __IMAGE_H__