diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
index 91845a7070..579e75acfb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
@@ -1513,13 +1513,10 @@ public abstract class AbstractDatabase implements Database {
                  ||  (nullability == Nullability.NULL && !definedType.isNullable())))
                 continue forcedTypeLoop;
 
-            if (     (excludeExpression != null || includeExpression != null)
-                 &&  filterExcludeInclude(
-                         Collections.singletonList(definition),
-                         new String[] { excludeExpression },
-                         new String[] { includeExpression != null ? includeExpression : ".*" },
-                         getFilters()
-                     ).isEmpty())
+            if (excludeExpression != null && matches(patterns.pattern(excludeExpression), definition))
+                continue forcedTypeLoop;
+
+            if (includeExpression != null && !matches(patterns.pattern(includeExpression), definition))
                 continue forcedTypeLoop;
 
             if (    (definedType != null && (excludeTypes != null || includeTypes != null))