Fix assembly includes