diff --git a/gui/infotab.cc b/gui/infotab.cc
index 9a523d4f..0bf43b90 100644
--- a/gui/infotab.cc
+++ b/gui/infotab.cc
@@ -17,4 +17,3 @@ void InfoTab::info(std::string str)
     plainTextEdit->insertPlainText(str.c_str());
     plainTextEdit->moveCursor(QTextCursor::End);
 }
-
diff --git a/gui/infotab.h b/gui/infotab.h
index bf673ee6..e3c58ba5 100644
--- a/gui/infotab.h
+++ b/gui/infotab.h
@@ -1,8 +1,8 @@
 #ifndef INFOTAB_H
 #define INFOTAB_H
 
-#include "nextpnr.h"
 #include <QPlainTextEdit>
+#include "nextpnr.h"
 
 // FIXME
 USING_NEXTPNR_NAMESPACE
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index f0818be4..3260da14 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -2,12 +2,12 @@
 #define MAINWINDOW_H
 
 #include "emb.h"
+#include "infotab.h"
 #include "nextpnr.h"
+#include "pythontab.h"
 #include "qtpropertymanager.h"
 #include "qttreepropertybrowser.h"
 #include "qtvariantproperty.h"
-#include "pythontab.h"
-#include "infotab.h"
 
 #include <QMainWindow>
 #include <QPlainTextEdit>
diff --git a/gui/pythontab.cc b/gui/pythontab.cc
index 8f620958..1e827330 100644
--- a/gui/pythontab.cc
+++ b/gui/pythontab.cc
@@ -1,7 +1,7 @@
 #include "pythontab.h"
+#include <QGridLayout>
 #include "emb.h"
 #include "pybindings.h"
-#include <QGridLayout>
 
 PythonTab::PythonTab(QWidget *parent) : QWidget(parent)
 {
diff --git a/gui/pythontab.h b/gui/pythontab.h
index f6cffcf3..4290d277 100644
--- a/gui/pythontab.h
+++ b/gui/pythontab.h
@@ -1,10 +1,10 @@
 #ifndef PYTHONTAB_H
 #define PYTHONTAB_H
 
-#include "nextpnr.h"
-#include "emb.h"
 #include <QLineEdit>
 #include <QPlainTextEdit>
+#include "emb.h"
+#include "nextpnr.h"
 
 // FIXME
 USING_NEXTPNR_NAMESPACE