2002-09-23  Theodore A. Roth  <address@hidden>

	* include/avr/io1200.h: Generate compiler warning if not included
		from avr/io.h.
	* include/avr/io2313.h: Ditto.
	* include/avr/io2323.h: Ditto.
	* include/avr/io2333.h: Ditto.
	* include/avr/io2343.h: Ditto.
	* include/avr/io4414.h: Ditto.
	* include/avr/io4433.h: Ditto.
	* include/avr/io4434.h: Ditto.
	* include/avr/io76c711.h: Ditto.
	* include/avr/io8515.h: Ditto.
	* include/avr/io8534.h: Ditto.
	* include/avr/io8535.h: Ditto.
	* include/avr/ioat94k.h: Ditto.
	* include/avr/iom103.h: Ditto.
	* include/avr/iom128.h: Ditto.
	* include/avr/iom161.h: Ditto.
	* include/avr/iom162.h: Ditto.
	* include/avr/iom163.h: Ditto.
	* include/avr/iom169.h: Ditto.
	* include/avr/iom323.h: Ditto.
	* include/avr/iom8.h: Ditto.
	* include/avr/iotn11.h: Ditto.
	* include/avr/iotn12.h: Ditto.
	* include/avr/iotn15.h: Ditto.
	* include/avr/iotn22.h: Ditto.
	* include/avr/iotn28.h: Ditto.

Index: include/avr/io1200.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io1200.h,v
retrieving revision 1.1
diff -u -r1.1 io1200.h
--- include/avr/io1200.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io1200.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO1200_H_
 #define _AVR_IO1200_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io1200.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #ifndef __ASSEMBLER__
 #  warning "MCU not supported by the C compiler"
 #endif
Index: include/avr/io2313.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io2313.h,v
retrieving revision 1.1
diff -u -r1.1 io2313.h
--- include/avr/io2313.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io2313.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO2313_H_
 #define _AVR_IO2313_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io2313.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io2323.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io2323.h,v
retrieving revision 1.1
diff -u -r1.1 io2323.h
--- include/avr/io2323.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io2323.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO2323_H_
 #define _AVR_IO2323_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io2323.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io2333.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io2333.h,v
retrieving revision 1.1
diff -u -r1.1 io2333.h
--- include/avr/io2333.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io2333.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO2333_H_
 #define _AVR_IO2333_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io2333.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io2343.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io2343.h,v
retrieving revision 1.1
diff -u -r1.1 io2343.h
--- include/avr/io2343.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io2343.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO2343_H_
 #define _AVR_IO2343_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io2343.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io4414.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io4414.h,v
retrieving revision 1.1
diff -u -r1.1 io4414.h
--- include/avr/io4414.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io4414.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO4414_H_
 #define _AVR_IO4414_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io4414.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io4433.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io4433.h,v
retrieving revision 1.1
diff -u -r1.1 io4433.h
--- include/avr/io4433.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io4433.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO4433_H_
 #define _AVR_IO4433_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io4433.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io4434.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io4434.h,v
retrieving revision 1.1
diff -u -r1.1 io4434.h
--- include/avr/io4434.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io4434.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO4434_H_
 #define _AVR_IO4434_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io4434.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io76c711.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io76c711.h,v
retrieving revision 1.1
diff -u -r1.1 io76c711.h
--- include/avr/io76c711.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io76c711.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO76C711_H_
 #define _AVR_IO76C711_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io76c711.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io8515.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io8515.h,v
retrieving revision 1.1
diff -u -r1.1 io8515.h
--- include/avr/io8515.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io8515.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO8515_H_
 #define _AVR_IO8515_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io8515.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io8534.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io8534.h,v
retrieving revision 1.1
diff -u -r1.1 io8534.h
--- include/avr/io8534.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io8534.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO8534_
 #define _AVR_IO8534_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io8534.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/io8535.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/io8535.h,v
retrieving revision 1.1
diff -u -r1.1 io8535.h
--- include/avr/io8535.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/io8535.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IO8535_H_
 #define _AVR_IO8535_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "io8535.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/ioat94k.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/ioat94k.h,v
retrieving revision 1.1
diff -u -r1.1 ioat94k.h
--- include/avr/ioat94k.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/ioat94k.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOAT94K_H_
 #define _AVR_IOAT94K_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "ioat94k.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom103.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom103.h,v
retrieving revision 1.1
diff -u -r1.1 iom103.h
--- include/avr/iom103.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iom103.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM103_H_
 #define _AVR_IOM103_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom103.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom128.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom128.h,v
retrieving revision 1.3
diff -u -r1.3 iom128.h
--- include/avr/iom128.h	28 Aug 2002 16:09:17 -0000	1.3
+++ include/avr/iom128.h	23 Sep 2002 16:50:41 -0000
@@ -31,6 +31,18 @@
 #ifndef _AVR_IOM128_H_
 #define _AVR_IOM128_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom128.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom161.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom161.h,v
retrieving revision 1.1
diff -u -r1.1 iom161.h
--- include/avr/iom161.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iom161.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM161_H_
 #define _AVR_IOM161_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom161.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom162.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom162.h,v
retrieving revision 1.1
diff -u -r1.1 iom162.h
--- include/avr/iom162.h	14 Jul 2002 17:43:34 -0000	1.1
+++ include/avr/iom162.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM162_H_
 #define _AVR_IOM162_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom162.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* Memory mapped I/O registers */
Index: include/avr/iom163.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom163.h,v
retrieving revision 1.1
diff -u -r1.1 iom163.h
--- include/avr/iom163.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iom163.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM163_H_
 #define _AVR_IOM163_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom163.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom169.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom169.h,v
retrieving revision 1.1
diff -u -r1.1 iom169.h
--- include/avr/iom169.h	31 Aug 2002 19:43:27 -0000	1.1
+++ include/avr/iom169.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM169_H_
 #define _AVR_IOM169_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom169.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom323.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom323.h,v
retrieving revision 1.2
diff -u -r1.2 iom323.h
--- include/avr/iom323.h	31 Aug 2002 19:43:27 -0000	1.2
+++ include/avr/iom323.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM323_H_
 #define _AVR_IOM323_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom323.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iom8.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iom8.h,v
retrieving revision 1.1
diff -u -r1.1 iom8.h
--- include/avr/iom8.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iom8.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOM8_H_
 #define _AVR_IOM8_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iom8.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iotn11.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iotn11.h,v
retrieving revision 1.1
diff -u -r1.1 iotn11.h
--- include/avr/iotn11.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iotn11.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOTN11_H_
 #define _AVR_IOTN11_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iotn11.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #ifndef __ASSEMBLER__
 #  warning "MCU not supported by the C compiler"
 #endif
Index: include/avr/iotn12.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iotn12.h,v
retrieving revision 1.1
diff -u -r1.1 iotn12.h
--- include/avr/iotn12.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iotn12.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOTN12_H_
 #define _AVR_IOTN12_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iotn12.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #ifndef __ASSEMBLER__
 #  warning "MCU not supported by the C compiler"
 #endif
Index: include/avr/iotn15.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iotn15.h,v
retrieving revision 1.1
diff -u -r1.1 iotn15.h
--- include/avr/iotn15.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iotn15.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOTN15_H_
 #define _AVR_IOTN15_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iotn15.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #ifndef __ASSEMBLER__
 #  warning "MCU not supported by the C compiler"
 #endif
Index: include/avr/iotn22.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iotn22.h,v
retrieving revision 1.1
diff -u -r1.1 iotn22.h
--- include/avr/iotn22.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iotn22.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOTN22_H_
 #define _AVR_IOTN22_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iotn22.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #include <avr/sfr_defs.h>
 
 /* I/O registers */
Index: include/avr/iotn28.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/iotn28.h,v
retrieving revision 1.1
diff -u -r1.1 iotn28.h
--- include/avr/iotn28.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/iotn28.h	23 Sep 2002 16:50:41 -0000
@@ -28,6 +28,18 @@
 #ifndef _AVR_IOTN28_H_
 #define _AVR_IOTN28_H_ 1
 
+/* This file should only be included from <avr/io.h>, never directly. */
+
+#ifndef _AVR_IO_H_
+#  error "Include <avr/io.h> instead of this file."
+#endif
+
+#ifndef _AVR_IOXXX_H_
+#  define _AVR_IOXXX_H_ "iotn28.h"
+#else
+#  error "Attempt to include more than one <avr/ioXXX.h> file."
+#endif 
+
 #ifndef __ASSEMBLER__
 #  warning "MCU not supported by the C compiler"
 #endif