diff --git a/platform/msb430/dev/msb430-uart1.c b/platform/msb430/dev/msb430-uart1.c
index 1c7c36682..1588764f5 100644
--- a/platform/msb430/dev/msb430-uart1.c
+++ b/platform/msb430/dev/msb430-uart1.c
@@ -62,90 +62,22 @@ Berlin, 2007
 #define U1ME	ME2
 #endif
 
-void _uart_configure(unsigned char mode);
-void _uart_set_mode(unsigned char mode);
-
-volatile unsigned char 		uart_mode = UART_MODE_RESET;
-volatile unsigned char		uart_lockcnt = 0;
+static volatile unsigned char uart_mode = UART_MODE_RESET;
+static volatile unsigned char uart_lockcnt = 0;
 volatile uint8_t uart_edge = 0;
 
-static unsigned char		_uart_speed_br0[UART_NUM_MODES];
-static unsigned char		_uart_speed_br1[UART_NUM_MODES];
-static unsigned char		_uart_speed_bmn[UART_NUM_MODES];
-static fp_uart_handler		_uart_handler[UART_NUM_MODES] = {NULL, NULL};
+static unsigned char uart_speed_br0[UART_NUM_MODES];
+static unsigned char uart_speed_br1[UART_NUM_MODES];
+static unsigned char uart_speed_bmn[UART_NUM_MODES];
+static fp_uart_handler uart_handler[UART_NUM_MODES] = {NULL, NULL};
 
 /*---------------------------------------------------------------------------*/
-void
-uart_set_speed(unsigned char mode, unsigned char ubr0,
-		unsigned char ubr1, unsigned char umctl)
+static void
+uart_configure(unsigned mode)
 {
-  // store setting
-  _uart_speed_br0[mode] = ubr0;		// baudrate
-  _uart_speed_br1[mode] = ubr1;		// baudrate
-  _uart_speed_bmn[mode] = umctl;	// modulation
+  _DINT();		// disable interrupts
 
-  // reconfigure, if mode active
-  if (uart_mode == mode)
-    _uart_configure(mode);
-}
-/*---------------------------------------------------------------------------*/
-void
-uart_set_handler(unsigned char mode, fp_uart_handler fpHandler)
-{
-  // store setting
-  _uart_handler[mode] = fpHandler;
-  if (mode == uart_mode) {
-    if (fpHandler == NULL)
-      IE2 &= ~URXIE1;			// Disable USART1 RX interrupt
-    else
-      IE2 |= URXIE1;			// Enable USART1 RX interrupt
-  }
-}
-/*---------------------------------------------------------------------------*/
-int
-uart_lock(unsigned char mode)
-{
-  // already locked?
-  if ((mode != uart_mode) && (uart_lockcnt)) {
-    return 0;
-  } else {
-    // increase lock count
-    uart_lockcnt++;
-    // switch mode (if neccessary)
-    _uart_set_mode(mode);
-    return 1;
-  }
-}
-/*---------------------------------------------------------------------------*/
-int
-uart_unlock(unsigned char mode)
-{
-  /*
-  Do we wan't strict checking?
-  if( (uart_lockcnt == 0) || (mode != uart_mode) )
-    return false;
-  */
-
-  // decrement lock
-  if (uart_lockcnt > 0) {
-    uart_lockcnt--;
-
-    // if no more locks, switch back to default mode
-    if (uart_lockcnt == 0) {
-      _uart_set_mode(UART_MODE_DEFAULT);
-    }
-    return 1;
-  }
-  return 0;
-}
-/*---------------------------------------------------------------------------*/
-void
-_uart_configure(unsigned char mode)
-{
-  _DINT();					// disable interrupts
-
-  UART_WAIT_TXDONE();							
-// wait till all buffered data has been transmitted
+  UART_WAIT_TXDONE();	// wait till all buffered data has been transmitted
 
   // configure
   if (mode == UART_MODE_RS232) {
@@ -171,26 +103,89 @@ _uart_configure(unsigned char mode)
   }
 
   // restore speed settings
-  UBR01  = _uart_speed_br0[mode];	// set baudrate
-  UBR11  = _uart_speed_br1[mode];			
-  UMCTL1 = _uart_speed_bmn[mode];	// set modulation
+  UBR01  = uart_speed_br0[mode];	// set baudrate
+  UBR11  = uart_speed_br1[mode];			
+  UMCTL1 = uart_speed_bmn[mode];	// set modulation
 
   UCTL1 &= ~SWRST;			// clear reset flag
   _EINT();				// enable interrupts
 }
 /*---------------------------------------------------------------------------*/
 void
-_uart_set_mode(unsigned char mode)
+uart_set_speed(unsigned mode, unsigned ubr0,
+		unsigned ubr1, unsigned umctl)
+{
+  // store setting
+  uart_speed_br0[mode] = ubr0;		// baudrate
+  uart_speed_br1[mode] = ubr1;		// baudrate
+  uart_speed_bmn[mode] = umctl;	// modulation
+
+  // reconfigure, if mode active
+  if (uart_mode == mode)
+    uart_configure(mode);
+}
+/*---------------------------------------------------------------------------*/
+void
+uart_set_handler(unsigned mode, fp_uart_handler fpHandler)
+{
+  // store setting
+  uart_handler[mode] = fpHandler;
+  if (mode == uart_mode) {
+    if (fpHandler == NULL) {
+      IE2 &= ~URXIE1;			// Disable USART1 RX interrupt
+    } else {
+      IE2 |= URXIE1;			// Enable USART1 RX interrupt
+    }
+  }
+}
+/*---------------------------------------------------------------------------*/
+int
+uart_lock(unsigned mode)
+{
+  // already locked?
+  if (uart_lockcnt > 0) {
+    return 0;
+  }
+
+  // increase lock count
+  uart_lockcnt++;
+  // switch mode (if neccessary)
+  uart_set_mode(mode);
+  return 1;
+}
+/*---------------------------------------------------------------------------*/
+int
+uart_unlock(unsigned mode)
+{
+  if ((uart_lockcnt == 0) || (mode != uart_mode)) {
+    return 0;
+  }
+
+  // decrement lock
+  if (uart_lockcnt > 0) {
+    uart_lockcnt--;
+
+    // if no more locks, switch back to default mode
+    if (uart_lockcnt == 0) {
+      uart_set_mode(UART_MODE_DEFAULT);
+    }
+    return 1;
+  }
+  return 0;
+}
+/*---------------------------------------------------------------------------*/
+void
+uart_set_mode(unsigned mode)
 {
   // do nothing if mode already set
   if (mode == uart_mode)
     return;
 
   IE2 &= ~(URXIE1 | UTXIE1);		// disable irq
-  _uart_configure(mode);		// configure uart parameters
+  uart_configure(mode);			// configure uart parameters
   uart_mode = mode;
 	
-  if (_uart_handler[mode] != NULL)
+  if (uart_handler[mode] != NULL)
     IE2 |= URXIE1;			// Enable USART1 RX interrupt
 }
 /*---------------------------------------------------------------------------*/
@@ -200,9 +195,10 @@ uart_get_mode(void)
   return uart_mode;
 }
 /*---------------------------------------------------------------------------*/
-interrupt(UART1RX_VECTOR)_uart_rx(void)
+interrupt(UART1RX_VECTOR)
+uart_rx(void)
 {
-  fp_uart_handler handler = _uart_handler[uart_mode];
+  fp_uart_handler handler = uart_handler[uart_mode];
   int c;
 	
   if (!(IFG2 & URXIFG1)) {
diff --git a/platform/msb430/dev/msb430-uart1.h b/platform/msb430/dev/msb430-uart1.h
index f3903735b..c2bf5cd77 100644
--- a/platform/msb430/dev/msb430-uart1.h
+++ b/platform/msb430/dev/msb430-uart1.h
@@ -58,8 +58,8 @@ Berlin, 2007
  * Header file for MSP430 UART driver.
  */
 
-#ifndef __UART_H__
-#define __UART_H__
+#ifndef MSB430_UART_H
+#define MSB430_UART_H
 
 #define	UART_RX				RXBUF1
 #define	UART_TX				TXBUF1
@@ -89,14 +89,7 @@ extern volatile unsigned char uart_lockcnt;
 #define UART_WAIT_LOCK(x)	( (uart_mode != x ) && (uart_lockcnt) )
 #define UART_MODE_IS(x)		( uart_mode == x )
 
-#if 0
-#ifdef __SCATTERWEB__
-	typedef void(*fp_uart_handler)(void);
-#else
-	typedef unsigned int(*fp_uart_handler)(unsigned char);
-#endif
-#endif
-	typedef unsigned int(*fp_uart_handler)(unsigned char);
+typedef unsigned int(*fp_uart_handler)(unsigned char);
 
 /**
  * \brief      Initialize the UART module
@@ -106,17 +99,14 @@ extern volatile unsigned char uart_lockcnt;
  */
 void uart_init(void);
 
-void uart_set_speed(unsigned char mode, unsigned char ubr0, unsigned char ubr1, unsigned char umctl);
-
-void uart_set_handler(unsigned char mode, fp_uart_handler fpHandler);
-
-int uart_lock(unsigned char mode);
-
-int uart_unlock(unsigned char mode);
-
+void uart_set_speed(unsigned mode, unsigned ubr0, unsigned ubr1, unsigned umctl);
+void uart_set_handler(unsigned mode, fp_uart_handler fpHandler);
+int uart_lock(unsigned mode);
+int uart_unlock(unsigned mode);
+void uart_set_mode(unsigned);
 int uart_get_mode(void);
 
-#endif /* __UART_H__ */
+#endif /* !UART_H */
 
 /** @} */
 /** @} */