diff --git a/java/ql/lib/semmle/code/java/Overlay.qll b/java/ql/lib/semmle/code/java/Overlay.qll
index f1cfc5c434f2..6df93d6ac671 100644
--- a/java/ql/lib/semmle/code/java/Overlay.qll
+++ b/java/ql/lib/semmle/code/java/Overlay.qll
@@ -81,3 +81,41 @@ private predicate discardReferableLocatable(@locatable el) {
     not drl.existsInOverlay()
   )
 }
+
+overlay[local]
+private predicate baseConfigLocatable(@configLocatable l) { not isOverlay() and exists(l) }
+
+overlay[local]
+private predicate overlayHasConfigLocatables() {
+  isOverlay() and
+  exists(@configLocatable el)
+}
+
+overlay[discard_entity]
+private predicate discardBaseConfigLocatable(@configLocatable el) {
+  // The properties extractor is currently not incremental, so if
+  // the overlay contains any config locatables, the overlay should
+  // contain a full extraction and all config locatables from base
+  // should be discarded.
+  baseConfigLocatable(el) and overlayHasConfigLocatables()
+}
+
+overlay[local]
+private predicate baseXmlLocatable(@xmllocatable l) {
+  not isOverlay() and not files(l, _) and not xmlNs(l, _, _, _)
+}
+
+overlay[local]
+private predicate overlayHasXmlLocatable() {
+  isOverlay() and
+  exists(@xmllocatable l | not files(l, _) and not xmlNs(l, _, _, _))
+}
+
+overlay[discard_entity]
+private predicate discardBaseXmlLocatable(@xmllocatable el) {
+  // The XML extractor is currently not incremental, so if
+  // the overlay contains any XML locatables, the overlay should
+  // contain a full extraction and all XML locatables from base
+  // should be discarded.
+  baseXmlLocatable(el) and overlayHasXmlLocatable()
+}