drivers/nble: Rearrange header includes

Rearrange headers so that internal header files gap_internal.h and
gatt_internal.h do not source headers, they are included in *.c files.

Change-Id: I6450ab90eec1b450ee8a138da2ed72b8aaeaf616
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

drivers/nble/conn.c

@@ -23,6 +23,7 @@
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
+#include "version.h"
 #include "gap_internal.h"
 #include "conn_internal.h"
 

drivers/nble/gap.c

@@ -24,6 +24,7 @@
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
+#include "version.h"
 #include "gap_internal.h"
 #include "uart.h"
 #include "rpc.h"

drivers/nble/gap_internal.h

@@ -18,12 +18,6 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
-#include <stdbool.h>
-/* For bt_addr_le_t */
-#include "bluetooth/hci.h"
-#include "version.h"
-
 /* Maximum security key len (LTK, CSRK) */
 #define BLE_GAP_SEC_MAX_KEY_LEN		16
 

drivers/nble/gatt_internal.h

@@ -18,10 +18,6 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
-
-#include <bluetooth/gatt.h>
-
 /* Max number of service supported, if changed update BLE core needs to be
  * updated too!
  */

drivers/nble/rpc_deserialize.c

@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <bluetooth/gatt.h>
 /* for bt_security_t */
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
@@ -29,7 +30,7 @@
 #endif /* CONFIG_PRINTK */
 
 #include "rpc.h"
-
+#include "version.h"
 #include "gap_internal.h"
 #include "gatt_internal.h"
 

drivers/nble/rpc_serialize.c

@@ -16,10 +16,11 @@
 
 #include <string.h>
 
+#include <bluetooth/gatt.h>
 #include <bluetooth/conn.h>
 
 #include "rpc.h"
-
+#include "version.h"
 #include "gap_internal.h"
 #include "gatt_internal.h"
 

drivers/nble/stubs.c

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+#include <bluetooth/gatt.h>
 #include <bluetooth/conn.h>
 #include <bluetooth/log.h>
 
+#include "version.h"
 #include "gap_internal.h"
 #include "gatt_internal.h"