Index: phapi/phapi.c
===================================================================
--- phapi/phapi.c	(revision 452)
+++ phapi/phapi.c	(revision 453)
@@ -604,9 +604,5 @@
 static int _is_video_enabled(int streams) 
 {
-#ifdef PHAPI_VIDEO_SUPPORT
 	return (streams & (PH_STREAM_VIDEO_RX | PH_STREAM_VIDEO_TX));
-#else
-	return 0;
-#endif
 }
 
@@ -874,8 +870,6 @@
 				if (sdp_message_m_attr_has_type(ca->remote_sdp, "audio"))
 					ca->nego_mflags |= PH_STREAM_AUDIO;
-#ifdef PHAPI_VIDEO_SUPPORT
 				if (sdp_message_m_attr_has_type(ca->remote_sdp, "video"))
 					ca->nego_mflags |= PH_STREAM_VIDEO;
-#endif
 				osip_free(sdp);
 			}
@@ -892,8 +886,6 @@
 				if (sdp_message_m_attr_has_type(ca->remote_sdp, "audio"))
 					ca->nego_mflags |= PH_STREAM_AUDIO;
-#ifdef PHAPI_VIDEO_SUPPORT
 				if (sdp_message_m_attr_has_type(ca->remote_sdp, "video"))
 					ca->nego_mflags |= PH_STREAM_VIDEO;
-#endif
 				osip_free(sdp);
 			}
@@ -975,8 +967,6 @@
 static int ph_call_hasvideo(phcall_t *ca)
 {
-#ifdef PHAPI_VIDEO_SUPPORT
 	if (ca->mses && (ca->mses->activestreams & (1 << PH_MSTREAM_VIDEO1)))
 		return 1;
-#endif
 	return 0;
 }
@@ -1928,5 +1918,5 @@
 
 	for (j = 0; j < hcount; j++)
-		set_custom_header(msg, hdrs[j].hdr, hdrs[j].val);
+		set_customized_header(msg, hdrs[j].hdr, hdrs[j].val);
 
 	ph_apply_customizations(msg, NULL, NULL);
@@ -3757,8 +3747,6 @@
 PHAPI_EXPORT int phChangeVideoDevices(const char *devstr)
 {
-#ifdef PHAPI_VIDEO_SUPPORT
 	if (devstr)
 		osip_strncpy(phcfg.video_config.video_device, devstr, sizeof(phcfg.video_config.video_device)-1);
-#endif
 	
 	return 0;
Index: phcpp/phapipp.cpp
===================================================================
--- phcpp/phapipp.cpp	(revision 451)
+++ phcpp/phapipp.cpp	(revision 453)
@@ -179,5 +179,5 @@
 		const std::vector<std::pair<const char*, const char* > >& hdrs, const char* target)
 {
-	return phLineSendMessage3(vlid, target, to, buff, mime, hdrs.size(), (const struct ph_hdr_val*) hdrs.begin() );
+	return phLineSendMessage3(vlid, target, to, buff, mime, hdrs.size(), (const struct ph_hdr_val*) &hdrs.front() );
 }