diff --git a/android/async-socket-connector.c b/android/async-socket-connector.c
index 0f50399..f4d51b5 100644
--- a/android/async-socket-connector.c
+++ b/android/async-socket-connector.c
@@ -312,11 +312,15 @@
     connector->ref_count = 1;
 
     /* Copy socket address. */
+#ifdef _WIN32
+    connector->address = *address;
+#else
     if (sock_address_get_family(address) == SOCKET_UNIX) {
         sock_address_init_unix(&connector->address, sock_address_get_path(address));
     } else {
         connector->address = *address;
     }
+#endif
 
     /* Create a looper for asynchronous I/O. */
     if (looper == NULL) {
diff --git a/android/sdk-controller-socket.c b/android/sdk-controller-socket.c
index 6a4ec18..8b0d813 100644
--- a/android/sdk-controller-socket.c
+++ b/android/sdk-controller-socket.c
@@ -271,12 +271,12 @@
  * All messages, sent and received via SDK controller socket begin with this
  * header, with message data immediately following this header.
  */
-typedef struct SDKCtlMessage {
+struct SDKCtlMessage {
     /* Data packet descriptor for this message. */
     SDKCtlPacket  packet;
     /* Message type. */
     int           msg_type;
-} SDKCtlMessage;
+};
 
 /********************************************************************************
  *                      SDK Control Socket declarations