Merge "Update references to internal libnl headers." into main
diff --git a/legacy/qcwcn/wifi_hal/common.cpp b/legacy/qcwcn/wifi_hal/common.cpp
index 60bb2dc..20bbb65 100644
--- a/legacy/qcwcn/wifi_hal/common.cpp
+++ b/legacy/qcwcn/wifi_hal/common.cpp
@@ -17,8 +17,6 @@
 #include <stdlib.h>
 #include <linux/pkt_sched.h>
 #include <netlink/object-api.h>
-#include <netlink-private/object-api.h>
-#include <netlink-private/types.h>
 #include <dlfcn.h>
 #include <pthread.h>
 
diff --git a/legacy/qcwcn/wifi_hal/wifi_hal.cpp b/legacy/qcwcn/wifi_hal/wifi_hal.cpp
index d4f97a0..3b452cf 100644
--- a/legacy/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/legacy/qcwcn/wifi_hal/wifi_hal.cpp
@@ -64,8 +64,12 @@
 #include <netlink/object-api.h>
 #include <netlink/netlink.h>
 #include <netlink/socket.h>
+#if __has_include(<netlink-private/types.h>)
 #include <netlink-private/object-api.h>
 #include <netlink-private/types.h>
+#else
+#include <nl-priv-dynamic-core/nl-core.h>
+#endif
 
 #include "nl80211_copy.h"
 
diff --git a/wcn6740/qcwcn/wifi_hal/common.cpp b/wcn6740/qcwcn/wifi_hal/common.cpp
index 9123fb9..83675aa 100644
--- a/wcn6740/qcwcn/wifi_hal/common.cpp
+++ b/wcn6740/qcwcn/wifi_hal/common.cpp
@@ -18,8 +18,6 @@
 #include <linux/pkt_sched.h>
 #include <linux-private/linux/fib_rules.h>
 #include <netlink/object-api.h>
-#include <netlink-private/object-api.h>
-#include <netlink-private/types.h>
 #include <dlfcn.h>
 #include <pthread.h>
 #include <hardware_legacy/wifi_hal.h>
diff --git a/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp b/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp
index c78a63e..b8f3753 100644
--- a/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp
+++ b/wcn6740/qcwcn/wifi_hal/wifi_hal.cpp
@@ -64,8 +64,12 @@
 #include <netlink/object-api.h>
 #include <netlink/netlink.h>
 #include <netlink/socket.h>
+#if __has_include(<netlink-private/types.h>)
 #include <netlink-private/object-api.h>
 #include <netlink-private/types.h>
+#else
+#include <nl-priv-dynamic-core/nl-core.h>
+#endif
 
 #include "nl80211_copy.h"