Cleanup Gatt numbers: Merge GattTypes.hpp into GattNumbers.hpp, remove redundant and unrelated BTGattDesc::Type

3 files changed, 6 insertions, 1 deletions

diff --git a/src/direct_bt/BTDevice.cpp b/src/direct_bt/BTDevice.cpp
index 672e2df0..9bf55de5 100644
--- a/src/direct_bt/BTDevice.cpp
+++ b/src/direct_bt/BTDevice.cpp
@@ -40,7 +40,7 @@
 #include "BTAdapter.hpp"
 #include "BTDevice.hpp"
 #include "BTManager.hpp"
-
+#include "BTGattService.hpp"
 
 using namespace direct_bt;
 
diff --git a/src/direct_bt/BTGattChar.cpp b/src/direct_bt/BTGattChar.cpp
index 7a6b2f4b..fe9767d0 100644
--- a/src/direct_bt/BTGattChar.cpp
+++ b/src/direct_bt/BTGattChar.cpp
@@ -36,6 +36,7 @@
 #include <jau/debug.hpp>
 
 #include "BTDevice.hpp"
+#include "BTGattService.hpp"
 #include "BTGattChar.hpp"
 #include "BTGattHandler.hpp"
 
diff --git a/src/direct_bt/BTGattHandler.cpp b/src/direct_bt/BTGattHandler.cpp
index fb404621..0e8ce82c 100644
--- a/src/direct_bt/BTGattHandler.cpp
+++ b/src/direct_bt/BTGattHandler.cpp
@@ -59,6 +59,10 @@ extern "C" {
 #include "BTManager.hpp"
 #include "DBTConst.hpp"
 
+#include "BTGattService.hpp"
+#include "BTGattChar.hpp"
+#include "BTGattDesc.hpp"
+
 using namespace direct_bt;
 
 BTGattEnv::BTGattEnv() noexcept