diff --git a/config.def.h b/config.def.h
index 6908a77468..884c191015 100644
--- a/config.def.h
+++ b/config.def.h
@@ -193,7 +193,7 @@ enum
 #define INPUT_DEFAULT_DRIVER INPUT_X
 #elif defined(IOS) || defined(OSX)
 #define INPUT_DEFAULT_DRIVER INPUT_APPLE
-#elif defined(__BLACKBERRY_QNX__)
+#elif defined(__QNX__)
 #define INPUT_DEFAULT_DRIVER INPUT_QNX
 #elif defined(HAVE_SDL)
 #define INPUT_DEFAULT_DRIVER INPUT_SDL
diff --git a/frontend/platform/platform_qnx.c b/frontend/platform/platform_qnx.c
index 4d555a0cdc..53e67022e9 100644
--- a/frontend/platform/platform_qnx.c
+++ b/frontend/platform/platform_qnx.c
@@ -29,10 +29,7 @@ static void frontend_qnx_get_environment_settings(int argc, char *argv[], void *
    (void)argv;
    (void)args;
 
-/* FIXME - should this apply for both BB10 and PB? */
-#if defined(__QNX__) && !defined(HAVE_BB10)
    rarch_environment_cb(RETRO_ENVIRONMENT_SET_LIBRETRO_PATH, (void*)"app/native/lib");
-#endif
 
    config_load();
 }
@@ -40,10 +37,7 @@ static void frontend_qnx_get_environment_settings(int argc, char *argv[], void *
 static void frontend_qnx_init(void *data)
 {
    (void)data;
-/* FIXME - should this apply for both BB10 and PB? */
-#if defined(__QNX__) && !defined(HAVE_BB10)
    bps_initialize();
-#endif
 }
 
 static void frontend_qnx_shutdown(bool unused)