8 files changed, 17 insertions, 17 deletions
diff --git a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx b/bridges/inc/arraypointer.hxx
index c5018c32b967..84e5297f3eb4 100644
--- a/bridges/inc/bridges/cpp_uno/shared/arraypointer.hxx
+++ b/bridges/inc/arraypointer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_ARRAYPOINTER_HXX
+#ifndef INCLUDED_BRIDGES_INC_ARRAYPOINTER_HXX
+#define INCLUDED_BRIDGES_INC_ARRAYPOINTER_HXX
 
 #include "sal/config.h"
 
diff --git a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx b/bridges/inc/bridge.hxx
index 9cfa92bcddef..5e3b146217b0 100644
--- a/bridges/inc/bridges/cpp_uno/shared/bridge.hxx
+++ b/bridges/inc/bridge.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_BRIDGE_HXX
+#ifndef INCLUDED_BRIDGES_INC_BRIDGE_HXX
+#define INCLUDED_BRIDGES_INC_BRIDGE_HXX
 
 #include "osl/interlck.h"
 #include "sal/types.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx b/bridges/inc/cppinterfaceproxy.hxx
index 4002af6395b3..13a2b2235f02 100644
--- a/bridges/inc/bridges/cpp_uno/shared/cppinterfaceproxy.hxx
+++ b/bridges/inc/cppinterfaceproxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_CPPINTERFACEPROXY_HXX
+#ifndef INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
+#define INCLUDED_BRIDGES_INC_CPPINTERFACEPROXY_HXX
 
 #include "osl/interlck.h"
 #include "rtl/ustring.hxx"
@@ -26,7 +26,7 @@
 #include "typelib/typedescription.h"
 #include "uno/dispatcher.h"
 #include "uno/environment.h"
-#include "bridges/cpp_uno/shared/vtablefactory.hxx"
+#include "vtablefactory.hxx"
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XInterface;
diff --git a/bridges/inc/bridges/cpp_uno/shared/except.hxx b/bridges/inc/except.hxx
index fcb455297bf2..32e911321161 100644
--- a/bridges/inc/bridges/cpp_uno/shared/except.hxx
+++ b/bridges/inc/except.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_EXCEPT_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_EXCEPT_HXX
+#ifndef INCLUDED_BRIDGES_INC_EXCEPT_HXX
+#define INCLUDED_BRIDGES_INC_EXCEPT_HXX
 
 #if _MSC_VER >= 1900 // VC 2015 (and later?)
 // extern "C" void** __cdecl __current_exception()
diff --git a/bridges/inc/bridges/cpp_uno/shared/types.hxx b/bridges/inc/types.hxx
index d5ecd5eb2c25..12e8812b5c8e 100644
--- a/bridges/inc/bridges/cpp_uno/shared/types.hxx
+++ b/bridges/inc/types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_TYPES_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_TYPES_HXX
+#ifndef INCLUDED_BRIDGES_INC_TYPES_HXX
+#define INCLUDED_BRIDGES_INC_TYPES_HXX
 
 #include "typelib/typeclass.h"
 #include "typelib/typedescription.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx b/bridges/inc/unointerfaceproxy.hxx
index f678765b7826..c9697d3491a8 100644
--- a/bridges/inc/bridges/cpp_uno/shared/unointerfaceproxy.hxx
+++ b/bridges/inc/unointerfaceproxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_UNOINTERFACEPROXY_HXX
+#ifndef INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
+#define INCLUDED_BRIDGES_INC_UNOINTERFACEPROXY_HXX
 
 #include "osl/interlck.h"
 #include "rtl/ustring.hxx"
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/vtablefactory.hxx
index 19fe4e7a0fa5..7e8566e72ec4 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx
+++ b/bridges/inc/vtablefactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLEFACTORY_HXX
+#ifndef INCLUDED_BRIDGES_INC_VTABLEFACTORY_HXX
+#define INCLUDED_BRIDGES_INC_VTABLEFACTORY_HXX
 
 #include "osl/mutex.hxx"
 #include "rtl/alloc.h"
diff --git a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx b/bridges/inc/vtables.hxx
index ee9a2a3deea2..cd4c2f183c02 100644
--- a/bridges/inc/bridges/cpp_uno/shared/vtables.hxx
+++ b/bridges/inc/vtables.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX
-#define INCLUDED_BRIDGES_INC_BRIDGES_CPP_UNO_SHARED_VTABLES_HXX
+#ifndef INCLUDED_BRIDGES_INC_VTABLES_HXX
+#define INCLUDED_BRIDGES_INC_VTABLES_HXX
 
 #include "sal/types.h"
 #include "typelib/typedescription.h"