From 302c600873f8174a63a9badd09973a5228530eac Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Mon, 24 Aug 2020 09:12:49 -0700
Subject: [PATCH] Re-include stack/l2cap/l2c_api

Towards readable code

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ic225ee7167850124ca7a261b8f5ed81006f10b08
---
 stack/l2cap/l2c_api.cc | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/stack/l2cap/l2c_api.cc b/stack/l2cap/l2c_api.cc
index cd61bce4f..483789592 100644
--- a/stack/l2cap/l2c_api.cc
+++ b/stack/l2cap/l2c_api.cc
@@ -26,23 +26,18 @@
 
 #include <base/logging.h>
 #include <base/strings/stringprintf.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "bt_common.h"
-#include "bt_types.h"
-#include "btm_api.h"
-#include "btu.h"
-#include "device/include/controller.h"
-#include "hcidefs.h"
-#include "hcimsgs.h"
-#include "l2c_int.h"
-#include "l2cdefs.h"
+#include <cstdint>
+#include <string>
+
+#include "device/include/controller.h"  // TODO Remove
 #include "main/shim/l2c_api.h"
 #include "main/shim/shim.h"
-#include "osi/include/allocator.h"
 #include "osi/include/log.h"
+#include "stack/include/l2c_api.h"
+#include "stack/l2cap/l2c_int.h"
+
+void btsnd_hcic_enhanced_flush(uint16_t handle,
+                               uint8_t packet_type);  // TODO Remove
 
 using base::StringPrintf;
 
-- 
2.11.0