2 files changed, 3 insertions, 7 deletions
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index c4e568a3..6f0a9b97 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -29,8 +29,6 @@
 #include "log.h"
 #include "pack.h"
 #include "pcf.h"
-#include "place_sa.h"
-#include "route.h"
 
 static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 
@@ -444,4 +442,4 @@ void MainWindow::budget()
 
 void MainWindow::place() { Q_EMIT task->place(timing_driven); }
 
-NEXTPNR_NAMESPACE_END
-\ No newline at end of file
+NEXTPNR_NAMESPACE_END
diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc
index ab82b6bb..16f5fb89 100644
--- a/gui/ice40/worker.cc
+++ b/gui/ice40/worker.cc
@@ -25,8 +25,6 @@
 #include "log.h"
 #include "pack.h"
 #include "pcf.h"
-#include "place_sa.h"
-#include "route.h"
 #include "timing.h"
 
 NEXTPNR_NAMESPACE_BEGIN
@@ -124,7 +122,7 @@ void Worker::place(bool timing_driven)
     Q_EMIT taskStarted();
     try {
         ctx->timing_driven = timing_driven;
-        Q_EMIT place_finished(place_design_sa(ctx));
+        Q_EMIT place_finished(ctx->place());
     } catch (WorkerInterruptionRequested) {
         Q_EMIT taskCanceled();
     }
@@ -134,7 +132,7 @@ void Worker::route()
 {
     Q_EMIT taskStarted();
     try {
-        Q_EMIT route_finished(route_design(ctx));
+        Q_EMIT route_finished(ctx->route());
     } catch (WorkerInterruptionRequested) {
         Q_EMIT taskCanceled();
     }