4 files changed, 8 insertions, 4 deletions
diff --git a/java/direct_bt/tinyb/DBTDevice.java b/java/direct_bt/tinyb/DBTDevice.java
index 75f053c4..9fc0a806 100644
--- a/java/direct_bt/tinyb/DBTDevice.java
+++ b/java/direct_bt/tinyb/DBTDevice.java
@@ -116,7 +116,8 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
 
     /**
      * Special proxy of {@link DBTAdapter#addStatusListener(AdapterStatusListener)}
-     * to be used from out constructor called via native deviceFound callback!
+     * to be used from the constructor called via native
+     * {@link AdapterStatusListener#deviceFound(BluetoothAdapter, BluetoothDevice, long)} callback.
      * <p>
      * FIXME: Without this proxy hook, we end up in a crash within the addStatusListener(..).
      * FIXME: Analyze reason! Triage!
diff --git a/java/jni/direct_bt/DBTAdapter.cxx b/java/jni/direct_bt/DBTAdapter.cxx
index 825285bb..4ee1297a 100644
--- a/java/jni/direct_bt/DBTAdapter.cxx
+++ b/java/jni/direct_bt/DBTAdapter.cxx
@@ -32,7 +32,7 @@
 #include "helper_base.hpp"
 #include "helper_dbt.hpp"
 
-#include "direct_bt/DBTTypes.hpp"
+#include "direct_bt/DBTAdapter.hpp"
 
 using namespace direct_bt;
 
diff --git a/java/jni/direct_bt/DBTDevice.cxx b/java/jni/direct_bt/DBTDevice.cxx
index e5da621b..d0d4c4a1 100644
--- a/java/jni/direct_bt/DBTDevice.cxx
+++ b/java/jni/direct_bt/DBTDevice.cxx
@@ -33,7 +33,8 @@
 #include "helper_base.hpp"
 #include "helper_dbt.hpp"
 
-#include "direct_bt/DBTTypes.hpp"
+#include "direct_bt/DBTDevice.hpp"
+#include "direct_bt/DBTAdapter.hpp"
 
 using namespace direct_bt;
 
diff --git a/java/jni/direct_bt/DBTManager.cxx b/java/jni/direct_bt/DBTManager.cxx
index eb22bded..b67afafe 100644
--- a/java/jni/direct_bt/DBTManager.cxx
+++ b/java/jni/direct_bt/DBTManager.cxx
@@ -32,7 +32,9 @@
 #include "helper_base.hpp"
 #include "helper_dbt.hpp"
 
-#include "direct_bt/DBTTypes.hpp"
+#include "direct_bt/DBTManager.hpp"
+#include "direct_bt/DBTDevice.hpp"
+#include "direct_bt/DBTAdapter.hpp"
 
 using namespace direct_bt;