diff --git a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
index b94f6f253d..b2373203de 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDatabaseFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER DATABASE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterDatabaseFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java
index 888727a7b0..d9df87b3a1 100644
--- a/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterDomainFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER DOMAIN</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterDomainFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java
index 170a705585..e45f63ba85 100644
--- a/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterIndexFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER INDEX</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterIndexFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java
index fa3d8ef3a4..23c6d8cdcd 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSchemaFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER SCHEMA</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterSchemaFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java
index eb9cb51cfe..78d01b8c31 100644
--- a/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterSequenceFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER SEQUENCE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterSequenceFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java
index a9c4b2a9c2..baa017e71e 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTableFinalStep.java
@@ -60,8 +60,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface AlterTableFinalStep extends DDLQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java
index e6bf9383a9..644caa5143 100644
--- a/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterTypeFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER TYPE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterTypeFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java b/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java
index 98af4c90f9..178a79e242 100644
--- a/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/AlterViewFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>ALTER VIEW</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface AlterViewFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java b/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java
index f5df042376..764a0b28a1 100644
--- a/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CommentOnFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>COMMENT ON TABLE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface CommentOnFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java b/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java
index 35a6d07d8b..3b5aa8b813 100644
--- a/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/ConstraintFinalStep.java
@@ -59,8 +59,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface ConstraintFinalStep extends Constraint {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java
index af2a80eae1..9ec3058d13 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDatabaseFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>CREATE DATABASE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface CreateDatabaseFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java
index e94bdcadc7..a676166ebd 100644
--- a/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateDomainFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>CREATE DOMAIN</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface CreateDomainFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java
index b2d44830e7..edf53f761a 100644
--- a/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateIndexFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>CREATE INDEX</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface CreateIndexFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
index d0cd942cd7..ddb8fc8bb6 100644
--- a/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateSchemaFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>CREATE SCHEMA</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface CreateSchemaFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java
index fca0841317..cfa05e9624 100644
--- a/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateSequenceFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>CREATE SEQUENCE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface CreateSequenceFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
index 1302fb1762..29c375c795 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTableFinalStep.java
@@ -59,8 +59,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface CreateTableFinalStep extends DDLQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java
index 119301ecd5..ac1f6eac91 100644
--- a/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateTypeFinalStep.java
@@ -59,8 +59,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface CreateTypeFinalStep extends DDLQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java b/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java
index 6433745196..85580a9a96 100644
--- a/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/CreateViewFinalStep.java
@@ -59,8 +59,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface CreateViewFinalStep extends DDLQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
index 704db1625a..500089b2ca 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteFinalStep.java
@@ -68,8 +68,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface DeleteFinalStep<R extends Record> extends Delete<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java b/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java
index 3ba05ddf84..f601267f22 100644
--- a/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropDatabaseFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP DATABASE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropDatabaseFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java b/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java
index 0ab2372f87..99f569cb8d 100644
--- a/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropDomainFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP DOMAIN</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropDomainFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java b/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java
index 20cfe93fef..2e035de27a 100644
--- a/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropIndexFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP INDEX</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropIndexFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java b/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java
index bc61bec2af..aec44cd099 100644
--- a/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropSchemaFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP SCHEMA</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropSchemaFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java b/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java
index b1b8a42a9e..3004d8b3ad 100644
--- a/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropSequenceFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP SEQUENCE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropSequenceFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java b/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java
index 4ad1fc2118..9db0860c09 100644
--- a/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropTableFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP TABLE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropTableFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java b/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java
index f1a300458c..8d4c933846 100644
--- a/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropTypeFinalStep.java
@@ -59,8 +59,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface DropTypeFinalStep extends DDLQuery {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java b/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java
index 74e56a3cdc..1864fdc95e 100644
--- a/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/DropViewFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>DROP VIEW</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface DropViewFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/GrantFinalStep.java b/jOOQ/src/main/java/org/jooq/GrantFinalStep.java
index 6a49819a41..779e900666 100644
--- a/jOOQ/src/main/java/org/jooq/GrantFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/GrantFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>GRANT</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface GrantFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/InsertFinalStep.java b/jOOQ/src/main/java/org/jooq/InsertFinalStep.java
index c3fd341c97..6d9e1d6961 100644
--- a/jOOQ/src/main/java/org/jooq/InsertFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/InsertFinalStep.java
@@ -71,8 +71,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface InsertFinalStep<R extends Record> extends Insert<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
index f7d75cdf64..16c6f679e1 100644
--- a/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeFinalStep.java
@@ -74,8 +74,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface MergeFinalStep<R extends Record> extends Merge<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java b/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java
index 1a31805415..87d4f79109 100644
--- a/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/RevokeFinalStep.java
@@ -46,6 +46,8 @@ import org.jetbrains.annotations.*;
 /**
  * A step in the construction of the <code>REVOKE</code> statement.
  * <p>
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
+ * <p>
  * <h3>Referencing <code>XYZ*Step</code> types directly from client code</h3>
  * <p>
  * It is usually not recommended to reference any <code>XYZ*Step</code> types
@@ -65,5 +67,6 @@ import org.jetbrains.annotations.*;
  * </ul>
  */
 @SuppressWarnings({ "unused" })
+@Deprecated
 public interface RevokeFinalStep extends DDLQuery {
 }
diff --git a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
index 7b6b1c312a..a7be1b230f 100644
--- a/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/TruncateFinalStep.java
@@ -63,7 +63,10 @@ import org.jetbrains.annotations.*;
  * <li>They're less readable</li>
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
+ *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  */
+@Deprecated
 @SuppressWarnings({ "unused" })
 public interface TruncateFinalStep<R extends Record> extends Truncate<R> {
 }
diff --git a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
index 42187eddd7..9f19f9561d 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateFinalStep.java
@@ -70,8 +70,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface UpdateFinalStep<R extends Record> extends Update<R> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/WindowFinalStep.java b/jOOQ/src/main/java/org/jooq/WindowFinalStep.java
index ccc6b38dce..3e8861751f 100644
--- a/jOOQ/src/main/java/org/jooq/WindowFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowFinalStep.java
@@ -55,9 +55,11 @@ package org.jooq;
  * Note, that the functionality provided by this interface is not supported in
  * {@link SQLDialect#SQLSERVER}
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @param <T> The function return type
  * @author Lukas Eder
  */
+@Deprecated
 public interface WindowFinalStep<T> extends Field<T> {
 
 }
diff --git a/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java b/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java
index 071bcca02f..b70730deac 100644
--- a/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java
+++ b/jOOQ/src/main/java/org/jooq/WindowSpecificationFinalStep.java
@@ -67,8 +67,10 @@ package org.jooq;
  * <li>They might have binary incompatible changes between minor releases</li>
  * </ul>
  *
+ * @deprecated - [#11329] - 3.15.0 - This type will be removed in the future. Do not reference it directly
  * @author Lukas Eder
  */
+@Deprecated
 public interface WindowSpecificationFinalStep extends WindowSpecification {
 
 }