Move dbaccess/source/core/dataaccess include files to common include directory

...that are included from both dbaccess/source/core/dataaccess and
dbaccess/source/core/misc.  Change done in preparation of loplugin:includeform.

Change-Id: I0572322810d8b4cd66a1b1f9e9deec893cafdbca

dbaccess/source/core/dataaccess/ModelImpl.hxx → dbaccess/source/core/inc/ModelImpl.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MODELIMPL_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MODELIMPL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODELIMPL_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODELIMPL_HXX
 
 #include "apitools.hxx"
 #include "bookmarkcontainer.hxx"
@@ -606,6 +606,6 @@ public:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREDATAACCESS_DATALINK_HXX_
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/core/dataaccess/bookmarkcontainer.hxx → dbaccess/source/core/inc/bookmarkcontainer.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_BOOKMARKCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_BOOKMARKCONTAINER_HXX
 
 #include <sal/config.h>
 
@@ -151,6 +151,6 @@ inline  bool OBookmarkContainer::checkExistence(const OUString& _rName)
 
 }   // namespace dbaccess
 
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/core/dataaccess/databasecontext.hxx → dbaccess/source/core/inc/databasecontext.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASECONTEXT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASECONTEXT_HXX
 
 #include <sal/config.h>
 
@@ -186,6 +186,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/core/dataaccess/documentevents.hxx → dbaccess/source/core/inc/documentevents.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DOCUMENTEVENTS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DOCUMENTEVENTS_HXX
 
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -73,6 +73,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

dbaccess/source/core/misc/services.cxx

@@ -22,7 +22,7 @@
 #include "DatabaseDataProvider.hxx"
 #include "dbadllapi.hxx"
 
-#include <../dataaccess/databasecontext.hxx>
+#include <databasecontext.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;