diff --git a/mDNSWindows/SystemService/Service.c b/mDNSWindows/SystemService/Service.c
index a1a932e..5190e9d 100644
--- a/mDNSWindows/SystemService/Service.c
+++ b/mDNSWindows/SystemService/Service.c
@@ -2020,7 +2020,7 @@ UDSReadNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context )

    if ( tcpSock )
    {
-       tcpSock->userCallback( ( int ) tcpSock->fd, tcpSock->userContext );
+       tcpSock->userCallback.udsEvent(tcpSock->fd, tcpSock->userContext);
    }
 }

@@ -2047,7 +2047,7 @@ udsSupportAddFDToEventLoop( SocketRef fd, udsEventCallback callback, void *conte
        mDNSPlatformMemZero( sock, sizeof( TCPSocket ) );

        sock->fd                = (SOCKET) fd;
-       sock->userCallback      = callback;
+       sock->userCallback.udsEvent = callback;
        sock->userContext       = context;
        sock->m                 = &gMDNSRecord;

diff --git a/mDNSWindows/mDNSWin32.c b/mDNSWindows/mDNSWin32.c
index 2da2547..2eb569a 100644
--- a/mDNSWindows/mDNSWin32.c
+++ b/mDNSWindows/mDNSWin32.c
@@ -1054,7 +1054,7 @@ mDNSPlatformTCPConnect

    // Setup connection data object

-   sock->userCallback  = (TCPUserCallback) inCallback;
+   sock->userCallback.tcpConnection = inCallback;
    sock->userContext   = inContext;

    mDNSPlatformMemZero(&saddr, sizeof(saddr));
@@ -1220,7 +1220,7 @@ TCPSocketNotification( SOCKET sock, LPWSANETWORKEVENTS event, void *context )
    DEBUG_UNUSED( sock );

    require_action( tcpSock, exit, err = mStatus_BadParamErr );
-   callback = ( TCPConnectionCallback ) tcpSock->userCallback;
+   callback = tcpSock->userCallback.tcpConnection;
    require_action( callback, exit, err = mStatus_BadParamErr );

    if ( event && ( event->lNetworkEvents & FD_CONNECT ) )
diff --git a/mDNSWindows/mDNSWin32.h b/mDNSWindows/mDNSWin32.h
index 8dfad12..b455836 100644
--- a/mDNSWindows/mDNSWin32.h
+++ b/mDNSWindows/mDNSWin32.h
@@ -26,21 +26,23 @@

 #include   "mDNSEmbeddedAPI.h"
 #include   "uDNS.h"
+#include   "uds_daemon.h"

 #ifdef __cplusplus
    extern "C" {
 #endif


-typedef void ( *TCPUserCallback )();
-
 struct TCPSocket_struct
 {
     mDNSIPPort                  port;           // MUST BE FIRST FIELD -- mDNSCore expects every TCPSocket_struct to begin with mDNSIPPort
     TCPSocketFlags              flags;          // MUST BE SECOND FIELD -- mDNSCore expects every TCPSocket_struct have TCPSocketFlags flags after mDNSIPPort
    SOCKET                      fd;
    BOOL                        connected;
-   TCPUserCallback             userCallback;
+   union {
+       TCPConnectionCallback   tcpConnection;
+       udsEventCallback        udsEvent;
+   } userCallback;
    void                    *   userContext;
    BOOL                        closed;
    mDNS                    *   m;