diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c
index 71d53b81e2..33689c36c6 100644
--- a/apple/iOS/bluetooth/btpad.c
+++ b/apple/iOS/bluetooth/btpad.c
@@ -23,8 +23,6 @@
 
 #include "btdynamic.h"
 #include "btpad.h"
-#include "btpad_queue.h"
-
 #include "../input/connect/joypad_connection.h"
 
 extern joypad_connection_t *slots;
@@ -37,6 +35,50 @@ enum btpad_state
    BTPAD_CONNECTED
 };
 
+struct btpad_queue_command
+{
+   const hci_cmd_t* command;
+
+   union
+   {
+      struct
+      {
+         uint8_t on;
+      }  btstack_set_power_mode;
+
+      struct
+      {
+         uint16_t handle;
+         uint8_t reason;
+      }  hci_disconnect;
+
+      struct
+      {
+         uint32_t lap;
+         uint8_t length;
+         uint8_t num_responses;
+      }  hci_inquiry;
+
+      struct
+      {
+         bd_addr_t bd_addr;
+         uint8_t page_scan_repetition_mode;
+         uint8_t reserved;
+         uint16_t clock_offset;
+      }  hci_remote_name_request;
+
+      /* For wiimote only.
+       * TODO - should we repurpose this so
+       * that it's for more than just Wiimote?
+       * */
+      struct
+      {
+         bd_addr_t bd_addr;
+         bd_addr_t pin;
+      }  hci_pin_code_request_reply;
+   };
+};
+
 struct pad_connection
 {
    uint32_t slot;
@@ -56,6 +98,174 @@ static bool inquiry_off;
 static bool inquiry_running;
 static struct pad_connection g_connections[MAX_USERS];
 
+struct btpad_queue_command commands[64];
+static uint32_t insert_position;
+static uint32_t read_position;
+static uint32_t can_run;
+
+#define INCPOS(POS) { POS##_position = (POS##_position + 1) % 64; }
+
+static void btpad_queue_process(void)
+{
+   for (; can_run && (insert_position != read_position); can_run --)
+   {
+      struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+         &commands[read_position];
+
+      if (!cmd)
+         return;
+
+      if (cmd->command == btstack_set_power_mode_ptr)
+         bt_send_cmd_ptr(
+               cmd->command,
+               cmd->btstack_set_power_mode.on);
+      else if (cmd->command == hci_read_bd_addr_ptr)
+         bt_send_cmd_ptr(cmd->command);
+      else if (cmd->command == hci_disconnect_ptr)
+         bt_send_cmd_ptr(
+               cmd->command,
+               cmd->hci_disconnect.handle,
+               cmd->hci_disconnect.reason);
+      else if (cmd->command == hci_inquiry_ptr)
+         bt_send_cmd_ptr(
+               cmd->command,
+               cmd->hci_inquiry.lap,
+               cmd->hci_inquiry.length,
+               cmd->hci_inquiry.num_responses);
+      else if (cmd->command == hci_remote_name_request_ptr)
+         bt_send_cmd_ptr(
+               cmd->command,
+               cmd->hci_remote_name_request.bd_addr,
+               cmd->hci_remote_name_request.page_scan_repetition_mode,
+               cmd->hci_remote_name_request.reserved,
+               cmd->hci_remote_name_request.clock_offset);
+
+      else if (cmd->command == hci_pin_code_request_reply_ptr)
+         bt_send_cmd_ptr(
+               cmd->command,
+               cmd->hci_pin_code_request_reply.bd_addr,
+               6,
+               cmd->hci_pin_code_request_reply.pin);
+
+      INCPOS(read);
+   }
+}
+
+static void btpad_queue_reset(void)
+{
+   insert_position = 0;
+   read_position   = 0;
+   can_run         = 1;
+}
+
+static void btpad_queue_run(uint32_t count)
+{
+   can_run = count;
+
+   btpad_queue_process();
+}
+
+static void btpad_queue_btstack_set_power_mode(uint8_t on)
+{
+   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+      &commands[insert_position];
+
+   if (!cmd)
+      return;
+
+   cmd->command                   = btstack_set_power_mode_ptr;
+   cmd->btstack_set_power_mode.on = on;
+
+   INCPOS(insert);
+   btpad_queue_process();
+}
+
+static void btpad_queue_hci_read_bd_addr(void)
+{
+   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+      &commands[insert_position];
+
+   if (!cmd)
+      return;
+
+   cmd->command = hci_read_bd_addr_ptr;
+
+   INCPOS(insert);
+   btpad_queue_process();
+}
+
+static void btpad_queue_hci_disconnect(uint16_t handle, uint8_t reason)
+{
+   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+      &commands[insert_position];
+
+   if (!cmd)
+      return;
+
+   cmd->command               = hci_disconnect_ptr;
+   cmd->hci_disconnect.handle = handle;
+   cmd->hci_disconnect.reason = reason;
+
+   INCPOS(insert);
+   btpad_queue_process();
+}
+
+static void btpad_queue_hci_inquiry(uint32_t lap,
+      uint8_t length, uint8_t num_responses)
+{
+   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+      &commands[insert_position];
+
+   if (!cmd)
+      return;
+
+   cmd->command                   = hci_inquiry_ptr;
+   cmd->hci_inquiry.lap           = lap;
+   cmd->hci_inquiry.length        = length;
+   cmd->hci_inquiry.num_responses = num_responses;
+
+   INCPOS(insert);
+   btpad_queue_process();
+}
+
+static void btpad_queue_hci_remote_name_request(bd_addr_t bd_addr,
+      uint8_t page_scan_repetition_mode,
+      uint8_t reserved, uint16_t clock_offset)
+{
+   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+      &commands[insert_position];
+
+   if (!cmd)
+      return;
+
+   cmd->command = hci_remote_name_request_ptr;
+   memcpy(cmd->hci_remote_name_request.bd_addr, bd_addr, sizeof(bd_addr_t));
+   cmd->hci_remote_name_request.page_scan_repetition_mode = 
+      page_scan_repetition_mode;
+   cmd->hci_remote_name_request.reserved = reserved;
+   cmd->hci_remote_name_request.clock_offset = clock_offset;
+
+   INCPOS(insert);
+   btpad_queue_process();
+}
+
+static void btpad_queue_hci_pin_code_request_reply(
+      bd_addr_t bd_addr, bd_addr_t pin)
+{
+   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
+      &commands[insert_position];
+
+   if (!cmd)
+      return;
+
+   cmd->command = hci_pin_code_request_reply_ptr;
+   memcpy(cmd->hci_pin_code_request_reply.bd_addr, bd_addr, sizeof(bd_addr_t));
+   memcpy(cmd->hci_pin_code_request_reply.pin, pin, sizeof(bd_addr_t));
+
+   INCPOS(insert);
+   btpad_queue_process();
+}
+
 static void btpad_connection_send_control(void *data,
       uint8_t* data_buf, size_t size)
 {
diff --git a/apple/iOS/bluetooth/btpad_queue.c b/apple/iOS/bluetooth/btpad_queue.c
deleted file mode 100644
index fa3908ad29..0000000000
--- a/apple/iOS/bluetooth/btpad_queue.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "btdynamic.h"
-#include "btpad.h"
-#include "btpad_queue.h"
-
-struct btpad_queue_command
-{
-   const hci_cmd_t* command;
-
-   union
-   {
-      struct
-      {
-         uint8_t on;
-      }  btstack_set_power_mode;
-
-      struct
-      {
-         uint16_t handle;
-         uint8_t reason;
-      }  hci_disconnect;
-
-      struct
-      {
-         uint32_t lap;
-         uint8_t length;
-         uint8_t num_responses;
-      }  hci_inquiry;
-
-      struct
-      {
-         bd_addr_t bd_addr;
-         uint8_t page_scan_repetition_mode;
-         uint8_t reserved;
-         uint16_t clock_offset;
-      }  hci_remote_name_request;
-
-      /* For wiimote only.
-       * TODO - should we repurpose this so
-       * that it's for more than just Wiimote?
-       * */
-      struct
-      {
-         bd_addr_t bd_addr;
-         bd_addr_t pin;
-      }  hci_pin_code_request_reply;
-   };
-};
-
-struct btpad_queue_command commands[64];
-static uint32_t insert_position;
-static uint32_t read_position;
-static uint32_t can_run;
-
-#define INCPOS(POS) { POS##_position = (POS##_position + 1) % 64; }
-
-void btpad_queue_reset(void)
-{
-   insert_position = 0;
-   read_position = 0;
-   can_run = 1;
-}
-
-void btpad_queue_run(uint32_t count)
-{
-   can_run = count;
-
-   btpad_queue_process();
-}
-
-void btpad_queue_process(void)
-{
-   for (; can_run && (insert_position != read_position); can_run --)
-   {
-      struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-         &commands[read_position];
-
-      if (!cmd)
-         return;
-
-      if (cmd->command == btstack_set_power_mode_ptr)
-         bt_send_cmd_ptr(
-               cmd->command,
-               cmd->btstack_set_power_mode.on);
-      else if (cmd->command == hci_read_bd_addr_ptr)
-         bt_send_cmd_ptr(cmd->command);
-      else if (cmd->command == hci_disconnect_ptr)
-         bt_send_cmd_ptr(
-               cmd->command,
-               cmd->hci_disconnect.handle,
-               cmd->hci_disconnect.reason);
-      else if (cmd->command == hci_inquiry_ptr)
-         bt_send_cmd_ptr(
-               cmd->command,
-               cmd->hci_inquiry.lap,
-               cmd->hci_inquiry.length,
-               cmd->hci_inquiry.num_responses);
-      else if (cmd->command == hci_remote_name_request_ptr)
-         bt_send_cmd_ptr(
-               cmd->command,
-               cmd->hci_remote_name_request.bd_addr,
-               cmd->hci_remote_name_request.page_scan_repetition_mode,
-               cmd->hci_remote_name_request.reserved,
-               cmd->hci_remote_name_request.clock_offset);
-
-      else if (cmd->command == hci_pin_code_request_reply_ptr)
-         bt_send_cmd_ptr(
-               cmd->command,
-               cmd->hci_pin_code_request_reply.bd_addr,
-               6,
-               cmd->hci_pin_code_request_reply.pin);
-
-      INCPOS(read);
-   }
-}
-
-void btpad_queue_btstack_set_power_mode(uint8_t on)
-{
-   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-      &commands[insert_position];
-
-   if (!cmd)
-      return;
-
-   cmd->command                   = btstack_set_power_mode_ptr;
-   cmd->btstack_set_power_mode.on = on;
-
-   INCPOS(insert);
-   btpad_queue_process();
-}
-
-void btpad_queue_hci_read_bd_addr(void)
-{
-   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-      &commands[insert_position];
-
-   if (!cmd)
-      return;
-
-   cmd->command = hci_read_bd_addr_ptr;
-
-   INCPOS(insert);
-   btpad_queue_process();
-}
-
-void btpad_queue_hci_disconnect(uint16_t handle, uint8_t reason)
-{
-   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-      &commands[insert_position];
-
-   if (!cmd)
-      return;
-
-   cmd->command               = hci_disconnect_ptr;
-   cmd->hci_disconnect.handle = handle;
-   cmd->hci_disconnect.reason = reason;
-
-   INCPOS(insert);
-   btpad_queue_process();
-}
-
-void btpad_queue_hci_inquiry(uint32_t lap,
-      uint8_t length, uint8_t num_responses)
-{
-   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-      &commands[insert_position];
-
-   if (!cmd)
-      return;
-
-   cmd->command                   = hci_inquiry_ptr;
-   cmd->hci_inquiry.lap           = lap;
-   cmd->hci_inquiry.length        = length;
-   cmd->hci_inquiry.num_responses = num_responses;
-
-   INCPOS(insert);
-   btpad_queue_process();
-}
-
-void btpad_queue_hci_remote_name_request(bd_addr_t bd_addr,
-      uint8_t page_scan_repetition_mode,
-      uint8_t reserved, uint16_t clock_offset)
-{
-   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-      &commands[insert_position];
-
-   if (!cmd)
-      return;
-
-   cmd->command = hci_remote_name_request_ptr;
-   memcpy(cmd->hci_remote_name_request.bd_addr, bd_addr, sizeof(bd_addr_t));
-   cmd->hci_remote_name_request.page_scan_repetition_mode = 
-      page_scan_repetition_mode;
-   cmd->hci_remote_name_request.reserved = reserved;
-   cmd->hci_remote_name_request.clock_offset = clock_offset;
-
-   INCPOS(insert);
-   btpad_queue_process();
-}
-
-void btpad_queue_hci_pin_code_request_reply(bd_addr_t bd_addr, bd_addr_t pin)
-{
-   struct btpad_queue_command* cmd = (struct btpad_queue_command*)
-      &commands[insert_position];
-
-   if (!cmd)
-      return;
-
-   cmd->command = hci_pin_code_request_reply_ptr;
-   memcpy(cmd->hci_pin_code_request_reply.bd_addr, bd_addr, sizeof(bd_addr_t));
-   memcpy(cmd->hci_pin_code_request_reply.pin, pin, sizeof(bd_addr_t));
-
-   INCPOS(insert);
-   btpad_queue_process();
-}
diff --git a/apple/iOS/bluetooth/btpad_queue.h b/apple/iOS/bluetooth/btpad_queue.h
deleted file mode 100644
index c3ab269f1d..0000000000
--- a/apple/iOS/bluetooth/btpad_queue.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __BTPAD_QUEUE_H__
-#define __BTPAD_QUEUE_H__
-
-void btpad_queue_reset(void);
-
-void btpad_queue_run(uint32_t count);
-
-void btpad_queue_process(void);
-
-void btpad_queue_btstack_set_power_mode(uint8_t on);
-
-void btpad_queue_hci_read_bd_addr(void);
-
-void btpad_queue_hci_disconnect(uint16_t handle, uint8_t reason);
-
-void btpad_queue_hci_inquiry(uint32_t lap, uint8_t length, uint8_t num_responses);
-
-void btpad_queue_hci_remote_name_request(bd_addr_t bd_addr,
-      uint8_t page_scan_repetition_mode, uint8_t reserved, uint16_t clock_offset);
-
-void btpad_queue_hci_pin_code_request_reply(bd_addr_t bd_addr, bd_addr_t pin);
-
-#endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 3a25bcf607..083cc421d6 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -344,7 +344,6 @@ INPUT
 #ifdef IOS
 #include "../apple/iOS/bluetooth/btdynamic.c"
 #include "../apple/iOS/bluetooth/btpad.c"
-#include "../apple/iOS/bluetooth/btpad_queue.c"
 #include "../input/drivers_joypad/ios_joypad.c"
 #endif