From aca9aa834c742ba70f49d1ac3eb2d1e02e759416 Mon Sep 17 00:00:00 2001
From: Uwe Hermann <uwe@hermann-uwe.de>
Date: Tue, 28 Mar 2017 08:30:43 +0200
Subject: [PATCH] Use alphabetical order for #includes.

This patch was generated using clang-tidy:

  clang-tidy -checks="-*,llvm-include-order" -fix
---
 android/assetreader.cpp          |  5 ++++-
 pv/binding/binding.hpp           |  2 +-
 pv/binding/decoder.cpp           |  2 +-
 pv/data/analogsegment.cpp        |  4 ++--
 pv/data/decoderstack.cpp         |  4 ++--
 pv/data/logicsegment.cpp         |  4 ++--
 pv/data/segment.hpp              |  2 +-
 pv/data/signalbase.cpp           |  4 ++--
 pv/devicemanager.cpp             |  2 +-
 pv/dialogs/connect.cpp           |  2 +-
 pv/dialogs/connect.hpp           |  2 +-
 pv/mainwindow.cpp                | 12 ++++++------
 pv/mainwindow.hpp                |  4 ++--
 pv/prop/int.cpp                  |  2 +-
 pv/prop/property.hpp             |  1 +
 pv/session.cpp                   |  4 ++--
 pv/storesession.cpp              |  4 ++--
 pv/storesession.hpp              |  2 +-
 pv/strnatcmp.hpp                 |  2 +-
 pv/toolbars/mainbar.cpp          |  2 +-
 pv/util.cpp                      |  4 ++--
 pv/view/analogsignal.cpp         |  4 ++--
 pv/view/cursor.cpp               |  2 +-
 pv/view/cursorpair.cpp           |  4 ++--
 pv/view/decodetrace.cpp          |  8 ++++----
 pv/view/decodetrace.hpp          |  2 +-
 pv/view/header.cpp               |  2 +-
 pv/view/logicsignal.cpp          |  8 ++++----
 pv/view/timemarker.cpp           |  4 ++--
 pv/view/tracegroup.cpp           |  2 +-
 pv/view/tracetreeitemowner.cpp   |  2 +-
 pv/view/view.cpp                 |  8 ++++----
 pv/view/view.hpp                 |  2 +-
 pv/view/viewitemowner.cpp        |  2 +-
 pv/view/viewport.cpp             |  2 +-
 pv/widgets/popup.cpp             |  2 +-
 pv/widgets/sweeptimingwidget.cpp |  2 +-
 pv/widgets/wellarray.cpp         |  2 +-
 test/test.cpp                    |  2 +-
 test/view/ruler.cpp              |  2 +-
 40 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/android/assetreader.cpp b/android/assetreader.cpp
index 05160d6e..71aafae5 100644
--- a/android/assetreader.cpp
+++ b/android/assetreader.cpp
@@ -18,12 +18,15 @@
  */
 
 #include "assetreader.hpp"
-#include <libsigrok/libsigrok.h>
+
 #include <memory>
+
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
 #include <QtCore/QStandardPaths>
 
+#include <libsigrok/libsigrok.h>
+
 using namespace pv;
 
 using std::string;
diff --git a/pv/binding/binding.hpp b/pv/binding/binding.hpp
index c4b1e9dd..e672ff17 100644
--- a/pv/binding/binding.hpp
+++ b/pv/binding/binding.hpp
@@ -26,8 +26,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 #include <glibmm.h>
 G_GNUC_END_IGNORE_DEPRECATIONS
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <QString>
 
diff --git a/pv/binding/decoder.cpp b/pv/binding/decoder.cpp
index 39bff52b..b2b4e4f7 100644
--- a/pv/binding/decoder.cpp
+++ b/pv/binding/decoder.cpp
@@ -23,8 +23,8 @@
 
 #include <boost/none_t.hpp>
 
-#include <pv/data/decoderstack.hpp>
 #include <pv/data/decode/decoder.hpp>
+#include <pv/data/decoderstack.hpp>
 #include <pv/prop/double.hpp>
 #include <pv/prop/enum.hpp>
 #include <pv/prop/int.hpp>
diff --git a/pv/data/analogsegment.cpp b/pv/data/analogsegment.cpp
index fb34cffc..1bd33876 100644
--- a/pv/data/analogsegment.cpp
+++ b/pv/data/analogsegment.cpp
@@ -20,9 +20,9 @@
 #include <extdef.h>
 
 #include <cassert>
-#include <cstring>
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include <algorithm>
 
diff --git a/pv/data/decoderstack.cpp b/pv/data/decoderstack.cpp
index 8fc32423..561e229d 100644
--- a/pv/data/decoderstack.cpp
+++ b/pv/data/decoderstack.cpp
@@ -25,10 +25,10 @@
 
 #include "decoderstack.hpp"
 
+#include <pv/data/decode/annotation.hpp>
+#include <pv/data/decode/decoder.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
-#include <pv/data/decode/decoder.hpp>
-#include <pv/data/decode/annotation.hpp>
 #include <pv/session.hpp>
 #include <pv/view/logicsignal.hpp>
 
diff --git a/pv/data/logicsegment.cpp b/pv/data/logicsegment.cpp
index cbaf54a4..b648f5d1 100644
--- a/pv/data/logicsegment.cpp
+++ b/pv/data/logicsegment.cpp
@@ -20,9 +20,9 @@
 #include <extdef.h>
 
 #include <cassert>
-#include <cstring>
-#include <cstdlib>
 #include <cmath>
+#include <cstdlib>
+#include <cstring>
 
 #include "logic.hpp"
 #include "logicsegment.hpp"
diff --git a/pv/data/segment.hpp b/pv/data/segment.hpp
index 0cc7e6f8..3305f4c8 100644
--- a/pv/data/segment.hpp
+++ b/pv/data/segment.hpp
@@ -23,8 +23,8 @@
 
 #include "pv/util.hpp"
 
-#include <thread>
 #include <mutex>
+#include <thread>
 #include <vector>
 
 using std::recursive_mutex;
diff --git a/pv/data/signalbase.cpp b/pv/data/signalbase.cpp
index 9894fdb4..6bcacd73 100644
--- a/pv/data/signalbase.cpp
+++ b/pv/data/signalbase.cpp
@@ -20,14 +20,14 @@
 
 #include "analog.hpp"
 #include "analogsegment.hpp"
+#include "decode/row.hpp"
 #include "logic.hpp"
 #include "logicsegment.hpp"
 #include "signalbase.hpp"
 #include "signaldata.hpp"
-#include "decode/row.hpp"
 
-#include <pv/session.hpp>
 #include <pv/binding/decoder.hpp>
+#include <pv/session.hpp>
 
 using std::dynamic_pointer_cast;
 using std::make_shared;
diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 883175c7..a51148b1 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -22,8 +22,8 @@
 
 #include <cassert>
 #include <functional>
-#include <stdexcept>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
diff --git a/pv/dialogs/connect.cpp b/pv/dialogs/connect.cpp
index 7a680cf7..911956af 100644
--- a/pv/dialogs/connect.cpp
+++ b/pv/dialogs/connect.cpp
@@ -21,8 +21,8 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-#include <QLabel>
 #include <QGroupBox>
+#include <QLabel>
 #include <QRadioButton>
 
 #include "connect.hpp"
diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index b35f5899..d9cf0a53 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -29,9 +29,9 @@
 #include <QFormLayout>
 #include <QHBoxLayout>
 #include <QLineEdit>
-#include <QSpinBox>
 #include <QListWidget>
 #include <QPushButton>
+#include <QSpinBox>
 #include <QVBoxLayout>
 
 using std::shared_ptr;
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7e48e5a9..5c399e43 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -21,11 +21,11 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
-#include <cassert>
 #include <algorithm>
-#include <iterator>
-#include <cstdint>
+#include <cassert>
 #include <cstdarg>
+#include <cstdint>
+#include <iterator>
 
 #include <QAction>
 #include <QApplication>
@@ -34,17 +34,17 @@
 #include <QHBoxLayout>
 #include <QMessageBox>
 #include <QSettings>
-#include <QWidget>
 #include <QShortcut>
+#include <QWidget>
 
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
-#include "globalsettings.hpp"
-#include "util.hpp"
 #include "devices/hardwaredevice.hpp"
 #include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
 #include "toolbars/mainbar.hpp"
+#include "util.hpp"
 #include "view/view.hpp"
 #include "views/trace/standardbar.hpp"
 
diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index e3e98e36..a0a6d337 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,10 +25,10 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QShortcut>
 #include <QSignalMapper>
-#include <QToolButton>
 #include <QTabWidget>
-#include <QShortcut>
+#include <QToolButton>
 
 #include "session.hpp"
 #include "views/viewbase.hpp"
diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index 415ee866..f53d0966 100644
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <cstdint>
 #include <cassert>
+#include <cstdint>
 
 #include <QSpinBox>
 
diff --git a/pv/prop/property.hpp b/pv/prop/property.hpp
index 7e547dec..765cbb50 100644
--- a/pv/prop/property.hpp
+++ b/pv/prop/property.hpp
@@ -27,6 +27,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 G_GNUC_END_IGNORE_DEPRECATIONS
 
 #include <functional>
+
 #include <QString>
 #include <QWidget>
 
diff --git a/pv/session.cpp b/pv/session.cpp
index d00ff97a..d7041d8b 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -31,16 +31,16 @@
 
 #include <sys/stat.h>
 
-#include "session.hpp"
 #include "devicemanager.hpp"
+#include "session.hpp"
 
 #include "data/analog.hpp"
 #include "data/analogsegment.hpp"
+#include "data/decode/decoder.hpp"
 #include "data/decoderstack.hpp"
 #include "data/logic.hpp"
 #include "data/logicsegment.hpp"
 #include "data/signalbase.hpp"
-#include "data/decode/decoder.hpp"
 
 #include "devices/hardwaredevice.hpp"
 #include "devices/inputfile.hpp"
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index a5850060..db766179 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -27,14 +27,14 @@
 
 #include "storesession.hpp"
 
-#include <pv/devicemanager.hpp>
-#include <pv/session.hpp>
 #include <pv/data/analog.hpp>
 #include <pv/data/analogsegment.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
+#include <pv/devicemanager.hpp>
 #include <pv/devices/device.hpp>
+#include <pv/session.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
diff --git a/pv/storesession.hpp b/pv/storesession.hpp
index b6ead66d..f0c8de77 100644
--- a/pv/storesession.hpp
+++ b/pv/storesession.hpp
@@ -20,8 +20,8 @@
 #ifndef PULSEVIEW_PV_STORESESSION_HPP
 #define PULSEVIEW_PV_STORESESSION_HPP
 
-#include <cstdint>
 #include <atomic>
+#include <cstdint>
 #include <fstream>
 #include <map>
 #include <memory>
diff --git a/pv/strnatcmp.hpp b/pv/strnatcmp.hpp
index 1d8f5a24..eaa73608 100644
--- a/pv/strnatcmp.hpp
+++ b/pv/strnatcmp.hpp
@@ -27,8 +27,8 @@
 #ifndef PULSEVIEW_PV_STRNATCMP_HPP
 #define PULSEVIEW_PV_STRNATCMP_HPP
 
-#include <cstddef>	/* size_t */
 #include <cctype>
+#include <cstddef>	/* size_t */
 #include <string>
 
 using std::string;
diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 838fefca..333f222a 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -43,8 +43,8 @@
 #include <pv/dialogs/inputoutputoptions.hpp>
 #include <pv/dialogs/storeprogress.hpp>
 #include <pv/mainwindow.hpp>
-#include <pv/popups/deviceoptions.hpp>
 #include <pv/popups/channels.hpp>
+#include <pv/popups/deviceoptions.hpp>
 #include <pv/util.hpp>
 #include <pv/view/view.hpp>
 #include <pv/widgets/exportmenu.hpp>
diff --git a/pv/util.cpp b/pv/util.cpp
index 7d711f19..8f2d7d25 100644
--- a/pv/util.cpp
+++ b/pv/util.cpp
@@ -21,12 +21,12 @@
 
 #include <extdef.h>
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 #include <sstream>
 
-#include <QTextStream>
 #include <QDebug>
+#include <QTextStream>
 
 using std::fixed;
 using std::max;
diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 4479885d..a15861c8 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -40,9 +40,9 @@
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/data/signalbase.hpp"
-#include "pv/view/view.hpp"
-#include "pv/view/logicsignal.hpp"
 #include "pv/globalsettings.hpp"
+#include "pv/view/logicsignal.hpp"
+#include "pv/view/view.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index d845817d..408eb311 100644
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -19,9 +19,9 @@
 
 #include "cursor.hpp"
 
+#include "pv/util.hpp"
 #include "ruler.hpp"
 #include "view.hpp"
-#include "pv/util.hpp"
 
 #include <QApplication>
 #include <QBrush>
diff --git a/pv/view/cursorpair.cpp b/pv/view/cursorpair.cpp
index e0e3de65..3259524c 100644
--- a/pv/view/cursorpair.cpp
+++ b/pv/view/cursorpair.cpp
@@ -19,12 +19,12 @@
 
 #include "cursorpair.hpp"
 
+#include "pv/util.hpp"
 #include "ruler.hpp"
 #include "view.hpp"
-#include "pv/util.hpp"
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 
 using std::max;
 using std::make_pair;
diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 55b5f575..0a624c31 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -40,13 +40,13 @@ extern "C" {
 
 #include "decodetrace.hpp"
 
-#include <pv/session.hpp>
-#include <pv/strnatcmp.hpp>
-#include <pv/data/decoderstack.hpp>
+#include <pv/data/decode/annotation.hpp>
 #include <pv/data/decode/decoder.hpp>
+#include <pv/data/decoderstack.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
-#include <pv/data/decode/annotation.hpp>
+#include <pv/session.hpp>
+#include <pv/strnatcmp.hpp>
 #include <pv/view/view.hpp>
 #include <pv/view/viewport.hpp>
 #include <pv/widgets/decodergroupbox.hpp>
diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp
index 9f575524..648bb04a 100644
--- a/pv/view/decodetrace.hpp
+++ b/pv/view/decodetrace.hpp
@@ -30,8 +30,8 @@
 #include <QSignalMapper>
 
 #include <pv/binding/decoder.hpp>
-#include <pv/data/signalbase.hpp>
 #include <pv/data/decode/row.hpp>
+#include <pv/data/signalbase.hpp>
 
 using std::list;
 using std::map;
diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 0e9445ea..e2ccfedc 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -23,8 +23,8 @@
 #include "signal.hpp"
 #include "tracegroup.hpp"
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 
 #include <boost/iterator/filter_iterator.hpp>
 
diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 9c8f6b31..86d45a43 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -31,14 +31,14 @@
 #include "logicsignal.hpp"
 #include "view.hpp"
 
-#include <pv/session.hpp>
-#include <pv/devicemanager.hpp>
-#include <pv/devices/device.hpp>
 #include <pv/data/logic.hpp>
 #include <pv/data/logicsegment.hpp>
 #include <pv/data/signalbase.hpp>
-#include <pv/view/view.hpp>
+#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
 #include <pv/globalsettings.hpp>
+#include <pv/session.hpp>
+#include <pv/view/view.hpp>
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
diff --git a/pv/view/timemarker.cpp b/pv/view/timemarker.cpp
index 3014b4a6..4874eb23 100644
--- a/pv/view/timemarker.cpp
+++ b/pv/view/timemarker.cpp
@@ -23,12 +23,12 @@
 
 #include "timemarker.hpp"
 
-#include "view.hpp"
 #include "pv/widgets/timestampspinbox.hpp"
+#include "view.hpp"
 
 #include <QApplication>
-#include <QFormLayout>
 #include <QFontMetrics>
+#include <QFormLayout>
 #include <QPainter>
 
 #include <pv/widgets/popup.hpp>
diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index 5b59eab9..265bc275 100644
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -19,8 +19,8 @@
 
 #include <extdef.h>
 
-#include <cassert>
 #include <algorithm>
+#include <cassert>
 
 #include <QMenu>
 #include <QPainter>
diff --git a/pv/view/tracetreeitemowner.cpp b/pv/view/tracetreeitemowner.cpp
index 31f4cb83..e6260885 100644
--- a/pv/view/tracetreeitemowner.cpp
+++ b/pv/view/tracetreeitemowner.cpp
@@ -20,8 +20,8 @@
 #include <cassert>
 
 #include "tracetreeitem.hpp"
-#include "tracetreeitemowner.hpp"
 #include "trace.hpp"
+#include "tracetreeitemowner.hpp"
 
 using std::find;
 using std::make_pair;
diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index dc545bab..0e3fa98f 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -36,9 +36,9 @@
 #include <boost/serialization/serialization.hpp>
 
 #include <QApplication>
-#include <QHBoxLayout>
 #include <QEvent>
 #include <QFontMetrics>
+#include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QScrollBar>
 
@@ -54,11 +54,11 @@
 #include "view.hpp"
 #include "viewport.hpp"
 
-#include "pv/session.hpp"
-#include "pv/globalsettings.hpp"
-#include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"
 #include "pv/util.hpp"
 
 #ifdef ENABLE_DECODE
diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index ee62d113..05d9d601 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -32,8 +32,8 @@
 #include <QTimer>
 
 #include <pv/data/signaldata.hpp>
-#include <pv/views/viewbase.hpp>
 #include <pv/util.hpp>
+#include <pv/views/viewbase.hpp>
 
 #include "cursorpair.hpp"
 #include "flag.hpp"
diff --git a/pv/view/viewitemowner.cpp b/pv/view/viewitemowner.cpp
index 7b32d92c..94876590 100644
--- a/pv/view/viewitemowner.cpp
+++ b/pv/view/viewitemowner.cpp
@@ -20,8 +20,8 @@
 #include <cassert>
 
 #include "tracetreeitem.hpp"
-#include "tracetreeitemowner.hpp"
 #include "trace.hpp"
+#include "tracetreeitemowner.hpp"
 
 namespace pv {
 namespace views {
diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index 4b5fe245..d81befae 100644
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -17,9 +17,9 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <algorithm>
 #include <cassert>
 #include <cmath>
-#include <algorithm>
 #include <limits>
 
 #include "signal.hpp"
diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 6d211c98..f1486e00 100644
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -20,10 +20,10 @@
 #include <algorithm>
 #include <cassert>
 
-#include <QtGui>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QLineEdit>
+#include <QtGui>
 
 #include "popup.hpp"
 
diff --git a/pv/widgets/sweeptimingwidget.cpp b/pv/widgets/sweeptimingwidget.cpp
index ea77c0fe..b4943225 100644
--- a/pv/widgets/sweeptimingwidget.cpp
+++ b/pv/widgets/sweeptimingwidget.cpp
@@ -19,9 +19,9 @@
 
 #include "sweeptimingwidget.hpp"
 
+#include <cassert>
 #include <cstdlib>
 #include <vector>
-#include <cassert>
 
 #include <extdef.h>
 
diff --git a/pv/widgets/wellarray.cpp b/pv/widgets/wellarray.cpp
index 4e3382ba..433a7f5e 100644
--- a/pv/widgets/wellarray.cpp
+++ b/pv/widgets/wellarray.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QPainter>
 #include <QPaintEvent>
+#include <QPainter>
 #include <QStyle>
 #include <QStyleOptionFrame>
 
diff --git a/test/test.cpp b/test/test.cpp
index c2a50313..1f078ab4 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -18,8 +18,8 @@
  */
 
 #define BOOST_TEST_MAIN
-#include <boost/test/unit_test.hpp>
 #include "test/test.hpp"
+#include <boost/test/unit_test.hpp>
 
 using std::ostream;
 
diff --git a/test/view/ruler.cpp b/test/view/ruler.cpp
index 34bf20b7..5230e240 100644
--- a/test/view/ruler.cpp
+++ b/test/view/ruler.cpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <boost/test/unit_test.hpp>
 #include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include "pv/view/ruler.hpp"
 #include "test/test.hpp"
-- 
2.30.2