diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e39ce1f..cb532eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,20 +22,28 @@ use_cxx(etcd-cpp-api-core-objects)
 add_dependencies(etcd-cpp-api-core-objects protobuf_generates)
 include_generated_protobuf_files(etcd-cpp-api-core-objects)
 target_link_libraries(etcd-cpp-api-core-objects PUBLIC
-                      ${PROTOBUF_LIBRARIES}
                       ${OPENSSL_LIBRARIES}
                       ${GRPC_LIBRARIES}
 )
+if(TARGET protobuf::libprotobuf)
+    target_link_libraries(etcd-cpp-api-core-objects PUBLIC protobuf::libprotobuf)
+else()
+    target_link_libraries(etcd-cpp-api-core-objects PUBLIC ${PROTOBUF_LIBRARIES})
+endif()
 
 if(BUILD_ETCD_CORE_ONLY)
     # add the core library, includes the sycnhronous client only
     add_library(etcd-cpp-api-core $<TARGET_OBJECTS:etcd-cpp-api-core-objects>)
     use_cxx(etcd-cpp-api-core)
     target_link_libraries(etcd-cpp-api-core PUBLIC
-                         ${PROTOBUF_LIBRARIES}
-                         ${OPENSSL_LIBRARIES}
-                         ${GRPC_LIBRARIES}
+                          ${OPENSSL_LIBRARIES}
+                          ${GRPC_LIBRARIES}
     )
+    if(TARGET protobuf::libprotobuf)
+        target_link_libraries(etcd-cpp-api-core PUBLIC protobuf::libprotobuf)
+    else()
+        target_link_libraries(etcd-cpp-api-core PUBLIC ${PROTOBUF_LIBRARIES})
+    endif()
     include_generated_protobuf_files(etcd-cpp-api-core)
 else()
     # add the client with asynchronus client
@@ -44,10 +52,14 @@ else()
     use_cxx(etcd-cpp-api)
     target_link_libraries(etcd-cpp-api PUBLIC
                           ${CPPREST_LIB}  # n.b.: the asynchronous client requires pplx in cpprestsdk
-                          ${PROTOBUF_LIBRARIES}
                           ${OPENSSL_LIBRARIES}
                           ${GRPC_LIBRARIES}
     )
+    if(TARGET protobuf::libprotobuf)
+        target_link_libraries(etcd-cpp-api PUBLIC protobuf::libprotobuf)
+    else()
+        target_link_libraries(etcd-cpp-api PUBLIC ${PROTOBUF_LIBRARIES})
+    endif()
     include_generated_protobuf_files(etcd-cpp-api)
 endif()
 
diff --git a/src/SyncClient.cpp b/src/SyncClient.cpp
index d5a4179..7625514 100644
--- a/src/SyncClient.cpp
+++ b/src/SyncClient.cpp
@@ -4,6 +4,10 @@
 #define NOMINMAX
 #endif
 
+#ifdef __ANDROID__
+#include <netinet/in.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>