#elif defined(pic18f2220)
# include <pic18f2220.h>
+#elif defined(pic18f2320)
+# include <pic18f2220.h> /* Yes, it's 2220.h */
+
+#elif defined(pic18f2455)
+# include <pic18f2455.h>
#elif defined(pic18f2550)
# include <pic18f2550.h>
+#elif defined(pic18f4220)
+# include <pic18f4220.h>
+
+#elif defined(pic18f4320)
+# include <pic18f4220.h> /* Yes, it's 4220.h */
+
#elif defined(pic18f4331)
# include <pic18f4331.h>
#elif defined(pic18f4455)
# include <pic18f4455.h>
+#elif defined(pic18f4520)
+# include <pic18f4520.h>
+
#elif defined(pic18f6520)
# include <pic18f6520.h>
#endif
-#define Nop() { _asm nop _endasm; }
-#define ClrWdt() { _asm clrwdt _endasm; }
-#define Sleep() { _asm sleep _endasm; }
-#define Reset() { _asm reset _endasm; }
+#define Nop() do { _asm nop _endasm; } while(0)
+#define ClrWdt() do { _asm clrwdt _endasm; } while(0)
+#define Sleep() do { _asm sleep _endasm; } while(0)
+#define Reset() do { _asm reset _endasm; } while(0)
#endif /* __PIC18FREGS_H__ */