diff --git a/comm/include/comm.h b/comm/include/comm.h
index 65c8ade007e42b6ba50b511563bd9f4e18a006b8..d8dd28ad8d8877431860df44f801601ce880b767 100644
--- a/comm/include/comm.h
+++ b/comm/include/comm.h
@@ -712,7 +712,7 @@ comm_error comm_is_receive_done(TComm *dev);
  * \return the error of the last operation or COMM_BUSY if the operation
  *         is still in progress.
  */
-inline unsigned char comm_get_error(TComm *dev)
+static inline unsigned char comm_get_error(TComm *dev)
 {
   return dev->error;
 }
@@ -729,7 +729,7 @@ inline unsigned char comm_get_error(TComm *dev)
  *        behavior is unpredictable. 
  * \param error identifier of the error to be set
  */
-inline void comm_set_error(TComm *dev, unsigned char error)
+static inline void comm_set_error(TComm *dev, unsigned char error)
 {
   dev->error=error;
 }
diff --git a/dynamixel_base/src/dynamixel_slave.c b/dynamixel_base/src/dynamixel_slave.c
index f2b8c70999f8a7fe52489e485943ba00fbc64f3a..a08f9b063ef5bcf7173cb8a218865c8f3e611b0a 100644
--- a/dynamixel_base/src/dynamixel_slave.c
+++ b/dynamixel_base/src/dynamixel_slave.c
@@ -12,17 +12,17 @@ unsigned char dyn_slave_irq_receive_cb(TDynamixelSlave *dyn_slave,unsigned char
       case 0: if(byte==0xFF)
               {
                 dyn_slave->rx_buffer[dyn_slave->received_bytes]=byte;
-	        dyn_slave->received_bytes++;
+                dyn_slave->received_bytes++;
               }
               break;
       case 1: if(byte==0xFF)
               {
                 dyn_slave->rx_buffer[dyn_slave->received_bytes]=byte;
-	        dyn_slave->received_bytes++;
+                dyn_slave->received_bytes++;
               }
               else 
                 dyn_slave->received_bytes--;
-	      break;
+              break;
       case 2: if(byte==0xFD)// version 2 header
               {
                 if(dyn_slave->version==DYN_VER2)// the module is configured for version 2
@@ -36,9 +36,9 @@ unsigned char dyn_slave_irq_receive_cb(TDynamixelSlave *dyn_slave,unsigned char
               else if(byte!=0xFF)
               {
                 dyn_slave->rx_buffer[dyn_slave->received_bytes]=byte;
-	        dyn_slave->received_bytes++;
+                dyn_slave->received_bytes++;
               }
-	      break;
+              break;
       case 3: dyn_slave->rx_buffer[dyn_slave->received_bytes]=byte;
               if(dyn_slave->version==DYN_VER1)
               {
@@ -51,7 +51,7 @@ unsigned char dyn_slave_irq_receive_cb(TDynamixelSlave *dyn_slave,unsigned char
               }
               else
                 dyn_slave->received_bytes++;
-	      break;
+              break;
       case 4: dyn_slave->rx_buffer[dyn_slave->received_bytes]=byte;
               dyn_slave->received_bytes++;
               break;