10 files changed, 11 insertions, 20 deletions
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index e7030365758c..545c318d6e7d 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -34,7 +34,7 @@
 #include "createfilehandlefromfd.hxx"
 #include "file_error_transl.hxx"
 #include "file_impl.hxx"
-#include "file_url.h"
+#include "file_url.hxx"
 #include "uunxapi.h"
 
 #include <algorithm>
diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 300514c25ec7..b0fb22a71109 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -30,7 +30,7 @@
 #include "file_impl.hxx"
 #include "file_error_transl.hxx"
 #include "file_path_helper.hxx"
-#include "file_url.h"
+#include "file_url.hxx"
 #include "uunxapi.hxx"
 #include "readwrite_helper.h"
 
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index bf2e92e883c6..c589e4049461 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -31,7 +31,7 @@
 #include "file_impl.hxx"
 #include "file_error_transl.hxx"
 #include "file_path_helper.hxx"
-#include "file_url.h"
+#include "file_url.hxx"
 #include "uunxapi.hxx"
 
 namespace
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 1832fd6d6ffb..6b1cca2fffb5 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file_url.h"
+#include "file_url.hxx"
 
 #include "system.h"
 
diff --git a/sal/osl/unx/file_url.h b/sal/osl/unx/file_url.hxx
index 10168636da52..d087638af5f4 100644
--- a/sal/osl/unx/file_url.h
+++ b/sal/osl/unx/file_url.hxx
@@ -17,16 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_H
-#define INCLUDED_SAL_OSL_UNX_FILE_URL_H
+#ifndef INCLUDED_SAL_OSL_UNX_FILE_URL_HXX
+#define INCLUDED_SAL_OSL_UNX_FILE_URL_HXX
 
 #include "osl/file.h"
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
 oslFileError osl_getSystemPathFromFileURL_Ex(rtl_uString *ustrFileURL, rtl_uString **pustrSystemPath);
 
 oslFileError FileURLToPath(char * buffer, size_t bufLen, rtl_uString* ustrFileURL);
@@ -35,10 +30,6 @@ int UnicodeToText(char * buffer, size_t bufLen, const sal_Unicode * uniText, sal
 
 int TextToUnicode(const char* text, size_t text_buffer_size, sal_Unicode* unic_text, sal_Int32 unic_text_buffer_size);
 
-#ifdef __cplusplus
-}
 #endif
 
-#endif /* #define INCLUDED_SAL_OSL_UNX_FILE_URL_H */
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index ee225d2d1034..c530eb007ee9 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -24,7 +24,7 @@
 #include "rtl/alloc.h"
 
 #include "file_error_transl.hxx"
-#include "file_url.h"
+#include "file_url.hxx"
 #include "system.h"
 
 #include <errno.h>
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index c6ae0c0e5a30..cb0e76372d4e 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -27,7 +27,7 @@
 #include <osl/file.h>
 #include <assert.h>
 #include "system.h"
-#include "file_url.h"
+#include "file_url.hxx"
 
 #ifdef AIX
 #include <sys/ldr.h>
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index e97320270583..5429d7a2ac90 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -56,7 +56,7 @@
 #include <grp.h>
 
 #include "createfilehandlefromfd.hxx"
-#include "file_url.h"
+#include "file_url.hxx"
 #include "procimpl.h"
 #include "readwrite_helper.h"
 #include "sockimpl.h"
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 21874271dc16..d9f4402abef0 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -19,7 +19,7 @@
 
 #include "system.h"
 #include "readwrite_helper.h"
-#include "file_url.h"
+#include "file_url.hxx"
 
 #include <osl/diagnose.h>
 #include <osl/profile.h>
diff --git a/sal/osl/unx/tempfile.cxx b/sal/osl/unx/tempfile.cxx
index bbe3c27e0d39..204535c455aa 100644
--- a/sal/osl/unx/tempfile.cxx
+++ b/sal/osl/unx/tempfile.cxx
@@ -29,7 +29,7 @@
 #include <osl/diagnose.h>
 #include <sal/macros.h>
 
-#include "file_url.h"
+#include "file_url.hxx"
 #include "file_impl.hxx"
 
 oslFileError SAL_CALL osl_getTempDirURL( rtl_uString** pustrTempDir )