diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
index 4f9d59f26e..bb8302a02d 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/AbstractGenerator.java
@@ -68,6 +68,8 @@ abstract class AbstractGenerator implements Generator {
     boolean                            generateJPAAnnotations           = false;
     boolean                            generateValidationAnnotations    = false;
     boolean                            generateSpringAnnotations        = false;
+    boolean                            generateQueues                   = true;
+    boolean                            generateLinks                    = true;
     boolean                            generateGlobalObjectReferences   = true;
     boolean                            generateGlobalCatalogReferences  = true;
     boolean                            generateGlobalSchemaReferences   = true;
@@ -75,6 +77,8 @@ abstract class AbstractGenerator implements Generator {
     boolean                            generateGlobalSequenceReferences = true;
     boolean                            generateGlobalTableReferences    = true;
     boolean                            generateGlobalUDTReferences      = true;
+    boolean                            generateGlobalQueueReferences    = true;
+    boolean                            generateGlobalLinkReferences     = true;
     boolean                            fluentSetters                    = false;
     String                             generateFullyQualifiedTypes      = "";
     boolean                            generateTableValuedFunctions     = true;
@@ -330,6 +334,46 @@ abstract class AbstractGenerator implements Generator {
         this.generateGlobalUDTReferences = generateGlobalUDTReferences;
     }
 
+    @Override
+    public boolean generateGlobalQueueReferences() {
+        return generateQueues && generateGlobalQueueReferences;
+    }
+
+    @Override
+    public void setGenerateGlobalQueueReferences(boolean globalQueueReferences) {
+        this.generateGlobalQueueReferences = globalQueueReferences;
+    }
+
+    @Override
+    public boolean generateGlobalLinkReferences() {
+        return generateLinks && generateGlobalLinkReferences;
+    }
+
+    @Override
+    public void setGenerateGlobalLinkReferences(boolean globalLinkReferences) {
+        this.generateGlobalLinkReferences = globalLinkReferences;
+    }
+
+    @Override
+    public boolean generateQueues() {
+        return generateQueues;
+    }
+
+    @Override
+    public void setGenerateQueues(boolean queues) {
+        this.generateQueues = queues;
+    }
+
+    @Override
+    public boolean generateLinks() {
+        return generateLinks;
+    }
+
+    @Override
+    public void setGenerateLinks(boolean links) {
+        this.generateLinks = links;
+    }
+
     @Override
     public boolean fluentSetters() {
         return fluentSetters;
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index c75578e6b9..3279c8b5e5 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -71,16 +71,14 @@ import org.jooq.Constants;
 import org.jooq.tools.JooqLogger;
 import org.jooq.tools.StringUtils;
 import org.jooq.tools.jdbc.JDBCUtils;
-import org.jooq.util.jaxb.Configuration;
 import org.jooq.util.jaxb.Generate;
 import org.jooq.util.jaxb.Jdbc;
 import org.jooq.util.jaxb.Matchers;
-import org.jooq.util.jaxb.Property;
-import org.jooq.util.jaxb.Schema;
 import org.jooq.util.jaxb.Strategy;
-import org.jooq.util.jaxb.Target;
 // ...
 
+import sun.rmi.transport.Target;
+
 /**
  * The GenerationTool takes care of generating Java code from a database schema.
  * <p>
@@ -439,6 +437,12 @@ public class GenerationTool {
                 generator.setGenerateValidationAnnotations(g.getGenerate().isValidationAnnotations());
             if (g.getGenerate().isSpringAnnotations() != null)
                 generator.setGenerateSpringAnnotations(g.getGenerate().isSpringAnnotations());
+            if (g.getGenerate().isQueues() != null)
+                generator.setGenerateQueues(g.getGenerate().isQueues());
+            if (g.getGenerate().isLinks() != null)
+                generator.setGenerateLinks(g.getGenerate().isLinks());
+            if (g.getGenerate().isGlobalLinkReferences() != null)
+                generator.setGenerateGlobalLinkReferences(g.getGenerate().isGlobalLinkReferences());
             if (g.getGenerate().isGlobalObjectReferences() != null)
                 generator.setGenerateGlobalObjectReferences(g.getGenerate().isGlobalObjectReferences());
             if (g.getGenerate().isGlobalCatalogReferences() != null)
@@ -453,6 +457,10 @@ public class GenerationTool {
                 generator.setGenerateGlobalTableReferences(g.getGenerate().isGlobalTableReferences());
             if (g.getGenerate().isGlobalUDTReferences() != null)
                 generator.setGenerateGlobalUDTReferences(g.getGenerate().isGlobalUDTReferences());
+            if (g.getGenerate().isGlobalQueueReferences() != null)
+                generator.setGenerateGlobalQueueReferences(g.getGenerate().isGlobalQueueReferences());
+            if (g.getGenerate().isGlobalLinkReferences() != null)
+                generator.setGenerateGlobalLinkReferences(g.getGenerate().isGlobalLinkReferences());
             if (g.getGenerate().isFluentSetters() != null)
                 generator.setFluentSetters(g.getGenerate().isFluentSetters());
             if (g.getGenerate().isPojosEqualsAndHashCode() != null)
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
index 375718dab0..dfb6c9144e 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
@@ -276,6 +276,46 @@ public interface Generator {
      */
     void setGenerateGlobalUDTReferences(boolean globalUDTReferences);
 
+    /**
+     * Whether global queue references should be generated
+     */
+    boolean generateGlobalQueueReferences();
+
+    /**
+     * Whether global queue references should be generated
+     */
+    void setGenerateGlobalQueueReferences(boolean globalQueueReferences);
+
+    /**
+     * Whether global link references should be generated
+     */
+    boolean generateGlobalLinkReferences();
+
+    /**
+     * Whether global link references should be generated
+     */
+    void setGenerateGlobalLinkReferences(boolean globalLinkReferences);
+
+    /**
+     * Whether queue related code should be generated
+     */
+    boolean generateQueues();
+
+    /**
+     * Whether queue related code should be generated
+     */
+    void setGenerateQueues(boolean queues);
+
+    /**
+     * Whether link related code should be generated
+     */
+    boolean generateLinks();
+
+    /**
+     * Whether link related code should be generated
+     */
+    void setGenerateLinks(boolean links);
+
     /**
      * Whether fluent setters should be generated
      */
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd
index 8962b190b0..58a3a138e8 100644
--- a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.8.0.xsd
@@ -794,6 +794,26 @@
         -->
       <element name="globalRoutineReferences" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
 
+      <!--
+        Allow to turn off the generation of global queue references in Queues.java
+        -->
+      <element name="globalQueueReferences" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Allow to turn off the generation of global link references in Links.java
+        -->
+      <element name="globalLinkReferences" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Allow to turn off the generation of queue related code
+        -->
+      <element name="queues" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Allow to turn off the generation of link related code
+        -->
+      <element name="links" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
       <!--
         Generate fluent setters in