Drop pointless "internal" directory level for already internal include files

Change-Id: I496fdbab3e17c806c2d16513412c4c1b9120bc3c

22 files changed, 18 insertions, 18 deletions

diff --git a/sal/inc/internal/misc.hxx b/sal/inc/misc.hxx
index b93868e1baab..b93868e1baab 100644
--- a/sal/inc/internal/misc.hxx
+++ b/sal/inc/misc.hxx
diff --git a/sal/inc/internal/oslmemory.h b/sal/inc/oslmemory.h
index 011a6e320606..011a6e320606 100644
--- a/sal/inc/internal/oslmemory.h
+++ b/sal/inc/oslmemory.h
diff --git a/sal/inc/internal/oslrandom.h b/sal/inc/oslrandom.h
index 305eaf937b65..305eaf937b65 100644
--- a/sal/inc/internal/oslrandom.h
+++ b/sal/inc/oslrandom.h
diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx
index 13cf7bbb3333..0db83782b9aa 100644
--- a/sal/inc/pch/precompiled_sal.hxx
+++ b/sal/inc/pch/precompiled_sal.hxx
@@ -91,6 +91,6 @@
 #include <sal/mathconf.h>
 #include <sal/saldllapi.h>
 #include <sal/types.h>
-#include <internal/rtllifecycle.h>
+#include <rtllifecycle.h>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/inc/internal/rtllifecycle.h b/sal/inc/rtllifecycle.h
index 29a493b8a802..29a493b8a802 100644
--- a/sal/inc/internal/rtllifecycle.h
+++ b/sal/inc/rtllifecycle.h
diff --git a/sal/inc/internal/signalshared.hxx b/sal/inc/signalshared.hxx
index 3eaa32c63788..3eaa32c63788 100644
--- a/sal/inc/internal/signalshared.hxx
+++ b/sal/inc/signalshared.hxx
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index a010c333d555..20efa68ee645 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -25,7 +25,7 @@
 #include "sal/detail/log.h"
 #include "sal/log.hxx"
 #include "sal/types.h"
-#include "internal/misc.hxx"
+#include "misc.hxx"
 
 #include "logformat.hxx"
 
diff --git a/sal/osl/all/signalshared.cxx b/sal/osl/all/signalshared.cxx
index f444f37afd50..d4615b3a153e 100644
--- a/sal/osl/all/signalshared.cxx
+++ b/sal/osl/all/signalshared.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include <internal/signalshared.hxx>
+#include <signalshared.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/sal/osl/unx/backtraceapi.cxx b/sal/osl/unx/backtraceapi.cxx
index a2a2cac3aa4c..1895c4360837 100644
--- a/sal/osl/unx/backtraceapi.cxx
+++ b/sal/osl/unx/backtraceapi.cxx
@@ -10,7 +10,7 @@
 #include <sal/config.h>
 
 #include <rtl/ustrbuf.hxx>
-#include "internal/misc.hxx"
+#include "misc.hxx"
 
 // FIXME: no-op for now; it needs implementing, cf. above.
 rtl_uString *osl_backtraceAsString()
diff --git a/sal/osl/unx/memory.cxx b/sal/osl/unx/memory.cxx
index c016baa97a00..db376ecaf722 100644
--- a/sal/osl/unx/memory.cxx
+++ b/sal/osl/unx/memory.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <internal/oslmemory.h>
+#include <oslmemory.h>
 
 #include <stdlib.h>
 #ifdef __ANDROID__
diff --git a/sal/osl/unx/random.cxx b/sal/osl/unx/random.cxx
index a0fb73c92867..f9c97755b233 100644
--- a/sal/osl/unx/random.cxx
+++ b/sal/osl/unx/random.cxx
@@ -8,7 +8,7 @@
  */
 
 #include "system.hxx"
-#include "internal/oslrandom.h"
+#include "oslrandom.h"
 
 #include <assert.h>
 
diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index 73bb19d61e81..fa8e3f2c216e 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include <internal/signalshared.hxx>
+#include <signalshared.hxx>
 
 #include <config_features.h>
 
diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index 750cb15f609a..5095d2053051 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "internal/misc.hxx"
+#include "misc.hxx"
 
 #include <windows.h>
 #include <process.h>
diff --git a/sal/osl/w32/dllentry.c b/sal/osl/w32/dllentry.c
index c6e4fb6494ba..97536ce116be 100644
--- a/sal/osl/w32/dllentry.c
+++ b/sal/osl/w32/dllentry.c
@@ -34,7 +34,7 @@
 #include <osl/mutex.h>
 #include <osl/thread.h>
 
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
 
 // externals
 
diff --git a/sal/osl/w32/memory.c b/sal/osl/w32/memory.c
index 279a1681d4e1..1f1a5b516ff0 100644
--- a/sal/osl/w32/memory.c
+++ b/sal/osl/w32/memory.c
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <internal/oslmemory.h>
+#include <oslmemory.h>
 
 #include <malloc.h>
 
diff --git a/sal/osl/w32/signal.cxx b/sal/osl/w32/signal.cxx
index cb4c6689876e..fb0eee0514ee 100644
--- a/sal/osl/w32/signal.cxx
+++ b/sal/osl/w32/signal.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include <internal/signalshared.hxx>
+#include <signalshared.hxx>
 
 /* system headers */
 #include "system.h"
diff --git a/sal/rtl/alloc_arena.cxx b/sal/rtl/alloc_arena.cxx
index 6a7f7405b852..654cd2f1dbfa 100644
--- a/sal/rtl/alloc_arena.cxx
+++ b/sal/rtl/alloc_arena.cxx
@@ -20,7 +20,7 @@
 #include "alloc_arena.hxx"
 
 #include "alloc_impl.hxx"
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
 #include "sal/macros.h"
 #include "osl/diagnose.h"
 
diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 2da4a55f0ddc..362582fe849f 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -20,7 +20,7 @@
 #include "alloc_cache.hxx"
 #include "alloc_impl.hxx"
 #include "alloc_arena.hxx"
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
 #include "sal/macros.h"
 #include "osl/diagnose.h"
 #include <osl/thread.hxx>
diff --git a/sal/rtl/alloc_fini.cxx b/sal/rtl/alloc_fini.cxx
index 32c6fd5a5996..dd0cb6a52c94 100644
--- a/sal/rtl/alloc_fini.cxx
+++ b/sal/rtl/alloc_fini.cxx
@@ -19,7 +19,7 @@
 
 #include <rtl/instance.hxx>
 
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
 
 namespace
 {
diff --git a/sal/rtl/alloc_global.cxx b/sal/rtl/alloc_global.cxx
index 1e344f38b3a3..6c9b2888e0c4 100644
--- a/sal/rtl/alloc_global.cxx
+++ b/sal/rtl/alloc_global.cxx
@@ -26,8 +26,8 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "internal/rtllifecycle.h"
-#include <internal/oslmemory.h>
+#include "rtllifecycle.h"
+#include <oslmemory.h>
 
 AllocMode alloc_mode = AMode_UNSET;
 
diff --git a/sal/rtl/locale.cxx b/sal/rtl/locale.cxx
index 8274dde80099..bd232c1a768a 100644
--- a/sal/rtl/locale.cxx
+++ b/sal/rtl/locale.cxx
@@ -22,7 +22,7 @@
 #include "osl/diagnose.h"
 #include "rtl/alloc.h"
 
-#include "internal/rtllifecycle.h"
+#include "rtllifecycle.h"
 
 static const sal_Int32 RTL_HASHTABLE_SIZE[] =
 {
diff --git a/sal/rtl/random.cxx b/sal/rtl/random.cxx
index 1c52935fa9eb..3168c9686e28 100644
--- a/sal/rtl/random.cxx
+++ b/sal/rtl/random.cxx
@@ -24,7 +24,7 @@
 #include <rtl/alloc.h>
 #include <rtl/digest.h>
 #include <rtl/random.h>
-#include "internal/oslrandom.h"
+#include "oslrandom.h"
 /*========================================================================
  *
  * rtlRandom internals.