diff --git a/ChangeLog b/ChangeLog
index c3a511c..a8bd41a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -332,6 +332,14 @@ Version 1.8.0
 Version 1.6.17
 *******************************************************************************
 
+2012-03-24 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
+
+	SF Bug Tracker id 3510693 - build fail with --disable-device
+
+	GetDeviceHandleInfo just fail without using undefined member DeviceAf
+	if UPNP_HAVE_DEVICE is not defined.
+	Move ContentTypeHeader definition to soap_common.c, since it is
+	also used in soap_ctrlpt.c.
 
 *******************************************************************************
 Version 1.6.16
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 3d033a8..d93bdaa 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -3831,6 +3831,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
 	UpnpDevice_Handle *device_handle_out,
 	struct Handle_Info **HndInfo)
 {
+#ifdef UPNP_HAVE_DEVICE
 	/* Check if we've got a registered device of the address family specified. */
 	if ((AddressFamily == AF_INET  && UpnpSdkDeviceRegisteredV4 == 0) ||
 	    (AddressFamily == AF_INET6 && UpnpSdkDeviceregisteredV6 == 0)) {
@@ -3850,6 +3851,7 @@ Upnp_Handle_Type GetDeviceHandleInfo(
 			break;
 		}
 	}
+#endif /* UPNP_HAVE_DEVICE */
 
 	*device_handle_out = -1;
 	return HND_INVALID;
diff --git a/upnp/src/soap/soap_common.c b/upnp/src/soap/soap_common.c
index 312c681..b3d5b06 100644
--- a/upnp/src/soap/soap_common.c
+++ b/upnp/src/soap/soap_common.c
@@ -6,5 +6,8 @@
 #include "sock.h"
 #include "soaplib.h"
 
+const char *ContentTypeHeader =
+    "CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
+
 #endif /* EXCLUDE_SOAP */
 
diff --git a/upnp/src/soap/soap_device.c b/upnp/src/soap/soap_device.c
index 5e11ca1..b0fdc96 100644
--- a/upnp/src/soap/soap_device.c
+++ b/upnp/src/soap/soap_device.c
@@ -74,9 +74,6 @@ static const char *Soap_Invalid_Action = "Invalid Action";
 static const char *Soap_Action_Failed = "Action Failed";
 static const char *Soap_Invalid_Var = "Invalid Var";
 
-const char *ContentTypeHeader =
-    "CONTENT-TYPE: text/xml; charset=\"utf-8\"\r\n";
-
 /*!
  * \brief This function retrives the name of the SOAP action.
  *