From d4fc7745f9ab0e8a890d5b981dfe27ffd38634ef Mon Sep 17 00:00:00 2001
From: Francis ANDRE <francis.andre.kampbell@orange.fr>
Date: Wed, 6 Jun 2018 08:26:59 +0200
Subject: [PATCH] Remove Data directory

---
 Data/MySQL/include/Poco/Data/MySQL/Binder.h   | 13 ----------
 .../MySQL/include/Poco/Data/MySQL/Connector.h | 13 ----------
 .../MySQL/include/Poco/Data/MySQL/Extractor.h | 13 ----------
 Data/MySQL/include/Poco/Data/MySQL/MySQL.h    | 13 ----------
 .../include/Poco/Data/MySQL/MySQLException.h  | 13 ----------
 .../Poco/Data/MySQL/MySQLStatementImpl.h      | 13 ----------
 .../include/Poco/Data/MySQL/ResultMetadata.h  | 13 ----------
 .../include/Poco/Data/MySQL/SessionHandle.h   | 13 ----------
 .../include/Poco/Data/MySQL/SessionImpl.h     | 13 ----------
 .../Poco/Data/MySQL/StatementExecutor.h       | 13 ----------
 Data/MySQL/include/Poco/Data/MySQL/Utility.h  | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Binder.h     | 13 ----------
 .../include/Poco/Data/ODBC/ConnectionHandle.h | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Connector.h  | 13 ----------
 .../ODBC/include/Poco/Data/ODBC/Diagnostics.h | 13 ----------
 .../Poco/Data/ODBC/EnvironmentHandle.h        | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Error.h      | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Extractor.h  | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Handle.h     | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/ODBC.h       | 13 ----------
 .../include/Poco/Data/ODBC/ODBCException.h    | 13 ----------
 .../include/Poco/Data/ODBC/ODBCMetaColumn.h   | 13 ----------
 .../Poco/Data/ODBC/ODBCStatementImpl.h        | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Parameter.h  | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Preparator.h | 13 ----------
 .../ODBC/include/Poco/Data/ODBC/SessionImpl.h | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h   | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Unicode.h    | 13 ----------
 .../include/Poco/Data/ODBC/Unicode_UNIXODBC.h | 13 ----------
 .../include/Poco/Data/ODBC/Unicode_WIN32.h    | 13 ----------
 Data/ODBC/include/Poco/Data/ODBC/Utility.h    | 13 ----------
 .../include/Poco/Data/PostgreSQL/Binder.h     | 13 ----------
 .../include/Poco/Data/PostgreSQL/Connector.h  | 13 ----------
 .../include/Poco/Data/PostgreSQL/Extractor.h  | 13 ----------
 .../include/Poco/Data/PostgreSQL/PostgreSQL.h | 13 ----------
 .../Data/PostgreSQL/PostgreSQLException.h     | 13 ----------
 .../Data/PostgreSQL/PostgreSQLStatementImpl.h | 13 ----------
 .../Poco/Data/PostgreSQL/PostgreSQLTypes.h    | 13 ----------
 .../Poco/Data/PostgreSQL/SessionHandle.h      | 13 ----------
 .../Poco/Data/PostgreSQL/SessionImpl.h        | 13 ----------
 .../Poco/Data/PostgreSQL/StatementExecutor.h  | 13 ----------
 .../include/Poco/Data/PostgreSQL/Utility.h    | 13 ----------
 Data/PostgreSQL/include/libpq/libpq-fs.h      | 24 ------------------
 Data/SQLite/include/Poco/Data/SQLite/Binder.h | 13 ----------
 .../include/Poco/Data/SQLite/Connector.h      | 13 ----------
 .../include/Poco/Data/SQLite/Extractor.h      | 13 ----------
 .../include/Poco/Data/SQLite/Notifier.h       | 13 ----------
 Data/SQLite/include/Poco/Data/SQLite/SQLite.h | 13 ----------
 .../Poco/Data/SQLite/SQLiteException.h        | 13 ----------
 .../Poco/Data/SQLite/SQLiteStatementImpl.h    | 13 ----------
 .../include/Poco/Data/SQLite/SessionImpl.h    | 13 ----------
 .../SQLite/include/Poco/Data/SQLite/Utility.h | 13 ----------
 Data/include/Poco/Data/AbstractBinder.h       | 13 ----------
 Data/include/Poco/Data/AbstractBinding.h      | 13 ----------
 Data/include/Poco/Data/AbstractExtraction.h   | 13 ----------
 Data/include/Poco/Data/AbstractExtractor.h    | 13 ----------
 Data/include/Poco/Data/AbstractPreparation.h  | 13 ----------
 Data/include/Poco/Data/AbstractPreparator.h   | 13 ----------
 Data/include/Poco/Data/AbstractSessionImpl.h  | 13 ----------
 Data/include/Poco/Data/ArchiveStrategy.h      | 13 ----------
 Data/include/Poco/Data/AutoTransaction.h      | 13 ----------
 Data/include/Poco/Data/Binding.h              | 13 ----------
 Data/include/Poco/Data/Bulk.h                 | 13 ----------
 Data/include/Poco/Data/BulkBinding.h          | 13 ----------
 Data/include/Poco/Data/BulkExtraction.h       | 13 ----------
 Data/include/Poco/Data/Column.h               | 13 ----------
 Data/include/Poco/Data/Connector.h            | 13 ----------
 Data/include/Poco/Data/Constants.h            | 13 ----------
 Data/include/Poco/Data/Data.h                 | 25 -------------------
 Data/include/Poco/Data/DataException.h        | 19 --------------
 Data/include/Poco/Data/Date.h                 | 13 ----------
 Data/include/Poco/Data/DynamicDateTime.h      | 13 ----------
 Data/include/Poco/Data/DynamicLOB.h           | 13 ----------
 Data/include/Poco/Data/Extraction.h           | 13 ----------
 Data/include/Poco/Data/JSONRowFormatter.h     | 13 ----------
 Data/include/Poco/Data/LOB.h                  | 13 ----------
 Data/include/Poco/Data/LOBStream.h            | 13 ----------
 Data/include/Poco/Data/Limit.h                | 13 ----------
 Data/include/Poco/Data/MetaColumn.h           | 13 ----------
 Data/include/Poco/Data/PooledSessionHolder.h  | 13 ----------
 Data/include/Poco/Data/PooledSessionImpl.h    | 13 ----------
 Data/include/Poco/Data/Position.h             | 13 ----------
 Data/include/Poco/Data/Preparation.h          | 13 ----------
 Data/include/Poco/Data/Range.h                | 13 ----------
 Data/include/Poco/Data/RecordSet.h            | 13 ----------
 Data/include/Poco/Data/Row.h                  | 13 ----------
 Data/include/Poco/Data/RowFilter.h            | 13 ----------
 Data/include/Poco/Data/RowFormatter.h         | 13 ----------
 Data/include/Poco/Data/RowIterator.h          | 13 ----------
 Data/include/Poco/Data/SQLChannel.h           | 13 ----------
 Data/include/Poco/Data/Session.h              | 13 ----------
 Data/include/Poco/Data/SessionFactory.h       | 13 ----------
 Data/include/Poco/Data/SessionImpl.h          | 13 ----------
 Data/include/Poco/Data/SessionPool.h          | 13 ----------
 Data/include/Poco/Data/SessionPoolContainer.h | 13 ----------
 Data/include/Poco/Data/SimpleRowFormatter.h   | 13 ----------
 Data/include/Poco/Data/Statement.h            | 13 ----------
 Data/include/Poco/Data/StatementCreator.h     | 13 ----------
 Data/include/Poco/Data/StatementImpl.h        | 13 ----------
 Data/include/Poco/Data/Time.h                 | 13 ----------
 Data/include/Poco/Data/Transaction.h          | 13 ----------
 Data/include/Poco/Data/TypeHandler.h          | 13 ----------
 102 files changed, 1355 deletions(-)
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/Binder.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/Connector.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/Extractor.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/MySQL.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
 delete mode 100644 Data/MySQL/include/Poco/Data/MySQL/Utility.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Binder.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Connector.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Error.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Extractor.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Handle.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/ODBC.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Parameter.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Preparator.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Unicode.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
 delete mode 100644 Data/ODBC/include/Poco/Data/ODBC/Utility.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQL.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h
 delete mode 100644 Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h
 delete mode 100644 Data/PostgreSQL/include/libpq/libpq-fs.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/Binder.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/Connector.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/Extractor.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/Notifier.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/SQLite.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
 delete mode 100644 Data/SQLite/include/Poco/Data/SQLite/Utility.h
 delete mode 100644 Data/include/Poco/Data/AbstractBinder.h
 delete mode 100644 Data/include/Poco/Data/AbstractBinding.h
 delete mode 100644 Data/include/Poco/Data/AbstractExtraction.h
 delete mode 100644 Data/include/Poco/Data/AbstractExtractor.h
 delete mode 100644 Data/include/Poco/Data/AbstractPreparation.h
 delete mode 100644 Data/include/Poco/Data/AbstractPreparator.h
 delete mode 100644 Data/include/Poco/Data/AbstractSessionImpl.h
 delete mode 100644 Data/include/Poco/Data/ArchiveStrategy.h
 delete mode 100644 Data/include/Poco/Data/AutoTransaction.h
 delete mode 100644 Data/include/Poco/Data/Binding.h
 delete mode 100644 Data/include/Poco/Data/Bulk.h
 delete mode 100644 Data/include/Poco/Data/BulkBinding.h
 delete mode 100644 Data/include/Poco/Data/BulkExtraction.h
 delete mode 100644 Data/include/Poco/Data/Column.h
 delete mode 100644 Data/include/Poco/Data/Connector.h
 delete mode 100644 Data/include/Poco/Data/Constants.h
 delete mode 100644 Data/include/Poco/Data/Data.h
 delete mode 100644 Data/include/Poco/Data/DataException.h
 delete mode 100644 Data/include/Poco/Data/Date.h
 delete mode 100644 Data/include/Poco/Data/DynamicDateTime.h
 delete mode 100644 Data/include/Poco/Data/DynamicLOB.h
 delete mode 100644 Data/include/Poco/Data/Extraction.h
 delete mode 100644 Data/include/Poco/Data/JSONRowFormatter.h
 delete mode 100644 Data/include/Poco/Data/LOB.h
 delete mode 100644 Data/include/Poco/Data/LOBStream.h
 delete mode 100644 Data/include/Poco/Data/Limit.h
 delete mode 100644 Data/include/Poco/Data/MetaColumn.h
 delete mode 100644 Data/include/Poco/Data/PooledSessionHolder.h
 delete mode 100644 Data/include/Poco/Data/PooledSessionImpl.h
 delete mode 100644 Data/include/Poco/Data/Position.h
 delete mode 100644 Data/include/Poco/Data/Preparation.h
 delete mode 100644 Data/include/Poco/Data/Range.h
 delete mode 100644 Data/include/Poco/Data/RecordSet.h
 delete mode 100644 Data/include/Poco/Data/Row.h
 delete mode 100644 Data/include/Poco/Data/RowFilter.h
 delete mode 100644 Data/include/Poco/Data/RowFormatter.h
 delete mode 100644 Data/include/Poco/Data/RowIterator.h
 delete mode 100644 Data/include/Poco/Data/SQLChannel.h
 delete mode 100644 Data/include/Poco/Data/Session.h
 delete mode 100644 Data/include/Poco/Data/SessionFactory.h
 delete mode 100644 Data/include/Poco/Data/SessionImpl.h
 delete mode 100644 Data/include/Poco/Data/SessionPool.h
 delete mode 100644 Data/include/Poco/Data/SessionPoolContainer.h
 delete mode 100644 Data/include/Poco/Data/SimpleRowFormatter.h
 delete mode 100644 Data/include/Poco/Data/Statement.h
 delete mode 100644 Data/include/Poco/Data/StatementCreator.h
 delete mode 100644 Data/include/Poco/Data/StatementImpl.h
 delete mode 100644 Data/include/Poco/Data/Time.h
 delete mode 100644 Data/include/Poco/Data/Transaction.h
 delete mode 100644 Data/include/Poco/Data/TypeHandler.h

diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
deleted file mode 100644
index 6a341396e..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Binder.h
-//
-// Forward header for the Binder class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/Binder.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
deleted file mode 100644
index ecb9ae7c8..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Connector.h
-//
-// Forward header for the Connector class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/Connector.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
deleted file mode 100644
index f986b9d5f..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Extractor.h
-//
-// Forward header for the Extractor class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/Extractor.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
deleted file mode 100644
index bc18863e6..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MySQL.h
-//
-// Forward header for the MySQL class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/MySQL.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
deleted file mode 100644
index 6bea36b36..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MySQLException.h
-//
-// Forward header for the MySQLException class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/MySQLException.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
deleted file mode 100644
index 7f749eb49..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MySQLStatementImpl.h
-//
-// Forward header for the MySQLStatementImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/MySQLStatementImpl.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
deleted file mode 100644
index 65bdd23b2..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ResultMetadata.h
-//
-// Forward header for the ResultMetadata class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/ResultMetadata.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
deleted file mode 100644
index 02cd0b4bb..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionHandle.h
-//
-// Forward header for the SessionHandle class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/SessionHandle.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
deleted file mode 100644
index 7cd063e60..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionImpl.h
-//
-// Forward header for the SessionImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/SessionImpl.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
deleted file mode 100644
index 920f97085..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// StatementExecutor.h
-//
-// Forward header for the StatementExecutor class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/StatementExecutor.h"
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
deleted file mode 100644
index 4114f9ddf..000000000
--- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Utility.h
-//
-// Forward header for the Utility class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/MySQL/Utility.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/Data/ODBC/include/Poco/Data/ODBC/Binder.h
deleted file mode 100644
index 2b4baa5e9..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Binder.h
-//
-// Forward header for the Binder class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Binder.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
deleted file mode 100644
index 3bd80e4b2..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ConnectionHandle.h
-//
-// Forward header for the ConnectionHandle class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/ConnectionHandle.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Connector.h b/Data/ODBC/include/Poco/Data/ODBC/Connector.h
deleted file mode 100644
index 7b7a9d0c6..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Connector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Connector.h
-//
-// Forward header for the Connector class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Connector.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
deleted file mode 100644
index a983e33ec..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Diagnostics.h
-//
-// Forward header for the Diagnostics class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Diagnostics.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h b/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
deleted file mode 100644
index 516553e53..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// EnvironmentHandle.h
-//
-// Forward header for the EnvironmentHandle class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/EnvironmentHandle.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Error.h b/Data/ODBC/include/Poco/Data/ODBC/Error.h
deleted file mode 100644
index 066247679..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Error.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Error.h
-//
-// Forward header for the Error class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Error.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
deleted file mode 100644
index 9a04106e1..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Extractor.h
-//
-// Forward header for the Extractor class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Extractor.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Handle.h b/Data/ODBC/include/Poco/Data/ODBC/Handle.h
deleted file mode 100644
index 2606f4da2..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Handle.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Handle.h
-//
-// Forward header for the Handle class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Handle.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
deleted file mode 100644
index ef1d8cb4f..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ODBC.h
-//
-// Forward header for the ODBC class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/ODBC.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
deleted file mode 100644
index b26ba7f67..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ODBCException.h
-//
-// Forward header for the ODBCException class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/ODBCException.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
deleted file mode 100644
index 93d00cc90..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ODBCMetaColumn.h
-//
-// Forward header for the ODBCMetaColumn class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/ODBCMetaColumn.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
deleted file mode 100644
index 8107157a5..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ODBCStatementImpl.h
-//
-// Forward header for the ODBCStatementImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/ODBCStatementImpl.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
deleted file mode 100644
index 0244f2f19..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Parameter.h
-//
-// Forward header for the Parameter class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Parameter.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
deleted file mode 100644
index d0a4b4f24..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Preparator.h
-//
-// Forward header for the Preparator class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Preparator.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
deleted file mode 100644
index 6545d96b9..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionImpl.h
-//
-// Forward header for the SessionImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/SessionImpl.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
deleted file mode 100644
index 8d90f979a..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// TypeInfo.h
-//
-// Forward header for the TypeInfo class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/TypeInfo.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
deleted file mode 100644
index 5f8394854..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Unicode.h
-//
-// Forward header for the Unicode class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Unicode.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
deleted file mode 100644
index 557e2ffb8..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Unicode_UNIXODBC.h
-//
-// Forward header for the Unicode_UNIXODBC class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Unicode_UNIXODBC.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
deleted file mode 100644
index 9fc3c4982..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Unicode_WIN32.h
-//
-// Forward header for the Unicode_WIN32 class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Unicode_WIN32.h"
diff --git a/Data/ODBC/include/Poco/Data/ODBC/Utility.h b/Data/ODBC/include/Poco/Data/ODBC/Utility.h
deleted file mode 100644
index 094e910b1..000000000
--- a/Data/ODBC/include/Poco/Data/ODBC/Utility.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Utility.h
-//
-// Forward header for the Utility class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/ODBC/Utility.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
deleted file mode 100644
index 3b3df6454..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Binder.h
-//
-// Forward header for the Binder class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/Binder.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h
deleted file mode 100644
index b13555dc0..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Connector.h
-//
-// Forward header for the Connector class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/Connector.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h
deleted file mode 100644
index a14a6f2da..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Extractor.h
-//
-// Forward header for the Extractor class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/Extractor.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQL.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQL.h
deleted file mode 100644
index 6a4a3b2c9..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQL.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// PostgreSQL.h
-//
-// Forward header for the PostgreSQL class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/PostgreSQL.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h
deleted file mode 100644
index a38a9bdcb..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// PostgreSQLException.h
-//
-// Forward header for the PostgreSQLException class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/PostgreSQLException.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h
deleted file mode 100644
index 0be59f499..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// PostgreSQLStatementImpl.h
-//
-// Forward header for the PostgreSQLStatementImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/PostgreSQLStatementImpl.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h
deleted file mode 100644
index a42def3d6..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// PostgreSQLTypes.h
-//
-// Forward header for the PostgreSQLTypes class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/PostgreSQLTypes.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h
deleted file mode 100644
index 85647eda1..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionHandle.h
-//
-// Forward header for the SessionHandle class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/SessionHandle.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h
deleted file mode 100644
index afad0685d..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionImpl.h
-//
-// Forward header for the SessionImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/SessionImpl.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h
deleted file mode 100644
index 73de7f92d..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// StatementExecutor.h
-//
-// Forward header for the StatementExecutor class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/StatementExecutor.h"
diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h
deleted file mode 100644
index 2ce743531..000000000
--- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Utility.h
-//
-// Forward header for the Utility class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/PostgreSQL/Utility.h"
diff --git a/Data/PostgreSQL/include/libpq/libpq-fs.h b/Data/PostgreSQL/include/libpq/libpq-fs.h
deleted file mode 100644
index d40342c13..000000000
--- a/Data/PostgreSQL/include/libpq/libpq-fs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * libpq-fs.h
- *	  definitions for using Inversion file system routines (ie, large objects)
- *
- *
- * Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/libpq/libpq-fs.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef LIBPQ_FS_H
-#define LIBPQ_FS_H
-
-/*
- *	Read/write mode flags for inversion (large object) calls
- */
-
-#define INV_WRITE		0x00020000
-#define INV_READ		0x00040000
-
-#endif   /* LIBPQ_FS_H */
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Binder.h b/Data/SQLite/include/Poco/Data/SQLite/Binder.h
deleted file mode 100644
index a977e855e..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/Binder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Binder.h
-//
-// Forward header for the Binder class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/Binder.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Connector.h b/Data/SQLite/include/Poco/Data/SQLite/Connector.h
deleted file mode 100644
index ad0d84631..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/Connector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Connector.h
-//
-// Forward header for the Connector class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/Connector.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h
deleted file mode 100644
index 71f0205fe..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Extractor.h
-//
-// Forward header for the Extractor class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/Extractor.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
deleted file mode 100644
index 42ca8a672..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Notifier.h
-//
-// Forward header for the Notifier class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/Notifier.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
deleted file mode 100644
index 67d9082cc..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SQLite.h
-//
-// Forward header for the SQLite class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/SQLite.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
deleted file mode 100644
index effce0197..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SQLiteException.h
-//
-// Forward header for the SQLiteException class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/SQLiteException.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
deleted file mode 100644
index faadfa7b9..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SQLiteStatementImpl.h
-//
-// Forward header for the SQLiteStatementImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/SQLiteStatementImpl.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
deleted file mode 100644
index a2b0f7d6f..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionImpl.h
-//
-// Forward header for the SessionImpl class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/SessionImpl.h"
diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h
deleted file mode 100644
index b63fc96fe..000000000
--- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Utility.h
-//
-// Forward header for the Utility class.
-//
-// Copyright (c) 2008, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#include "Poco/SQL/SQLite/Utility.h"
diff --git a/Data/include/Poco/Data/AbstractBinder.h b/Data/include/Poco/Data/AbstractBinder.h
deleted file mode 100644
index 7927c0196..000000000
--- a/Data/include/Poco/Data/AbstractBinder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractBinder.h
-//
-// Forward for the AbstractBinder class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractBinder.h"
diff --git a/Data/include/Poco/Data/AbstractBinding.h b/Data/include/Poco/Data/AbstractBinding.h
deleted file mode 100644
index a4f9ee60f..000000000
--- a/Data/include/Poco/Data/AbstractBinding.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractBinding.h
-//
-// Forward for the AbstractBinding class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractBinding.h"
diff --git a/Data/include/Poco/Data/AbstractExtraction.h b/Data/include/Poco/Data/AbstractExtraction.h
deleted file mode 100644
index 3ccc67199..000000000
--- a/Data/include/Poco/Data/AbstractExtraction.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractExtraction.h
-//
-// Forward for the AbstractExtraction class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractExtraction.h"
diff --git a/Data/include/Poco/Data/AbstractExtractor.h b/Data/include/Poco/Data/AbstractExtractor.h
deleted file mode 100644
index cddc608d0..000000000
--- a/Data/include/Poco/Data/AbstractExtractor.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractExtractor.h
-//
-// Forward for the AbstractExtractor class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractExtractor.h"
diff --git a/Data/include/Poco/Data/AbstractPreparation.h b/Data/include/Poco/Data/AbstractPreparation.h
deleted file mode 100644
index 4a171162e..000000000
--- a/Data/include/Poco/Data/AbstractPreparation.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractPreparation.h
-//
-// Forward for the AbstractPreparation class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractPreparation.h"
diff --git a/Data/include/Poco/Data/AbstractPreparator.h b/Data/include/Poco/Data/AbstractPreparator.h
deleted file mode 100644
index 82ce890a1..000000000
--- a/Data/include/Poco/Data/AbstractPreparator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractPreparatorImpl.h
-//
-// Forward for the AbstractPreparatorImpl class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractPreparatorImpl.h"
diff --git a/Data/include/Poco/Data/AbstractSessionImpl.h b/Data/include/Poco/Data/AbstractSessionImpl.h
deleted file mode 100644
index 7da857989..000000000
--- a/Data/include/Poco/Data/AbstractSessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AbstractSessionImpl.h
-//
-// Forward for the AbstractSessionImpl class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AbstractSessionImpl.h"
diff --git a/Data/include/Poco/Data/ArchiveStrategy.h b/Data/include/Poco/Data/ArchiveStrategy.h
deleted file mode 100644
index b3208b987..000000000
--- a/Data/include/Poco/Data/ArchiveStrategy.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ArchiveStrategy.h
-//
-// Forward for the ArchiveStrategy class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/ArchiveStrategy.h"
diff --git a/Data/include/Poco/Data/AutoTransaction.h b/Data/include/Poco/Data/AutoTransaction.h
deleted file mode 100644
index 8556c7a8b..000000000
--- a/Data/include/Poco/Data/AutoTransaction.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// AutoTransaction.h
-//
-// Forward for the AutoTransaction class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/AutoTransaction.h"
diff --git a/Data/include/Poco/Data/Binding.h b/Data/include/Poco/Data/Binding.h
deleted file mode 100644
index b779ffc5e..000000000
--- a/Data/include/Poco/Data/Binding.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Binding.h
-//
-// Forward for the Binding class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Binding.h"
diff --git a/Data/include/Poco/Data/Bulk.h b/Data/include/Poco/Data/Bulk.h
deleted file mode 100644
index 48c4984cc..000000000
--- a/Data/include/Poco/Data/Bulk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Bulk.h
-//
-// Forward for the Bulk class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Bulk.h"
diff --git a/Data/include/Poco/Data/BulkBinding.h b/Data/include/Poco/Data/BulkBinding.h
deleted file mode 100644
index a494ab2eb..000000000
--- a/Data/include/Poco/Data/BulkBinding.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// BulkBinding.h
-//
-// Forward for the BulkBinding class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/BulkBinding.h"
diff --git a/Data/include/Poco/Data/BulkExtraction.h b/Data/include/Poco/Data/BulkExtraction.h
deleted file mode 100644
index d1f3575c2..000000000
--- a/Data/include/Poco/Data/BulkExtraction.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// BulkExtraction.h
-//
-// Forward for the BulkExtraction class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/BulkExtraction.h"
diff --git a/Data/include/Poco/Data/Column.h b/Data/include/Poco/Data/Column.h
deleted file mode 100644
index 1bfdf6841..000000000
--- a/Data/include/Poco/Data/Column.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Column.h
-//
-// Forward for the Column class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Column.h"
diff --git a/Data/include/Poco/Data/Connector.h b/Data/include/Poco/Data/Connector.h
deleted file mode 100644
index 6c35b88a3..000000000
--- a/Data/include/Poco/Data/Connector.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Connector.h
-//
-// Forward for the Connector class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Connector.h"
diff --git a/Data/include/Poco/Data/Constants.h b/Data/include/Poco/Data/Constants.h
deleted file mode 100644
index c526479bf..000000000
--- a/Data/include/Poco/Data/Constants.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Constants.h
-//
-// Forward for the Constants class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Constants.h"
diff --git a/Data/include/Poco/Data/Data.h b/Data/include/Poco/Data/Data.h
deleted file mode 100644
index 60f458d7e..000000000
--- a/Data/include/Poco/Data/Data.h
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Data.h
-//
-// Forward for the Data class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-
-#ifndef Data_Data_INCLUDED
-#define Data_Data_INCLUDED
-
-#include "Poco/SQL/SQL.h"
-
-#define Data_API Poco_SQL_API
-
-namespace Poco {
-namespace SQL {}
-	namespace Data = SQL;
-} // namespace Poco
-
-#endif // Data_Data_INCLUDED
diff --git a/Data/include/Poco/Data/DataException.h b/Data/include/Poco/Data/DataException.h
deleted file mode 100644
index 7d923eb98..000000000
--- a/Data/include/Poco/Data/DataException.h
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// SQLException.h
-//
-// Forward for the SQLException class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SQLException.h"
-
-
-namespace Poco {
-namespace SQL {
-	typedef SQLException SQLException
-} } // namespace Poco::SQL
diff --git a/Data/include/Poco/Data/Date.h b/Data/include/Poco/Data/Date.h
deleted file mode 100644
index ff24d1d4c..000000000
--- a/Data/include/Poco/Data/Date.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Date.h
-//
-// Forward for the Date class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Date.h"
diff --git a/Data/include/Poco/Data/DynamicDateTime.h b/Data/include/Poco/Data/DynamicDateTime.h
deleted file mode 100644
index 288e62c6d..000000000
--- a/Data/include/Poco/Data/DynamicDateTime.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// DynamicDateTime.h
-//
-// Forward for the DynamicDateTime class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/DynamicDateTime.h"
diff --git a/Data/include/Poco/Data/DynamicLOB.h b/Data/include/Poco/Data/DynamicLOB.h
deleted file mode 100644
index 1c533066f..000000000
--- a/Data/include/Poco/Data/DynamicLOB.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// DynamicLOB.h
-//
-// Forward for the DynamicLOB class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/DynamicLOB.h"
diff --git a/Data/include/Poco/Data/Extraction.h b/Data/include/Poco/Data/Extraction.h
deleted file mode 100644
index 204cc429a..000000000
--- a/Data/include/Poco/Data/Extraction.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Extraction.h
-//
-// Forward for the Extraction class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Extraction.h"
diff --git a/Data/include/Poco/Data/JSONRowFormatter.h b/Data/include/Poco/Data/JSONRowFormatter.h
deleted file mode 100644
index 120037419..000000000
--- a/Data/include/Poco/Data/JSONRowFormatter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// JSONRowFormatter.h
-//
-// Forward for the JSONRowFormatter class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/JSONRowFormatter.h"
diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h
deleted file mode 100644
index dbd7e3bbb..000000000
--- a/Data/include/Poco/Data/LOB.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// LOB.h
-//
-// Forward for the LOB class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/LOB.h"
diff --git a/Data/include/Poco/Data/LOBStream.h b/Data/include/Poco/Data/LOBStream.h
deleted file mode 100644
index 18d57194a..000000000
--- a/Data/include/Poco/Data/LOBStream.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// LOBStream.h
-//
-// Forward for the LOBStream class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/LOBStream.h"
diff --git a/Data/include/Poco/Data/Limit.h b/Data/include/Poco/Data/Limit.h
deleted file mode 100644
index 99e835671..000000000
--- a/Data/include/Poco/Data/Limit.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Preparation.h
-//
-// Forward for the Preparation class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Preparation.h"
diff --git a/Data/include/Poco/Data/MetaColumn.h b/Data/include/Poco/Data/MetaColumn.h
deleted file mode 100644
index a383f3bd3..000000000
--- a/Data/include/Poco/Data/MetaColumn.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MetaColumn.h
-//
-// Forward for the MetaColumn class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/MetaColumn.h"
diff --git a/Data/include/Poco/Data/PooledSessionHolder.h b/Data/include/Poco/Data/PooledSessionHolder.h
deleted file mode 100644
index 0f9af5719..000000000
--- a/Data/include/Poco/Data/PooledSessionHolder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// PooledSessionHolder.h
-//
-// Forward for the PooledSessionHolder class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/PooledSessionHolder.h"
diff --git a/Data/include/Poco/Data/PooledSessionImpl.h b/Data/include/Poco/Data/PooledSessionImpl.h
deleted file mode 100644
index 3e21390e0..000000000
--- a/Data/include/Poco/Data/PooledSessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// PooledSessionImpl.h
-//
-// Forward for the PooledSessionImpl class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/PooledSessionImpl.h"
diff --git a/Data/include/Poco/Data/Position.h b/Data/include/Poco/Data/Position.h
deleted file mode 100644
index 7c2f4be28..000000000
--- a/Data/include/Poco/Data/Position.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Position.h
-//
-// Forward for the Position class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Position.h"
diff --git a/Data/include/Poco/Data/Preparation.h b/Data/include/Poco/Data/Preparation.h
deleted file mode 100644
index 99e835671..000000000
--- a/Data/include/Poco/Data/Preparation.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Preparation.h
-//
-// Forward for the Preparation class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Preparation.h"
diff --git a/Data/include/Poco/Data/Range.h b/Data/include/Poco/Data/Range.h
deleted file mode 100644
index 4b6088b97..000000000
--- a/Data/include/Poco/Data/Range.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Range.h
-//
-// Forward for the Range class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Range.h"
diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h
deleted file mode 100644
index 8fb4130d4..000000000
--- a/Data/include/Poco/Data/RecordSet.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// RecordSet.h
-//
-// Forward for the RecordSet class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/RecordSet.h"
diff --git a/Data/include/Poco/Data/Row.h b/Data/include/Poco/Data/Row.h
deleted file mode 100644
index 9725f06c9..000000000
--- a/Data/include/Poco/Data/Row.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Row.h
-//
-// Forward for the Row class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Row.h"
diff --git a/Data/include/Poco/Data/RowFilter.h b/Data/include/Poco/Data/RowFilter.h
deleted file mode 100644
index 30f927535..000000000
--- a/Data/include/Poco/Data/RowFilter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// RowFilter.h
-//
-// Forward for the RowFilter class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/RowFilter.h"
diff --git a/Data/include/Poco/Data/RowFormatter.h b/Data/include/Poco/Data/RowFormatter.h
deleted file mode 100644
index 19285a5be..000000000
--- a/Data/include/Poco/Data/RowFormatter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// RowFormatter.h
-//
-// Forward for the RowFormatter class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/RowFormatter.h"
diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h
deleted file mode 100644
index 79f1f76e7..000000000
--- a/Data/include/Poco/Data/RowIterator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// RowIterator.h
-//
-// Forward for the RowIterator class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/RowIterator.h"
diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h
deleted file mode 100644
index cc6a6df3b..000000000
--- a/Data/include/Poco/Data/SQLChannel.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SQLChannel.h
-//
-// Forward for the SQLChannel class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SQLChannel.h"
diff --git a/Data/include/Poco/Data/Session.h b/Data/include/Poco/Data/Session.h
deleted file mode 100644
index 893a569ce..000000000
--- a/Data/include/Poco/Data/Session.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Session.h
-//
-// Forward for the Session class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Session.h"
diff --git a/Data/include/Poco/Data/SessionFactory.h b/Data/include/Poco/Data/SessionFactory.h
deleted file mode 100644
index 00e81b044..000000000
--- a/Data/include/Poco/Data/SessionFactory.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionFactory.h
-//
-// Forward for the SessionFactory class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SessionFactory.h"
diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h
deleted file mode 100644
index 55481b4f9..000000000
--- a/Data/include/Poco/Data/SessionImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionImpl.h
-//
-// Forward for the SessionImpl class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SessionImpl.h"
diff --git a/Data/include/Poco/Data/SessionPool.h b/Data/include/Poco/Data/SessionPool.h
deleted file mode 100644
index 08d6c38ea..000000000
--- a/Data/include/Poco/Data/SessionPool.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionPool.h
-//
-// Forward for the SessionPool class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SessionPool.h"
diff --git a/Data/include/Poco/Data/SessionPoolContainer.h b/Data/include/Poco/Data/SessionPoolContainer.h
deleted file mode 100644
index f1c694d7b..000000000
--- a/Data/include/Poco/Data/SessionPoolContainer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SessionPoolContainer.h
-//
-// Forward for the SessionPoolContainer class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SessionPoolContainer.h"
diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h
deleted file mode 100644
index 3e4a7deeb..000000000
--- a/Data/include/Poco/Data/SimpleRowFormatter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// SimpleRowFormatter.h
-//
-// Forward for the SimpleRowFormatter class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/SimpleRowFormatter.h"
diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h
deleted file mode 100644
index 55e43f9dc..000000000
--- a/Data/include/Poco/Data/Statement.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Statement.h
-//
-// Forward for the Statement class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Statement.h"
diff --git a/Data/include/Poco/Data/StatementCreator.h b/Data/include/Poco/Data/StatementCreator.h
deleted file mode 100644
index 777652026..000000000
--- a/Data/include/Poco/Data/StatementCreator.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// StatementCreator.h
-//
-// Forward for the StatementCreator class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/StatementCreator.h"
diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h
deleted file mode 100644
index 3f7e89fce..000000000
--- a/Data/include/Poco/Data/StatementImpl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// StatementImpl.h
-//
-// Forward for the StatementImpl class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/StatementImpl.h"
diff --git a/Data/include/Poco/Data/Time.h b/Data/include/Poco/Data/Time.h
deleted file mode 100644
index e1bead985..000000000
--- a/Data/include/Poco/Data/Time.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Time.h
-//
-// Forward for the Time class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Time.h"
diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h
deleted file mode 100644
index 3b907d0cb..000000000
--- a/Data/include/Poco/Data/Transaction.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Transaction.h
-//
-// Forward for the Transaction class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/Transaction.h"
diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h
deleted file mode 100644
index 71dadcf13..000000000
--- a/Data/include/Poco/Data/TypeHandler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// TypeHandler.h
-//
-// Forward for the TypeHandler class header.
-//
-// Copyright (c) 2006, Applied Informatics Software Engineering GmbH.
-// and Contributors.
-//
-// SPDX-License-Identifier:	BSL-1.0
-//
-
-#include "Poco/Data/Data.h"
-#include "Poco/SQL/TypeHandler.h"