clean mozab includes, so two include paths can be dropped

Change-Id: I824a6b6f6afa9e8c3d140e783dbad89ef5425878

8 files changed, 14 insertions, 16 deletions

diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk
index 5448487a3b98..14dd78783a82 100644
--- a/connectivity/Library_mozabdrv.mk
+++ b/connectivity/Library_mozabdrv.mk
@@ -28,8 +28,6 @@
 $(eval $(call gb_Library_Library,mozabdrv))
 
 $(eval $(call gb_Library_set_include,mozabdrv,\
-	-I$(SRCDIR)/connectivity/source/drivers/mozab/bootstrap \
-	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
 	-I$(SRCDIR)/connectivity/source/drivers/mozab \
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk
index 2a4793c3b733..36c7486df15a 100644
--- a/connectivity/Library_mozbootstrap.mk
+++ b/connectivity/Library_mozbootstrap.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,mozbootstrap,\
 ))
 
 $(eval $(call gb_Library_set_include,mozbootstrap,\
-	-I$(SRCDIR)/connectivity/source/drivers/mozab/mozillasrc \
+	-I$(SRCDIR)/connectivity/source/drivers/mozab \
 	$$(INCLUDE) \
 ))
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index e9d8222977af..4ab8996dd230 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -26,11 +26,11 @@
  *
  ************************************************************************/
 
-#include <MNSInclude.hxx>
+#include "mozillasrc/MNSInclude.hxx"
 
 #include "mozilla_nsinit.h"
 
-#include <MNSInit.hxx>
+#include "MNSInit.hxx"
 
 #include <sal/types.h>
 #include <osl/diagnose.h>
@@ -39,9 +39,9 @@
 #include <rtl/bootstrap.hxx>
 
 #include "MConfigAccess.hxx"
-#include "MNSDeclares.hxx"
+#include "mozillasrc/MNSDeclares.hxx"
 #include <osl/thread.hxx>
-#include <MNSTerminateListener.hxx>
+#include "mozillasrc/MNSTerminateListener.hxx"
 
 static nsIServiceManager*   sServiceManager = nsnull;
 static sal_Int32            sInitCounter = 0;
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
index 0ccd4322539c..4908098702bb 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx
@@ -28,7 +28,7 @@
 
 #ifndef _CONNECTIVITY_MAB_NS_INIT_HXX_
 #define _CONNECTIVITY_MAB_NS_INIT_HXX_ 1
-#include "MNSDeclares.hxx"
+#include "mozillasrc/MNSDeclares.hxx"
 
 #include <sal/types.h>
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
index 8125ac3ccbaf..c18ddab2b158 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx
@@ -27,8 +27,8 @@
  ************************************************************************/
 
 #include "MNSRunnable.hxx"
-#include "MDatabaseMetaDataHelper.hxx"
-#include "MQuery.hxx"
+#include "mozillasrc/MDatabaseMetaDataHelper.hxx"
+#include "mozillasrc/MQuery.hxx"
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
 
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
index 2f17ea53f556..21322764fcc7 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx
@@ -28,10 +28,10 @@
 
 #ifndef _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_
 #define _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_
-#include "MNSDeclares.hxx"
+#include "mozillasrc/MNSDeclares.hxx"
 #include <osl/thread.hxx>
 
-#include <MNSInclude.hxx>
+#include "mozillasrc/MNSInclude.hxx"
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/mozilla/XCodeProxy.hpp>
 
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index ebee40a1419f..7906d7a17207 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -28,7 +28,7 @@
 
 
 // Mozilla includes.
-#include <MNSInclude.hxx>
+#include "MNSInclude.hxx"
 
 #include "resource/mozab_res.hrc"
 #include "MDatabaseMetaDataHelper.hxx"
@@ -44,7 +44,7 @@
 #include <nsIAbDirFactoryService.h>
 #include "post_include_mozilla.h"
 
-#include <MNSInit.hxx>
+#include "bootstrap/MNSInit.hxx"
 #include <MNameMapper.hxx>
 #include "MNSMozabProxy.hxx"
 #include <MNSDeclares.hxx>
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index 4e90797a24a9..d279c6b33c5b 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
@@ -26,10 +26,10 @@
  *
  ************************************************************************/
 
-#include <MNSTerminateListener.hxx>
+#include "MNSTerminateListener.hxx"
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <MNSInit.hxx>
+#include "bootstrap/MNSInit.hxx"
 
 
 using namespace ::com::sun::star::uno;