Remove unnecessary include files declaring JNI functions

Change-Id: Ie9e083a9dcdaebf9f481bae920eddef69e47c3bc

7 files changed, 23 insertions, 304 deletions

diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 4c38968bd337..9ec723094465 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include "hsqldb/HStorageMap.hxx"
-#include "hsqldb/StorageNativeInputStream.h"
 #include "accesslog.hxx"
 #include "diagnose_ex.h"
 #include <osl/diagnose.h>
@@ -45,7 +44,7 @@ using namespace ::connectivity::hsqldb;
  * Method:    openStream
  * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
   (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jint mode)
 {
 #ifdef HSQLDB_DBG
@@ -63,7 +62,7 @@ void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
  * Method:    close
  * Signature: (Ljava/lang/String;Ljava/lang/String;)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
   (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
 {
 #ifdef HSQLDB_DBG
@@ -102,7 +101,7 @@ void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
  * Method:    getFilePointer
  * Signature: (Ljava/lang/String;Ljava/lang/String;)J
  */
-jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
+extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
   (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
 {
 #ifdef HSQLDB_DBG
@@ -126,7 +125,7 @@ jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePoi
  * Method:    length
  * Signature: (Ljava/lang/String;Ljava/lang/String;)J
  */
-jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
+extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
   (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
 {
 #ifdef HSQLDB_DBG
@@ -193,7 +192,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name,
  * Method:    read
  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
   (JNIEnv* env, jobject obj_this, jstring name, jstring key)
 {
 #ifdef HSQLDB_DBG
@@ -266,7 +265,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
  * Method:    read
  * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
   (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len)
 {
 #ifdef HSQLDB_DBG
@@ -287,7 +286,7 @@ jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava
  * Method:    readInt
  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
   (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key)
 {
 #ifdef HSQLDB_DBG
@@ -355,7 +354,7 @@ jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
  * Method:    seek
  * Signature: (Ljava/lang/String;Ljava/lang/String;J)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
   (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jlong position)
 {
 #ifdef HSQLDB_DBG
@@ -467,7 +466,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
  * Method:    write
  * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
   (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len)
 {
 #ifdef HSQLDB_DBG
@@ -526,7 +525,7 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j
  * Method:    writeInt
  * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
   (JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v)
 {
 #ifdef HSQLDB_DBG
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 04c7d80fba4d..740fe733ba08 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -23,7 +23,6 @@
 #endif
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
-#include "hsqldb/StorageFileAccess.h"
 #include "hsqldb/HStorageMap.hxx"
 #include <osl/diagnose.h>
 
@@ -40,7 +39,7 @@ using namespace ::connectivity::hsqldb;
  * Method:    isStreamElement
  * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
  */
-jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
+extern "C" SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
 {
     TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key));
@@ -92,7 +91,7 @@ jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamE
  * Method:    removeElement
  * Signature: (Ljava/lang/String;Ljava/lang/String;)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
 {
 #ifdef HSQLDB_DBG
@@ -127,7 +126,7 @@ void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
  * Method:    renameElement
  * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring oldname, jstring newname)
 {
 #ifdef HSQLDB_DBG
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 435218e6515c..fea9a9c3d0eb 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -29,7 +29,6 @@
 #include <comphelper/types.hxx>
 #include "hsqldb/HStorageAccess.hxx"
 #include "hsqldb/HStorageMap.hxx"
-#include "hsqldb/StorageNativeInputStream.h"
 
 #include <jvmaccess/virtualmachine.hxx>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
@@ -57,7 +56,7 @@ using namespace ::connectivity::hsqldb;
  * Method:    openStream
  * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jint mode)
 {
 #ifdef HSQLDB_DBG
@@ -75,7 +74,7 @@ void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openSt
  * Method:    read
  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
   (JNIEnv * env, jobject obj_this,jstring key, jstring name)
 {
 #ifdef HSQLDB_DBG
@@ -94,7 +93,7 @@ jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__
  * Method:    read
  * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
   (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer, jint off, jint len)
 {
 #ifdef HSQLDB_DBG
@@ -113,7 +112,7 @@ jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__
  * Method:    close
  * Signature: (Ljava/lang/String;Ljava/lang/String;)V
  */
-void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
+extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
 {
 #ifdef HSQLDB_DBG
@@ -133,7 +132,7 @@ void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
  * Method:    skip
  * Signature: (Ljava/lang/String;Ljava/lang/String;J)J
  */
-jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
+extern "C" SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jlong n)
 {
 #ifdef HSQLDB_DBG
@@ -199,7 +198,7 @@ jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
  * Method:    available
  * Signature: (Ljava/lang/String;Ljava/lang/String;)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name)
 {
 #ifdef HSQLDB_DBG
@@ -241,7 +240,7 @@ jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_availa
  * Method:    read
  * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
  */
-jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
+extern "C" SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
   (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jbyteArray buffer)
 {
 #ifdef HSQLDB_DBG
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h
deleted file mode 100644
index 9d26fdadc4a1..000000000000
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream */
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    openStream
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream
-  (JNIEnv *, jobject, jstring, jstring, jint);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    close
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    getFilePointer
- * Signature: (Ljava/lang/String;Ljava/lang/String;)J
- */
-SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    length
- * Signature: (Ljava/lang/String;Ljava/lang/String;)J
- */
-SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    read
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
-  (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    readInt
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    seek
- * Signature: (Ljava/lang/String;Ljava/lang/String;J)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek
-  (JNIEnv *, jobject, jstring, jstring, jlong);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    write
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write
-  (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
- * Method:    writeInt
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt
-  (JNIEnv *, jobject, jstring, jstring, jint);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index b1e6b85de136..0133691cfd1c 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -20,7 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
 
-#include "hsqldb/HStorageAccess.h"
+#include <sal/config.h>
+
+#include <jni.h>
 
 namespace connectivity { namespace hsqldb
 {
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h
deleted file mode 100644
index dbbe07326016..000000000000
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method:    isStreamElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
- */
-SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method:    removeElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
- * Method:    renameElement
- * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement
-  (JNIEnv *, jobject, jstring, jstring, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
deleted file mode 100644
index 76f9a0f7b4e6..000000000000
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream */
-
-#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
-#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
-
-#include <sal/config.h>
-
-#include <sal/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream */
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    openStream
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream
-  (JNIEnv * env, jobject obj_this,jstring key, jstring name, jint);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    read
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2
-  (JNIEnv * env, jobject obj_this,jstring key, jstring name);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII
-  (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray, jint, jint);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    close
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    skip
- * Signature: (Ljava/lang/String;Ljava/lang/String;J)J
- */
-SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip
-  (JNIEnv *, jobject, jstring, jstring, jlong);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    available
- * Signature: (Ljava/lang/String;Ljava/lang/String;)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
- * Method:    read
- * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I
- */
-SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B
-  (JNIEnv *, jobject, jstring, jstring, jbyteArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */