4 files changed, 6 insertions, 9 deletions
diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index cbf0faae..fa9528fc 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -1,4 +1,3 @@
-#include "mainwindow.h"
 #include <QAction>
 #include <QFileDialog>
 #include <QGridLayout>
@@ -9,6 +8,7 @@
 #include "fpgaviewwidget.h"
 #include "jsonparse.h"
 #include "log.h"
+#include "mainwindow.h"
 #include "pythontab.h"
 //#include "pack.h"
 //#include "pcf.h"
diff --git a/gui/basewindow.h b/gui/basewindow.h
index 52efd6b1..630e0f84 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -5,12 +5,11 @@
 #include "nextpnr.h"
 
 #include <QMainWindow>
-#include <QTabWidget>
 #include <QMenu>
 #include <QMenuBar>
-#include <QToolBar>
 #include <QStatusBar>
-
+#include <QTabWidget>
+#include <QToolBar>
 
 // FIXME
 USING_NEXTPNR_NAMESPACE
@@ -36,7 +35,7 @@ class BaseMainWindow : public QMainWindow
     Context *ctx;
     QTabWidget *tabWidget;
     InfoTab *info;
-    
+
     QMenuBar *menuBar;
     QToolBar *mainToolBar;
     QStatusBar *statusBar;
diff --git a/gui/dummy/mainwindow.cc b/gui/dummy/mainwindow.cc
index dad73d7e..a9420524 100644
--- a/gui/dummy/mainwindow.cc
+++ b/gui/dummy/mainwindow.cc
@@ -15,5 +15,4 @@ void MainWindow::createMenu()
 {
     QMenu *menu_Custom = new QMenu("&Dummy", menuBar);
     menuBar->addAction(menu_Custom->menuAction());
-
 }
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index 4f53c551..3744cdc7 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -1,14 +1,14 @@
 #include "mainwindow.h"
 #include <QAction>
 #include <QIcon>
+#include "bitstream.h"
+#include "design_utils.h"
 #include "jsonparse.h"
 #include "log.h"
 #include "pack.h"
 #include "pcf.h"
 #include "place_sa.h"
 #include "route.h"
-#include "bitstream.h"
-#include "design_utils.h"
 
 MainWindow::MainWindow(Context *_ctx, QWidget *parent)
         : BaseMainWindow(_ctx, parent)
@@ -25,5 +25,4 @@ void MainWindow::createMenu()
 {
     QMenu *menu_Custom = new QMenu("&ICE 40", menuBar);
     menuBar->addAction(menu_Custom->menuAction());
-
 }