webdav: fix include paths

Change-Id: I323bef2e1c21e2a1981409d4295ccf555088e5ea

ucb/source/ucp/webdav/AprEnv.hxx

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_APRENV_HXX
 #define INCLUDED_APRENV_HXX
 
-#include <apr/apr_pools.h>
+#include <apr_pools.h>
 
 namespace apr_environment
 {

ucb/source/ucp/webdav/SerfCallbacks.hxx

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_CALLBACKS_HXX
 #define INCLUDED_CALLBACKS_HXX
 
-#include <serf/serf.h>
+#include <serf.h>
 
 extern "C" apr_status_t Serf_ConnectSetup( apr_socket_t *skt,
                                            serf_bucket_t **read_bkt,

ucb/source/ucp/webdav/SerfCopyReqProcImpl.cxx

@@ -19,7 +19,7 @@
 
 #include "SerfCopyReqProcImpl.hxx"
 
-#include <serf/serf.h>
+#include <serf.h>
 
 namespace http_dav_ucp
 {

ucb/source/ucp/webdav/SerfDeleteReqProcImpl.cxx

@@ -19,7 +19,7 @@
 
 #include "SerfDeleteReqProcImpl.hxx"
 
-#include <serf/serf.h>
+#include <serf.h>
 
 namespace http_dav_ucp
 {

ucb/source/ucp/webdav/SerfMkColReqProcImpl.cxx

@@ -19,7 +19,7 @@
 
 #include "SerfMkColReqProcImpl.hxx"
 
-#include <serf/serf.h>
+#include <serf.h>
 
 namespace http_dav_ucp
 {

ucb/source/ucp/webdav/SerfMoveReqProcImpl.cxx

@@ -19,7 +19,7 @@
 
 #include "SerfMoveReqProcImpl.hxx"
 
-#include <serf/serf.h>
+#include <serf.h>
 
 namespace http_dav_ucp
 {

ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx

@@ -19,7 +19,7 @@
 
 #include "SerfPostReqProcImpl.hxx"
 
-#include <serf/serf.h>
+#include <serf.h>
 
 using namespace com::sun::star;
 

ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx

@@ -21,7 +21,7 @@
 
 #include "SerfPutReqProcImpl.hxx"
 
-#include <serf/serf.h>
+#include <serf.h>
 
 namespace http_dav_ucp
 {

ucb/source/ucp/webdav/SerfRequestProcessor.hxx

@@ -24,7 +24,7 @@
 #include <apr_errno.h>
 #include <apr_pools.h>
 
-#include <serf/serf.h>
+#include <serf.h>
 
 #include "DAVTypes.hxx"
 #include "DAVResource.hxx"

ucb/source/ucp/webdav/SerfRequestProcessorImpl.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
 #define INCLUDED_SERFREQUESTPROCESSORIMPL_HXX
 
-#include <serf/serf.h>
+#include <serf.h>
 
 #include <sal/types.h>
 #include "DAVRequestEnvironment.hxx"

ucb/source/ucp/webdav/SerfSession.cxx

@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <hash_map>
 #include <vector>
 #include <string.h>
 #include <rtl/string.h>
@@ -26,7 +25,7 @@
 #include "ucbhelper/simplecertificatevalidationrequest.hxx"
 
 #include "AprEnv.hxx"
-#include <apr/apr_strings.h>
+#include <apr_strings.h>
 
 #include "DAVAuthListener.hxx"
 #include "SerfTypes.hxx"

ucb/source/ucp/webdav/SerfTypes.hxx

@@ -22,7 +22,7 @@
 #ifndef INCLUDED_SERFTYPES_HXX
 #define INCLUDED_SERFTYPES_HXX
 
-#include <serf/serf.h>
+#include <serf.h>
 
 typedef serf_connection_t SerfConnection;
 

ucb/source/ucp/webdav/SerfUri.hxx

@@ -21,7 +21,7 @@
 #ifndef INCLUDED_SERFURI_HXX
 #define INCLUDED_SERFURI_HXX
 
-#include <apr-util/apr_uri.h>
+#include <apr_uri.h>
 #include <rtl/ustring.hxx>
 #include "DAVException.hxx"