diff -Naur dist/msp430-libc/include/iomacros.h new/msp430-libc/include/iomacros.h
--- dist/msp430-libc/include/iomacros.h	2008-05-15 02:54:32.000000000 +0200
+++ new/msp430-libc/include/iomacros.h	2008-05-23 09:24:58.000000000 +0200
@@ -217,7 +217,7 @@
 #define sfrw(x,x_) sfrw_(x,x_)
 
 #if defined(__MSP430X__)
-#define sfra(x,x_) x=x_
+#define sfra(x,x_) sfra_(x,x_)
 #endif
 
 /***** USEFUL MACRO DEFINITIONS *********/
diff -Naur dist/msp430-libc/include/msp430x241x.h new/msp430-libc/include/msp430x241x.h
--- dist/msp430-libc/include/msp430x241x.h	2008-05-22 17:17:43.000000000 +0200
+++ new/msp430-libc/include/msp430x241x.h	2008-05-23 09:31:57.000000000 +0200
@@ -49,24 +49,16 @@
 #define __MSP430_HAS_FLASH2__
 #define __MSP430_HAS_CAPLUS__
 #define __MSP430_HAS_ADC12__
-#define __MSP430_HAS_DAC12__
-#define __MSP430_HAS_DMA__
-
 
 #include <msp430/mpy.h>
 #include <msp430/gpio.h>
-
-//#include <msp430/usart.h>
 #include <msp430/usci.h>
-
 #include <msp430/timera.h>
 #include <msp430/timerb.h>
 #include <msp430/basic_clock.h>
 #include <msp430/flash.h>
 #include <msp430/compa.h>
 #include <msp430/adc12.h>
-#include <msp430/dac12.h>
-#include <msp430/dma.h>
 #include <msp430/common.h>
 
 #define IE1_                0x0000  /* Interrupt Enable 1 */
diff -Naur dist/msp430-libc/include/msp430x24x.h new/msp430-libc/include/msp430x24x.h
--- dist/msp430-libc/include/msp430x24x.h	2008-05-15 02:54:32.000000000 +0200
+++ new/msp430-libc/include/msp430x24x.h	2008-05-23 09:39:21.000000000 +0200
@@ -42,7 +42,6 @@
 #include <msp430/flash.h>
 #include <msp430/compa.h>
 #include <msp430/adc12.h>
-
 #include <msp430/common.h>
 
 #define IE1_                0x0000  /* Interrupt Enable 1 */
diff -Naur dist/msp430-libc/include/msp430x24x1.h new/msp430-libc/include/msp430x24x1.h
--- dist/msp430-libc/include/msp430x24x1.h	2008-05-15 02:54:33.000000000 +0200
+++ new/msp430-libc/include/msp430x24x1.h	2008-05-23 09:37:47.000000000 +0200
@@ -40,8 +40,6 @@
 #include <msp430/basic_clock.h>
 #include <msp430/flash.h>
 #include <msp430/compa.h>
-#include <msp430/adc12.h>
-
 #include <msp430/common.h>
 
 #define IE1_                0x0000  /* Interrupt Enable 1 */
diff -Naur dist/msp430-libc/include/msp430x261x.h new/msp430-libc/include/msp430x261x.h
--- dist/msp430-libc/include/msp430x261x.h	2008-05-22 17:17:43.000000000 +0200
+++ new/msp430-libc/include/msp430x261x.h	2008-05-23 09:28:25.000000000 +0200
@@ -44,15 +44,12 @@
 #define __MSP430_HAS_FLASH2__
 #define __MSP430_HAS_CAPLUS__
 #define __MSP430_HAS_ADC12__
+#define __MSP430_HAS_DMAX_3__
 #define __MSP430_HAS_DAC12__
-#define __MSP430_HAS_DMA__
 
 #include <msp430/mpy.h>
 #include <msp430/gpio.h>
-
-//#include <msp430/usart.h>
 #include <msp430/usci.h>
-
 #include <msp430/timera.h>
 #include <msp430/timerb.h>
 #include <msp430/basic_clock.h>