diff --git a/osal/rtems/Mutex.cpp b/osal/rtems/Mutex.cpp
index d094e1dce..0c1675b1c 100644
--- a/osal/rtems/Mutex.cpp
+++ b/osal/rtems/Mutex.cpp
@@ -1,7 +1,8 @@
 #include "Mutex.h"
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
-const uint32_t MutexIF::NO_TIMEOUT = RTEMS_NO_TIMEOUT;
+const uint32_t MutexIF::BLOCKING = RTEMS_NO_TIMEOUT;
+const uint32_t MutexIF::POLLING = RTEMS_NO_WAIT;
 uint8_t Mutex::count = 0;
 
 Mutex::Mutex() :
diff --git a/osal/rtems/Mutex.h b/osal/rtems/Mutex.h
index 19b34e7f2..486055bad 100644
--- a/osal/rtems/Mutex.h
+++ b/osal/rtems/Mutex.h
@@ -1,5 +1,5 @@
-#ifndef OS_RTEMS_MUTEX_H_
-#define OS_RTEMS_MUTEX_H_
+#ifndef FRAMEWORK_OSAL_RTEMS_MUTEX_H_
+#define FRAMEWORK_OSAL_RTEMS_MUTEX_H_
 
 #include <framework/ipc/MutexIF.h>
 #include "RtemsBasic.h"