diff --git a/jOOQ/src/main/java/org/jooq/XMLTableColumnForOrdinalityStep.java b/jOOQ/src/main/java/org/jooq/XMLTableColumnForOrdinalityStep.java
index 1b782e7aa0..69c1fdf75a 100644
--- a/jOOQ/src/main/java/org/jooq/XMLTableColumnForOrdinalityStep.java
+++ b/jOOQ/src/main/java/org/jooq/XMLTableColumnForOrdinalityStep.java
@@ -37,15 +37,14 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * A step in the construction of an <code>XMLTABLE</code> expression.
  *
diff --git a/jOOQ/src/main/java/org/jooq/XMLTableColumnPathStep.java b/jOOQ/src/main/java/org/jooq/XMLTableColumnPathStep.java
index 49d48da394..dc91c30ba7 100644
--- a/jOOQ/src/main/java/org/jooq/XMLTableColumnPathStep.java
+++ b/jOOQ/src/main/java/org/jooq/XMLTableColumnPathStep.java
@@ -37,15 +37,14 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * A step in the construction of an <code>XMLTABLE</code> expression.
  *
diff --git a/jOOQ/src/main/java/org/jooq/XMLTableColumnsFirstStep.java b/jOOQ/src/main/java/org/jooq/XMLTableColumnsFirstStep.java
index 971bc79665..a9a105338e 100644
--- a/jOOQ/src/main/java/org/jooq/XMLTableColumnsFirstStep.java
+++ b/jOOQ/src/main/java/org/jooq/XMLTableColumnsFirstStep.java
@@ -37,15 +37,14 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * A step in the construction of an <code>XMLTABLE</code> expression.
  *
diff --git a/jOOQ/src/main/java/org/jooq/XMLTablePassingStep.java b/jOOQ/src/main/java/org/jooq/XMLTablePassingStep.java
index bacccc320c..7c6a31dd3b 100644
--- a/jOOQ/src/main/java/org/jooq/XMLTablePassingStep.java
+++ b/jOOQ/src/main/java/org/jooq/XMLTablePassingStep.java
@@ -37,15 +37,14 @@
  */
 package org.jooq;
 
-import org.jetbrains.annotations.*;
-
-
 // ...
 // ...
 // ...
 import static org.jooq.SQLDialect.POSTGRES;
 // ...
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * A step in the construction of an <code>XMLTABLE</code> expression.
  *
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 9a42f28021..a3b827a395 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -78,6 +78,7 @@ import static org.jooq.SQLDialect.POSTGRES;
 // ...
 // ...
 // ...
+// ...
 import static org.jooq.SQLDialect.SQLITE;
 // ...
 // ...