diff --git a/platform/msb430/dev/cc1020.c b/platform/msb430/dev/cc1020.c
index b76e2fa52..23748d741 100644
--- a/platform/msb430/dev/cc1020.c
+++ b/platform/msb430/dev/cc1020.c
@@ -142,7 +142,7 @@ cc1020_on(void)
   } else {
     cc1020_off();
   }
-  return true;
+  return TRUE;
 }
 
 void
@@ -303,8 +303,8 @@ interrupt(UART0RX_VECTOR) cc1020_rxhandler(void)
       u8_t b3;
     };
     struct {
-      UINT16 i1;
-      UINT16 i2;
+      uint16_t i1;
+      uint16_t i2;
     };
   } shiftbuf;
 
diff --git a/platform/msb430/dev/infomem.c b/platform/msb430/dev/infomem.c
index f13cc0e4d..acf564076 100644
--- a/platform/msb430/dev/infomem.c
+++ b/platform/msb430/dev/infomem.c
@@ -60,7 +60,7 @@ Berlin, 2007
 void
 infomem_read(void *buffer, unsigned int offset, unsigned char size)
 {
-  UINT8 *address = (UINT8 *) INFOMEM_START + offset;
+  uint8_t *address = (uint8_t *) INFOMEM_START + offset;
   memcpy(buffer, address, size);
 }
 
@@ -68,17 +68,17 @@ bool
 infomem_write(unsigned int offset, unsigned char count, ...)
 {
   char backup[INFOMEM_BLOCK_SIZE];	
-  UINT8 *buffer;
-  UINT16 i;
-  UINT8 *flash;
+  uint8_t *buffer;
+  uint16_t i;
+  uint8_t *flash;
   va_list argp;
-  UINT16 size;
-  UINT8 *data;
+  uint16_t size;
+  uint8_t *data;
 
   if (offset > (2 * INFOMEM_BLOCK_SIZE))
-    return false;
+    return FALSE;
 
-  flash = (UINT8 *) INFOMEM_START + offset;
+  flash = (uint8_t *) INFOMEM_START + offset;
 
   _DINT();
 
@@ -88,10 +88,10 @@ infomem_write(unsigned int offset, unsigned char count, ...)
   // merge backup with new data
   va_start(argp, count);
 
-  buffer = (UINT8 *) backup;
+  buffer = (uint8_t *) backup;
   for (i = 0; i < count; i++) {
-    data = va_arg(argp, UINT8*);
-    size = va_arg(argp, UINT16);
+    data = va_arg(argp, uint8_t*);
+    size = va_arg(argp, uint16_t);
     memcpy(buffer, data, size);
     buffer += size;
   }
@@ -108,7 +108,7 @@ infomem_write(unsigned int offset, unsigned char count, ...)
 
   // write flash
   FCTL1 = FWKEY + WRT;
-  buffer = (UINT8 *) backup;
+  buffer = (uint8_t *) backup;
   for (i = 0; i < INFOMEM_BLOCK_SIZE; i++) {
     *flash++ = *buffer++;
   }
@@ -117,5 +117,5 @@ infomem_write(unsigned int offset, unsigned char count, ...)
   FCTL3 = FWKEY + LOCK;
 
   _EINT();
-  return true;
+  return TRUE;
 }
diff --git a/platform/msb430/dev/sdspi.c b/platform/msb430/dev/sdspi.c
index bd8e4b19c..5c3d8f24a 100644
--- a/platform/msb430/dev/sdspi.c
+++ b/platform/msb430/dev/sdspi.c
@@ -75,7 +75,7 @@ spi_init(void)
   uart_set_speed(UART_MODE_SPI, 0x02, 0x00, 0x00);
 }
 
-UINT8
+uint8_t_t
 spi_rx(void)
 {
   UART_RESET_RX();
@@ -85,7 +85,7 @@ spi_rx(void)
 }
 
 void
-spi_tx(register const UINT8 c)
+spi_tx(register const uint8_t_t c)
 {
   UART_RESET_RX();
   UART_TX = c;
@@ -93,10 +93,10 @@ spi_tx(register const UINT8 c)
 }
 
 void
-spi_read(void *pDestination, const UINT16 size, const bool incDest)
+spi_read(void *pDestination, const uint16_t size, const bool incDest)
 {
-  register UINT8 *p = (UINT8 *) pDestination;
-  register UINT16 i;
+  register uint8_t *p = (uint8_t *) pDestination;
+  register uint16_t i;
 
   for (i = size; i > 0; i--) {
     *p = spi_rx();
@@ -106,11 +106,11 @@ spi_read(void *pDestination, const UINT16 size, const bool incDest)
 }
 
 void
-spi_write(const void *pSource, const UINT16 size, const UINT8 startToken,
+spi_write(const void *pSource, const uint16_t size, const uint8_t startToken,
 	  const bool incSource)
 {
   register unsigned char *p = (unsigned char *) pSource;
-  register UINT16 i;
+  register uint16_t i;
 
   spi_tx(startToken);
   for (i = size; i > 0; i--) {
@@ -121,9 +121,9 @@ spi_write(const void *pSource, const UINT16 size, const UINT8 startToken,
 }
 
 void
-spi_idle(register const UINT16 clocks)
+spi_idle(register const uint16_t clocks)
 {
-  register UINT16 i;
+  register uint16_t i;
 
   for (i = 0; i < clocks; i++) {
     UART_RESET_RX();
@@ -132,16 +132,16 @@ spi_idle(register const UINT16 clocks)
   }
 }
 
-UINT8
-spi_wait_token(const UINT8 token, const UINT16 timeout)
+bool
+spi_wait_token(const uint8_t token, const uint16_t timeout)
 {
-  UINT16 i;
-  UINT8 rx;
+  uint16_t i;
+  uint8_t rx;
 
   for (i = 0; i < timeout; i++) {
     rx = spi_rx();
     if (rx == token)
-      return true;
+      return TRUE;
   }
-  return false;
+  return FALSE;
 }
diff --git a/platform/msb430/dev/sdspi.h b/platform/msb430/dev/sdspi.h
index 83e373e55..ab02de9a6 100644
--- a/platform/msb430/dev/sdspi.h
+++ b/platform/msb430/dev/sdspi.h
@@ -75,16 +75,16 @@ void spi_init(void);
 void spi_enable(void);
 
 /// Receive one byte from SPI
-UINT8 spi_rx(void);
+uint8_t spi_rx(void);
 
 /// Send one byte to SPI
-void spi_tx(const UINT8 c);
+void spi_tx(const uint8_t c);
 
 /// Read a number of bytes from SPI
-void spi_read(void *pDestination, const UINT16 size, const bool incDest);
+void spi_read(void *pDestination, const uint16_t size, const bool incDest);
 
 #if SPI_DMA_WRITE
-extern UINT8 spi_dma_lock;
+extern uint8_t spi_dma_lock;
 #endif
 #if SPI_DMA_READ || SPI_DMA_WRITE
 void spi_dma_wait();
@@ -93,14 +93,14 @@ void spi_dma_wait();
 #if SPI_WRITE
 /// Write a number of bytes to SPI
 void spi_write(const void *pSource,
-	       const UINT16 size,
-	       const UINT8 startToken, const bool incSource);
+	       const uint16_t size,
+	       const uint8_t startToken, const bool incSource);
 #endif
 
 /// Wait a number of clock cycles
-void spi_idle(const UINT16 clocks);
+void spi_idle(const uint16_t clocks);
 
 /// Read chars until token is received
-UINT8 spi_wait_token(const UINT8 token, const UINT16 timeout);
+bool spi_wait_token(const uint8_t token, const uint16_t timeout);
 
 #endif /*SPI_H_ */