--- a/src/board_easy50712.c
+++ b/src/board_easy50712.c
@@ -32,7 +32,9 @@
 #ifdef OLD_BSP
    #include "asm/danube/port.h"
 #else
-   #include "asm/ifx/ifx_gpio.h"
+#ifdef FXO
+#  include "asm/ifx/ifx_gpio.h"
+#endif
 #endif
 
 /* ============================= */
--- a/src/board_easy508xx.c
+++ b/src/board_easy508xx.c
@@ -32,8 +32,6 @@
 #endif /* FXO */
 #include "pcm.h"
 
-#include "asm/ifx/ifx_gpio.h"
-
 #ifdef TD_DECT
 #include "td_dect.h"
 #endif /* TD_DECT */
--- a/src/common.c
+++ b/src/common.c
@@ -7117,7 +7117,7 @@ IFX_return_t Common_GPIO_ClosePort(IFX_c
 IFX_return_t Common_GPIO_ReservePin(IFX_int32_t nFd, IFX_int32_t nPort, 
                                     IFX_int32_t nPin, IFX_int32_t nModule)
 {
-#ifndef OLD_BSP
+#if !defined(OLD_BSP) && defined(IFX_GPIO_IOC_PIN_RESERVE)
    TD_PARAMETER_CHECK((NO_GPIO_FD >= nFd), nFd, IFX_ERROR);
 
    IFX_return_t nRet;
@@ -7155,7 +7155,7 @@ IFX_return_t Common_GPIO_ReservePin(IFX_
 IFX_return_t Common_GPIO_FreePin(IFX_int32_t nFd, IFX_int32_t nPort, 
                                  IFX_int32_t nPin, IFX_int32_t nModule)
 {
-#ifndef OLD_BSP
+#if !defined(OLD_BSP) && defined(IFX_GPIO_IOC_PIN_RESERVE)
    TD_PARAMETER_CHECK((NO_GPIO_FD >= nFd), nFd, IFX_ERROR);
 
    IFX_return_t nRet;
--- a/src/common.h
+++ b/src/common.h
@@ -79,12 +79,12 @@
    #ifdef OLD_BSP
       #include "asm/danube/port.h"
    #else
-      #include "asm/ifx/ifx_gpio.h"
+      /*#include "asm/ifx/ifx_gpio.h"*/
    #endif
 #endif
 
 #if (defined(AR9) || defined(VR9))
-   #include "asm/ifx/ifx_gpio.h"
+   /*#include "asm/ifx/ifx_gpio.h"*/
 #endif
 
 #ifdef TD_DECT
