diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
new file mode 100644
index 000000000..6a341396e
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..ecb9ae7c8
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..f986b9d5f
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..bc18863e6
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..6bea36b36
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..7f749eb49
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..65bdd23b2
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..02cd0b4bb
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..7cd063e60
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..920f97085
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..4114f9ddf
--- /dev/null
+++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..2b4baa5e9
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3bd80e4b2
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..7b7a9d0c6
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Connector.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a983e33ec
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..516553e53
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..066247679
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Error.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..9a04106e1
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..2606f4da2
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Handle.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..ef1d8cb4f
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..b26ba7f67
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..93d00cc90
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..8107157a5
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..0244f2f19
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..d0a4b4f24
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..6545d96b9
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..8d90f979a
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..5f8394854
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..557e2ffb8
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..9fc3c4982
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..094e910b1
--- /dev/null
+++ b/Data/ODBC/include/Poco/Data/ODBC/Utility.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3b3df6454
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..b13555dc0
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a14a6f2da
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..6a4a3b2c9
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQL.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a38a9bdcb
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..0be59f499
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a42def3d6
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..85647eda1
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..afad0685d
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..73de7f92d
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..2ce743531
--- /dev/null
+++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..d40342c13
--- /dev/null
+++ b/Data/PostgreSQL/include/libpq/libpq-fs.h
@@ -0,0 +1,24 @@
+/*-------------------------------------------------------------------------
+ *
+ * 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
new file mode 100644
index 000000000..a977e855e
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/Binder.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..ad0d84631
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/Connector.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..71f0205fe
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..42ca8a672
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..67d9082cc
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLite.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..effce0197
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..faadfa7b9
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a2b0f7d6f
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..b63fc96fe
--- /dev/null
+++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..7927c0196
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractBinder.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a4f9ee60f
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractBinding.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3ccc67199
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractExtraction.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..cddc608d0
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractExtractor.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..4a171162e
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractPreparation.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..82ce890a1
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractPreparator.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..7da857989
--- /dev/null
+++ b/Data/include/Poco/Data/AbstractSessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..b3208b987
--- /dev/null
+++ b/Data/include/Poco/Data/ArchiveStrategy.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..8556c7a8b
--- /dev/null
+++ b/Data/include/Poco/Data/AutoTransaction.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..b779ffc5e
--- /dev/null
+++ b/Data/include/Poco/Data/Binding.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..48c4984cc
--- /dev/null
+++ b/Data/include/Poco/Data/Bulk.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a494ab2eb
--- /dev/null
+++ b/Data/include/Poco/Data/BulkBinding.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..d1f3575c2
--- /dev/null
+++ b/Data/include/Poco/Data/BulkExtraction.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..1bfdf6841
--- /dev/null
+++ b/Data/include/Poco/Data/Column.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..6c35b88a3
--- /dev/null
+++ b/Data/include/Poco/Data/Connector.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..c526479bf
--- /dev/null
+++ b/Data/include/Poco/Data/Constants.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..60f458d7e
--- /dev/null
+++ b/Data/include/Poco/Data/Data.h
@@ -0,0 +1,25 @@
+//
+// 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
new file mode 100644
index 000000000..7d923eb98
--- /dev/null
+++ b/Data/include/Poco/Data/DataException.h
@@ -0,0 +1,19 @@
+//
+// 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
new file mode 100644
index 000000000..ff24d1d4c
--- /dev/null
+++ b/Data/include/Poco/Data/Date.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..288e62c6d
--- /dev/null
+++ b/Data/include/Poco/Data/DynamicDateTime.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..1c533066f
--- /dev/null
+++ b/Data/include/Poco/Data/DynamicLOB.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..204cc429a
--- /dev/null
+++ b/Data/include/Poco/Data/Extraction.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..120037419
--- /dev/null
+++ b/Data/include/Poco/Data/JSONRowFormatter.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..dbd7e3bbb
--- /dev/null
+++ b/Data/include/Poco/Data/LOB.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..18d57194a
--- /dev/null
+++ b/Data/include/Poco/Data/LOBStream.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..99e835671
--- /dev/null
+++ b/Data/include/Poco/Data/Limit.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..a383f3bd3
--- /dev/null
+++ b/Data/include/Poco/Data/MetaColumn.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..0f9af5719
--- /dev/null
+++ b/Data/include/Poco/Data/PooledSessionHolder.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3e21390e0
--- /dev/null
+++ b/Data/include/Poco/Data/PooledSessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..7c2f4be28
--- /dev/null
+++ b/Data/include/Poco/Data/Position.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..99e835671
--- /dev/null
+++ b/Data/include/Poco/Data/Preparation.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..4b6088b97
--- /dev/null
+++ b/Data/include/Poco/Data/Range.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..8fb4130d4
--- /dev/null
+++ b/Data/include/Poco/Data/RecordSet.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..9725f06c9
--- /dev/null
+++ b/Data/include/Poco/Data/Row.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..30f927535
--- /dev/null
+++ b/Data/include/Poco/Data/RowFilter.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..19285a5be
--- /dev/null
+++ b/Data/include/Poco/Data/RowFormatter.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..79f1f76e7
--- /dev/null
+++ b/Data/include/Poco/Data/RowIterator.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..cc6a6df3b
--- /dev/null
+++ b/Data/include/Poco/Data/SQLChannel.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..893a569ce
--- /dev/null
+++ b/Data/include/Poco/Data/Session.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..00e81b044
--- /dev/null
+++ b/Data/include/Poco/Data/SessionFactory.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..55481b4f9
--- /dev/null
+++ b/Data/include/Poco/Data/SessionImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..08d6c38ea
--- /dev/null
+++ b/Data/include/Poco/Data/SessionPool.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..f1c694d7b
--- /dev/null
+++ b/Data/include/Poco/Data/SessionPoolContainer.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3e4a7deeb
--- /dev/null
+++ b/Data/include/Poco/Data/SimpleRowFormatter.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..55e43f9dc
--- /dev/null
+++ b/Data/include/Poco/Data/Statement.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..777652026
--- /dev/null
+++ b/Data/include/Poco/Data/StatementCreator.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3f7e89fce
--- /dev/null
+++ b/Data/include/Poco/Data/StatementImpl.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..e1bead985
--- /dev/null
+++ b/Data/include/Poco/Data/Time.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..3b907d0cb
--- /dev/null
+++ b/Data/include/Poco/Data/Transaction.h
@@ -0,0 +1,13 @@
+//
+// 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
new file mode 100644
index 000000000..71dadcf13
--- /dev/null
+++ b/Data/include/Poco/Data/TypeHandler.h
@@ -0,0 +1,13 @@
+//
+// 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"