diff --git a/src/common_uart.c b/src/common_uart.c
index 25f6bd47..15e6be0b 100644
--- a/src/common_uart.c
+++ b/src/common_uart.c
@@ -92,6 +92,7 @@ int platform_uart_recv( unsigned id, unsigned timer_id, timer_data_type timeout
   }
 }
 
+#ifdef BUF_ENABLE_UART
 static void cmn_rx_handler( int usart_id, u8 data )
 {
 #ifdef BUILD_SERMUX
@@ -131,6 +132,7 @@ static void cmn_rx_handler( int usart_id, u8 data )
 #endif // #ifdef BUILD_SERMUX
   buf_write( BUF_ID_UART, usart_id, ( t_buf_data* )&data );
 }
+#endif // #ifdef BUF_ENABLE_UART
 
 // Send: version with and without mux
 void platform_uart_send( unsigned id, u8 data ) 
diff --git a/src/shell/shell.c b/src/shell/shell.c
index 3102110c..0ff41ed0 100644
--- a/src/shell/shell.c
+++ b/src/shell/shell.c
@@ -368,7 +368,9 @@ void shell_start()
 {
   char cmd[ SHELL_MAXSIZE + 1 ];
   const SHELL_COMMAND *pcmd;
+#ifdef BUILD_UIP
   int i;
+#endif
 
   printf( SHELL_WELCOMEMSG, ELUA_STR_VERSION );
   while( 1 )