diff --git a/src/overlapping/generic.jl b/src/overlapping/generic.jl
index 433437f803ee2ee4275c99c0c794b6ee5297e514..ce5f406bb6971c93bf86a4d7842a7e437b329a06 100644
--- a/src/overlapping/generic.jl
+++ b/src/overlapping/generic.jl
@@ -5,7 +5,7 @@ import ...Wait: WaitBlock
 import ...Readouts: InstantReadout
 import ...Pulses: RFPulseBlock
 import ...Gradients: GradientBlock
-import ...Scanners: scanner_constraints!
+import ...BuildingBlocks: scanner_constraints!
 
 """
     GenericWaveform(duration, waveform, interruptions)
diff --git a/src/overlapping/trapezoid_gradients.jl b/src/overlapping/trapezoid_gradients.jl
index 5f86100ce0cb24a9e7d4a294ce8f39ac6d5d5600..9a2fd47e91e34bf7a192cb5d5703e9a74014436a 100644
--- a/src/overlapping/trapezoid_gradients.jl
+++ b/src/overlapping/trapezoid_gradients.jl
@@ -7,10 +7,9 @@ import JuMP: @constraint, @variable, VariableRef, value
 import StaticArrays: SVector
 import LinearAlgebra: norm
 import ...Variables: qvec, rise_time, flat_time, slew_rate, gradient_strength, variables, duration, δ, get_free_variable, VariableType, inverse_slice_thickness, inverse_bandwidth, effective_time
-import ...BuildingBlocks: duration, set_simple_constraints!, fixed, RFPulseBlock
+import ...BuildingBlocks: duration, set_simple_constraints!, fixed, RFPulseBlock, scanner_constraints!
 import ...BuildSequences: global_model
 import ...Gradients: ChangingGradientBlock, ConstantGradientBlock
-import ...Scanners: scanner_constraints!
 import ..Abstract: interruptions, waveform, AbstractOverlapping