diff --git a/Software/PC_Application/Calibration/amplitudecaldialog.cpp b/Software/PC_Application/Calibration/amplitudecaldialog.cpp
index 3dc8280..50f89d9 100644
--- a/Software/PC_Application/Calibration/amplitudecaldialog.cpp
+++ b/Software/PC_Application/Calibration/amplitudecaldialog.cpp
@@ -1,16 +1,18 @@
 #include "amplitudecaldialog.h"
+
 #include "ui_amplitudecaldialog.h"
 #include "mode.h"
 #include "unit.h"
-#include <QDebug>
 #include "ui_addamplitudepointsdialog.h"
 #include "ui_automaticamplitudedialog.h"
+#include "json.hpp"
+#include "Util/util.h"
+
+#include <QDebug>
 #include <QMessageBox>
 #include <QFileDialog>
-#include "json.hpp"
 #include <fstream>
 #include <CustomWidgets/informationbox.h>
-#include "Util/util.h"
 
 using namespace std;
 using namespace nlohmann;
diff --git a/Software/PC_Application/Calibration/amplitudecaldialog.h b/Software/PC_Application/Calibration/amplitudecaldialog.h
index eda3881..c9171ff 100644
--- a/Software/PC_Application/Calibration/amplitudecaldialog.h
+++ b/Software/PC_Application/Calibration/amplitudecaldialog.h
@@ -1,10 +1,11 @@
 #ifndef AMPLITUDECALDIALOG_H
 #define AMPLITUDECALDIALOG_H
 
-#include <QDialog>
 #include "mode.h"
 #include "Device/device.h"
 
+#include <QDialog>
+
 namespace Ui {
 class AmplitudeCalDialog;
 }
diff --git a/Software/PC_Application/Calibration/calibration.cpp b/Software/PC_Application/Calibration/calibration.cpp
index 4579cec..9029134 100644
--- a/Software/PC_Application/Calibration/calibration.cpp
+++ b/Software/PC_Application/Calibration/calibration.cpp
@@ -1,12 +1,14 @@
 #include "calibration.h"
+
+#include "unit.h"
+#include "Tools/parameters.h"
+#include "CustomWidgets/informationbox.h"
+
+#include <QDebug>
 #include <algorithm>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <fstream>
-#include "unit.h"
-#include <QDebug>
-#include "Tools/parameters.h"
-#include "CustomWidgets/informationbox.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/Calibration/calibration.h b/Software/PC_Application/Calibration/calibration.h
index b8e22e4..50f0234 100644
--- a/Software/PC_Application/Calibration/calibration.h
+++ b/Software/PC_Application/Calibration/calibration.h
@@ -2,15 +2,15 @@
 #define CALIBRATION_H
 
 #include "Device/device.h"
+#include "calkit.h"
+#include "Traces/tracemodel.h"
+
 #include <complex>
 #include <vector>
 #include <map>
 #include <iostream>
 #include <iomanip>
-#include "calkit.h"
-#include "Traces/tracemodel.h"
 #include <QDateTime>
-#include "calkit.h"
 
 class Calibration
 {
diff --git a/Software/PC_Application/Calibration/calibrationtracedialog.cpp b/Software/PC_Application/Calibration/calibrationtracedialog.cpp
index 63a1ba9..434dbe5 100644
--- a/Software/PC_Application/Calibration/calibrationtracedialog.cpp
+++ b/Software/PC_Application/Calibration/calibrationtracedialog.cpp
@@ -1,9 +1,11 @@
 #include "calibrationtracedialog.h"
+
 #include "ui_calibrationtracedialog.h"
 #include "measurementmodel.h"
-#include <QStyle>
 #include "CustomWidgets/informationbox.h"
 
+#include <QStyle>
+
 CalibrationTraceDialog::CalibrationTraceDialog(Calibration *cal, double f_min, double f_max, Calibration::Type type) :
     QDialog(nullptr),
     ui(new Ui::CalibrationTraceDialog),
diff --git a/Software/PC_Application/Calibration/calibrationtracedialog.h b/Software/PC_Application/Calibration/calibrationtracedialog.h
index 650595c..001346f 100644
--- a/Software/PC_Application/Calibration/calibrationtracedialog.h
+++ b/Software/PC_Application/Calibration/calibrationtracedialog.h
@@ -1,11 +1,12 @@
 #ifndef CALIBRATIONTRACEDIALOG_H
 #define CALIBRATIONTRACEDIALOG_H
 
-#include <QDialog>
 #include "calibration.h"
 #include "measurementmodel.h"
 #include "Device/device.h"
 
+#include <QDialog>
+
 namespace Ui {
 class CalibrationTraceDialog;
 }
diff --git a/Software/PC_Application/Calibration/calkit.cpp b/Software/PC_Application/Calibration/calkit.cpp
index 37ddb1d..890d9a2 100644
--- a/Software/PC_Application/Calibration/calkit.cpp
+++ b/Software/PC_Application/Calibration/calkit.cpp
@@ -1,13 +1,14 @@
 #include "calkit.h"
 
+#include "calkitdialog.h"
+#include "json.hpp"
+#include "CustomWidgets/informationbox.h"
+
 #include <fstream>
 #include <iomanip>
-#include "calkitdialog.h"
-#include <math.h>
-#include "json.hpp"
 #include <QMessageBox>
 #include <QDebug>
-#include "CustomWidgets/informationbox.h"
+#include <math.h>
 
 using json = nlohmann::json;
 using namespace std;
diff --git a/Software/PC_Application/Calibration/calkit.h b/Software/PC_Application/Calibration/calkit.h
index a33b49e..093fbeb 100644
--- a/Software/PC_Application/Calibration/calkit.h
+++ b/Software/PC_Application/Calibration/calkit.h
@@ -1,10 +1,11 @@
 #ifndef CALKIT_H
 #define CALKIT_H
 
-#include <string>
-#include <complex>
 #include "touchstone.h"
 #include "Util/qpointervariant.h"
+
+#include <string>
+#include <complex>
 #include <QDir>
 
 class Calkit
diff --git a/Software/PC_Application/Calibration/calkitdialog.cpp b/Software/PC_Application/Calibration/calkitdialog.cpp
index 924eca7..2687411 100644
--- a/Software/PC_Application/Calibration/calkitdialog.cpp
+++ b/Software/PC_Application/Calibration/calkitdialog.cpp
@@ -1,13 +1,14 @@
 #include "calkitdialog.h"
-#include "ui_calkitdialog.h"
-#include <QPushButton>
 
+#include "ui_calkitdialog.h"
+#include "CustomWidgets/informationbox.h"
+
+#include <QPushButton>
 #include <QDebug>
 #include <QFileDialog>
 #include <fstream>
 #include <touchstone.h>
 #include <QtGlobal>
-#include "CustomWidgets/informationbox.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/Calibration/calkitdialog.h b/Software/PC_Application/Calibration/calkitdialog.h
index fc1b701..b06e073 100644
--- a/Software/PC_Application/Calibration/calkitdialog.h
+++ b/Software/PC_Application/Calibration/calkitdialog.h
@@ -1,11 +1,12 @@
 #ifndef CALKITDIALOG_H
 #define CALKITDIALOG_H
 
+#include "calkit.h"
+
 #include <QDialog>
 #include <QAbstractButton>
 #include <iostream>
 #include <iomanip>
-#include "calkit.h"
 
 namespace Ui {
 class CalkitDialog;
diff --git a/Software/PC_Application/Calibration/frequencycaldialog.cpp b/Software/PC_Application/Calibration/frequencycaldialog.cpp
index e211fce..df2d403 100644
--- a/Software/PC_Application/Calibration/frequencycaldialog.cpp
+++ b/Software/PC_Application/Calibration/frequencycaldialog.cpp
@@ -1,4 +1,5 @@
 #include "frequencycaldialog.h"
+
 #include "ui_frequencycaldialog.h"
 
 FrequencyCalDialog::FrequencyCalDialog(Device *dev, QWidget *parent) :
diff --git a/Software/PC_Application/Calibration/frequencycaldialog.h b/Software/PC_Application/Calibration/frequencycaldialog.h
index e35a657..7358407 100644
--- a/Software/PC_Application/Calibration/frequencycaldialog.h
+++ b/Software/PC_Application/Calibration/frequencycaldialog.h
@@ -1,10 +1,11 @@
 #ifndef FREQUENCYCALDIALOG_H
 #define FREQUENCYCALDIALOG_H
 
-#include <QDialog>
 #include "Device/device.h"
 #include "mode.h"
 
+#include <QDialog>
+
 namespace Ui {
 class FrequencyCalDialog;
 }
diff --git a/Software/PC_Application/Calibration/manualcalibrationdialog.cpp b/Software/PC_Application/Calibration/manualcalibrationdialog.cpp
index 3f9d58e..da5ff0f 100644
--- a/Software/PC_Application/Calibration/manualcalibrationdialog.cpp
+++ b/Software/PC_Application/Calibration/manualcalibrationdialog.cpp
@@ -1,4 +1,5 @@
 #include "manualcalibrationdialog.h"
+
 #include "ui_manualcalibrationdialog.h"
 #include "Traces/sparamtraceselector.h"
 
diff --git a/Software/PC_Application/Calibration/manualcalibrationdialog.h b/Software/PC_Application/Calibration/manualcalibrationdialog.h
index 60b053a..ccf0f93 100644
--- a/Software/PC_Application/Calibration/manualcalibrationdialog.h
+++ b/Software/PC_Application/Calibration/manualcalibrationdialog.h
@@ -1,9 +1,10 @@
 #ifndef MANUALCALIBRATIONDIALOG_H
 #define MANUALCALIBRATIONDIALOG_H
 
-#include <QDialog>
 #include "calibration.h"
 
+#include <QDialog>
+
 namespace Ui {
 class ManualCalibrationDialog;
 }
diff --git a/Software/PC_Application/Calibration/measurementmodel.cpp b/Software/PC_Application/Calibration/measurementmodel.cpp
index f0935ec..4b17b4c 100644
--- a/Software/PC_Application/Calibration/measurementmodel.cpp
+++ b/Software/PC_Application/Calibration/measurementmodel.cpp
@@ -1,5 +1,7 @@
 #include "measurementmodel.h"
+
 #include "../unit.h"
+
 #include <algorithm>
 
 MeasurementModel::MeasurementModel(Calibration *cal, std::vector<Calibration::Measurement> measurements) :
diff --git a/Software/PC_Application/Calibration/measurementmodel.h b/Software/PC_Application/Calibration/measurementmodel.h
index ffb08eb..6674c27 100644
--- a/Software/PC_Application/Calibration/measurementmodel.h
+++ b/Software/PC_Application/Calibration/measurementmodel.h
@@ -1,10 +1,11 @@
 #ifndef MEASUREMENTMODEL_H
 #define MEASUREMENTMODEL_H
 
+#include "calibration.h"
+
 #include <QObject>
 #include <QWidget>
 #include <QAbstractTableModel>
-#include "calibration.h"
 
 class MeasurementModel : public QAbstractTableModel
 {
diff --git a/Software/PC_Application/Calibration/sourcecaldialog.h b/Software/PC_Application/Calibration/sourcecaldialog.h
index 86e90a3..7bd691c 100644
--- a/Software/PC_Application/Calibration/sourcecaldialog.h
+++ b/Software/PC_Application/Calibration/sourcecaldialog.h
@@ -1,9 +1,10 @@
 #ifndef SOURCECALDIALOG_H
 #define SOURCECALDIALOG_H
 
-#include <QObject>
 #include "amplitudecaldialog.h"
 
+#include <QObject>
+
 class SourceCalDialog : public AmplitudeCalDialog
 {
     Q_OBJECT
diff --git a/Software/PC_Application/CustomWidgets/colorpickerbutton.cpp b/Software/PC_Application/CustomWidgets/colorpickerbutton.cpp
index c6fe35f..d646bb8 100644
--- a/Software/PC_Application/CustomWidgets/colorpickerbutton.cpp
+++ b/Software/PC_Application/CustomWidgets/colorpickerbutton.cpp
@@ -1,4 +1,5 @@
 #include "colorpickerbutton.h"
+
 #include <QColorDialog>
 
 ColorPickerButton::ColorPickerButton(QWidget *parent)
diff --git a/Software/PC_Application/CustomWidgets/csvimport.cpp b/Software/PC_Application/CustomWidgets/csvimport.cpp
index 2a9f9af..6ceab43 100644
--- a/Software/PC_Application/CustomWidgets/csvimport.cpp
+++ b/Software/PC_Application/CustomWidgets/csvimport.cpp
@@ -1,7 +1,8 @@
 #include "csvimport.h"
 #include "ui_csvimport.h"
-#include <QFileDialog>
 #include "Traces/trace.h"
+
+#include <QFileDialog>
 #include <QDebug>
 
 CSVImport::CSVImport(QWidget *parent) :
diff --git a/Software/PC_Application/CustomWidgets/csvimport.h b/Software/PC_Application/CustomWidgets/csvimport.h
index dd8494b..a315b19 100644
--- a/Software/PC_Application/CustomWidgets/csvimport.h
+++ b/Software/PC_Application/CustomWidgets/csvimport.h
@@ -1,10 +1,11 @@
 #ifndef CSVIMPORT_H
 #define CSVIMPORT_H
 
-#include <QWidget>
 #include "csv.h"
 #include "Traces/trace.h"
 
+#include <QWidget>
+
 namespace Ui {
 class csvimport;
 }
diff --git a/Software/PC_Application/CustomWidgets/informationbox.cpp b/Software/PC_Application/CustomWidgets/informationbox.cpp
index 223c22f..22d2653 100644
--- a/Software/PC_Application/CustomWidgets/informationbox.cpp
+++ b/Software/PC_Application/CustomWidgets/informationbox.cpp
@@ -1,4 +1,5 @@
 #include "informationbox.h"
+
 #include <QCheckBox>
 #include <QSettings>
 #include <QDebug>
diff --git a/Software/PC_Application/CustomWidgets/jsonpickerdialog.cpp b/Software/PC_Application/CustomWidgets/jsonpickerdialog.cpp
index 4a83f31..a1fe5ff 100644
--- a/Software/PC_Application/CustomWidgets/jsonpickerdialog.cpp
+++ b/Software/PC_Application/CustomWidgets/jsonpickerdialog.cpp
@@ -1,9 +1,7 @@
 #include "jsonpickerdialog.h"
+
 #include "ui_jsonpickerdialog.h"
 
-
-
-
 JSONPickerDialog::JSONPickerDialog(const nlohmann::json &json, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::JSONPickerDialog),
diff --git a/Software/PC_Application/CustomWidgets/jsonpickerdialog.h b/Software/PC_Application/CustomWidgets/jsonpickerdialog.h
index bb30019..a78f4c4 100644
--- a/Software/PC_Application/CustomWidgets/jsonpickerdialog.h
+++ b/Software/PC_Application/CustomWidgets/jsonpickerdialog.h
@@ -1,9 +1,10 @@
 #ifndef JSONPICKERDIALOG_H
 #define JSONPICKERDIALOG_H
 
+#include "json.hpp"
+
 #include <QDialog>
 #include <QAbstractItemModel>
-#include "json.hpp"
 
 namespace Ui {
 class JSONPickerDialog;
diff --git a/Software/PC_Application/CustomWidgets/tilewidget.cpp b/Software/PC_Application/CustomWidgets/tilewidget.cpp
index 8d66da9..880bdbe 100644
--- a/Software/PC_Application/CustomWidgets/tilewidget.cpp
+++ b/Software/PC_Application/CustomWidgets/tilewidget.cpp
@@ -1,9 +1,11 @@
 #include "tilewidget.h"
+
 #include "ui_tilewidget.h"
-#include <QDebug>
 #include "Traces/tracexyplot.h"
 #include "Traces/tracesmithchart.h"
 
+#include <QDebug>
+
 TileWidget::TileWidget(TraceModel &model, QWidget *parent) :
     QWidget(parent),
     ui(new Ui::TileWidget),
diff --git a/Software/PC_Application/CustomWidgets/tilewidget.h b/Software/PC_Application/CustomWidgets/tilewidget.h
index 27780cc..cf29f23 100644
--- a/Software/PC_Application/CustomWidgets/tilewidget.h
+++ b/Software/PC_Application/CustomWidgets/tilewidget.h
@@ -3,10 +3,11 @@
 
 #include <QWidget>
 #include "Traces/traceplot.h"
-#include <QSplitter>
 #include "Traces/tracemodel.h"
 #include "savable.h"
 
+#include <QSplitter>
+
 namespace Ui {
 class TileWidget;
 }
diff --git a/Software/PC_Application/CustomWidgets/touchstoneimport.cpp b/Software/PC_Application/CustomWidgets/touchstoneimport.cpp
index 21d8158..e2fc910 100644
--- a/Software/PC_Application/CustomWidgets/touchstoneimport.cpp
+++ b/Software/PC_Application/CustomWidgets/touchstoneimport.cpp
@@ -1,5 +1,7 @@
 #include "touchstoneimport.h"
+
 #include "ui_touchstoneimport.h"
+
 #include <QFileDialog>
 #include <QDebug>
 #include <QtGlobal>
diff --git a/Software/PC_Application/CustomWidgets/touchstoneimport.h b/Software/PC_Application/CustomWidgets/touchstoneimport.h
index 9b0bfa9..cf9b78f 100644
--- a/Software/PC_Application/CustomWidgets/touchstoneimport.h
+++ b/Software/PC_Application/CustomWidgets/touchstoneimport.h
@@ -1,8 +1,9 @@
 #ifndef TOUCHSTONEIMPORT_H
 #define TOUCHSTONEIMPORT_H
 
-#include <QWidget>
 #include "touchstone.h"
+
+#include <QWidget>
 #include <QButtonGroup>
 
 namespace Ui {
diff --git a/Software/PC_Application/Device/device.cpp b/Software/PC_Application/Device/device.cpp
index c0d3728..82b7f62 100644
--- a/Software/PC_Application/Device/device.cpp
+++ b/Software/PC_Application/Device/device.cpp
@@ -1,11 +1,12 @@
 #include "device.h"
 
+#include "CustomWidgets/informationbox.h"
+
 #include <signal.h>
 #include <QDebug>
 #include <QString>
 #include <QMessageBox>
 #include <mutex>
-#include "CustomWidgets/informationbox.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/Device/device.h b/Software/PC_Application/Device/device.h
index 2800dba..ef144bd 100644
--- a/Software/PC_Application/Device/device.h
+++ b/Software/PC_Application/Device/device.h
@@ -2,6 +2,7 @@
 #define DEVICE_H
 
 #include "../VNA_embedded/Application/Communication/Protocol.hpp"
+
 #include <functional>
 #include <libusb-1.0/libusb.h>
 #include <thread>
diff --git a/Software/PC_Application/Device/devicelog.cpp b/Software/PC_Application/Device/devicelog.cpp
index e16ec87..41acbac 100644
--- a/Software/PC_Application/Device/devicelog.cpp
+++ b/Software/PC_Application/Device/devicelog.cpp
@@ -1,5 +1,7 @@
 #include "devicelog.h"
+
 #include "ui_devicelog.h"
+
 #include <QScrollBar>
 #include <QFileDialog>
 #include <fstream>
diff --git a/Software/PC_Application/Device/firmwareupdatedialog.cpp b/Software/PC_Application/Device/firmwareupdatedialog.cpp
index 5d0f23a..1ecbf4c 100644
--- a/Software/PC_Application/Device/firmwareupdatedialog.cpp
+++ b/Software/PC_Application/Device/firmwareupdatedialog.cpp
@@ -1,5 +1,7 @@
 #include "firmwareupdatedialog.h"
+
 #include "ui_firmwareupdatedialog.h"
+
 #include <QFileDialog>
 #include <QStyle>
 
diff --git a/Software/PC_Application/Device/firmwareupdatedialog.h b/Software/PC_Application/Device/firmwareupdatedialog.h
index 194fe57..b0322d3 100644
--- a/Software/PC_Application/Device/firmwareupdatedialog.h
+++ b/Software/PC_Application/Device/firmwareupdatedialog.h
@@ -1,8 +1,9 @@
 #ifndef FIRMWAREUPDATEDIALOG_H
 #define FIRMWAREUPDATEDIALOG_H
 
-#include <QDialog>
 #include "device.h"
+
+#include <QDialog>
 #include <QFile>
 #include <QTimer>
 
diff --git a/Software/PC_Application/Device/manualcontroldialog.cpp b/Software/PC_Application/Device/manualcontroldialog.cpp
index 0a2a190..b776887 100644
--- a/Software/PC_Application/Device/manualcontroldialog.cpp
+++ b/Software/PC_Application/Device/manualcontroldialog.cpp
@@ -1,10 +1,13 @@
 #include "manualcontroldialog.h"
+
 #include "ui_manualcontroldialog.h"
+#include "Util/util.h"
+
 #include <QComboBox>
 #include <QDebug>
 #include <QButtonGroup>
 #include <complex>
-#include "Util/util.h"
+
 
 using namespace std;
 
diff --git a/Software/PC_Application/Device/manualcontroldialog.h b/Software/PC_Application/Device/manualcontroldialog.h
index a2d868d..ab0f048 100644
--- a/Software/PC_Application/Device/manualcontroldialog.h
+++ b/Software/PC_Application/Device/manualcontroldialog.h
@@ -1,8 +1,9 @@
 #ifndef MANUALCONTROLDIALOG_H
 #define MANUALCONTROLDIALOG_H
 
-#include <QDialog>
 #include "device.h"
+
+#include <QDialog>
 #include <complex>
 
 namespace Ui {
diff --git a/Software/PC_Application/Generator/generator.cpp b/Software/PC_Application/Generator/generator.cpp
index 8106618..8b8eb63 100644
--- a/Software/PC_Application/Generator/generator.cpp
+++ b/Software/PC_Application/Generator/generator.cpp
@@ -1,4 +1,5 @@
 #include "generator.h"
+
 #include <QSettings>
 
 Generator::Generator(AppWindow *window)
diff --git a/Software/PC_Application/Generator/signalgenwidget.cpp b/Software/PC_Application/Generator/signalgenwidget.cpp
index 4b93192..187debb 100644
--- a/Software/PC_Application/Generator/signalgenwidget.cpp
+++ b/Software/PC_Application/Generator/signalgenwidget.cpp
@@ -1,4 +1,5 @@
 #include "signalgenwidget.h"
+
 #include "ui_signalgenwidget.h"
 
 SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
diff --git a/Software/PC_Application/Generator/signalgenwidget.h b/Software/PC_Application/Generator/signalgenwidget.h
index 1ebcec9..e64a054 100644
--- a/Software/PC_Application/Generator/signalgenwidget.h
+++ b/Software/PC_Application/Generator/signalgenwidget.h
@@ -1,10 +1,11 @@
 #ifndef SIGNALGENERATOR_H
 #define SIGNALGENERATOR_H
 
-#include <QWidget>
 #include "Device/device.h"
 #include "savable.h"
 
+#include <QWidget>
+
 namespace Ui {
 class SignalgeneratorWidget;
 }
diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
index 7778968..cb99744 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.cpp
@@ -1,4 +1,29 @@
 #include "spectrumanalyzer.h"
+
+#include "unit.h"
+#include "CustomWidgets/toggleswitch.h"
+#include "Device/manualcontroldialog.h"
+#include "Traces/tracemodel.h"
+#include "tracewidgetsa.h"
+#include "Traces/tracesmithchart.h"
+#include "Traces/tracexyplot.h"
+#include "Traces/traceimportdialog.h"
+#include "CustomWidgets/tilewidget.h"
+#include "CustomWidgets/siunitedit.h"
+#include "Traces/Marker/markerwidget.h"
+#include "Tools/impedancematchdialog.h"
+#include "Calibration/calibrationtracedialog.h"
+#include "ui_main.h"
+#include "Device/firmwareupdatedialog.h"
+#include "preferences.h"
+#include "Generator/signalgenwidget.h"
+
+#include <QDockWidget>
+#include <QDesktopWidget>
+#include <QApplication>
+#include <QActionGroup>
+#include "CustomWidgets/informationbox.h"
+#include <QDebug>
 #include <QGridLayout>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -19,29 +44,6 @@
 #include <iostream>
 #include <fstream>
 #include <QDateTime>
-#include "unit.h"
-#include "CustomWidgets/toggleswitch.h"
-#include "Device/manualcontroldialog.h"
-#include "Traces/tracemodel.h"
-#include "tracewidgetsa.h"
-#include "Traces/tracesmithchart.h"
-#include "Traces/tracexyplot.h"
-#include "Traces/traceimportdialog.h"
-#include "CustomWidgets/tilewidget.h"
-#include "CustomWidgets/siunitedit.h"
-#include <QDockWidget>
-#include "Traces/Marker/markerwidget.h"
-#include "Tools/impedancematchdialog.h"
-#include "Calibration/calibrationtracedialog.h"
-#include "ui_main.h"
-#include "Device/firmwareupdatedialog.h"
-#include "preferences.h"
-#include "Generator/signalgenwidget.h"
-#include <QDesktopWidget>
-#include <QApplication>
-#include <QActionGroup>
-#include "CustomWidgets/informationbox.h"
-#include <QDebug>
 
 SpectrumAnalyzer::SpectrumAnalyzer(AppWindow *window)
     : Mode(window, "Spectrum Analyzer"),
diff --git a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
index e319e3d..8d2c7f9 100644
--- a/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
+++ b/Software/PC_Application/SpectrumAnalyzer/spectrumanalyzer.h
@@ -1,16 +1,17 @@
 #ifndef SPECTRUMANALYZER_H
 #define SPECTRUMANALYZER_H
 
-#include <QObject>
-#include <QWidget>
 #include "appwindow.h"
 #include "mode.h"
 #include "CustomWidgets/tilewidget.h"
-#include <QComboBox>
-#include <QCheckBox>
 #include "scpi.h"
 #include "Traces/tracewidget.h"
 
+#include <QObject>
+#include <QWidget>
+#include <QComboBox>
+#include <QCheckBox>
+
 class SpectrumAnalyzer : public Mode, public SCPINode
 {
     Q_OBJECT
diff --git a/Software/PC_Application/SpectrumAnalyzer/tracewidgetsa.cpp b/Software/PC_Application/SpectrumAnalyzer/tracewidgetsa.cpp
index 7c90b01..7c5d726 100644
--- a/Software/PC_Application/SpectrumAnalyzer/tracewidgetsa.cpp
+++ b/Software/PC_Application/SpectrumAnalyzer/tracewidgetsa.cpp
@@ -1,9 +1,11 @@
 #include "tracewidgetsa.h"
+
 #include "Traces/tracecsvexport.h"
-#include <QFileDialog>
 #include "Traces/traceimportdialog.h"
 #include "CustomWidgets/informationbox.h"
 
+#include <QFileDialog>
+
 TraceWidgetSA::TraceWidgetSA(TraceModel &model, QWidget *parent)
     : TraceWidget(model, parent)
 {
diff --git a/Software/PC_Application/Tools/eseries.cpp b/Software/PC_Application/Tools/eseries.cpp
index 2f31118..f9363e4 100644
--- a/Software/PC_Application/Tools/eseries.cpp
+++ b/Software/PC_Application/Tools/eseries.cpp
@@ -1,4 +1,5 @@
 #include "eseries.h"
+
 #include <math.h>
 #include <vector>
 
diff --git a/Software/PC_Application/Tools/impedancematchdialog.cpp b/Software/PC_Application/Tools/impedancematchdialog.cpp
index a44ca8d..c3e697b 100644
--- a/Software/PC_Application/Tools/impedancematchdialog.cpp
+++ b/Software/PC_Application/Tools/impedancematchdialog.cpp
@@ -1,4 +1,5 @@
 #include "impedancematchdialog.h"
+
 #include "ui_impedancematchdialog.h"
 #include "Tools/eseries.h"
 #include "Util/util.h"
diff --git a/Software/PC_Application/Tools/impedancematchdialog.h b/Software/PC_Application/Tools/impedancematchdialog.h
index 95f8251..d326254 100644
--- a/Software/PC_Application/Tools/impedancematchdialog.h
+++ b/Software/PC_Application/Tools/impedancematchdialog.h
@@ -1,9 +1,10 @@
 #ifndef IMPEDANCEMATCHDIALOG_H
 #define IMPEDANCEMATCHDIALOG_H
 
-#include <QDialog>
 #include "Traces/Marker/markermodel.h"
 
+#include <QDialog>
+
 namespace Ui {
 class ImpedanceMatchDialog;
 }
diff --git a/Software/PC_Application/Traces/Marker/marker.cpp b/Software/PC_Application/Traces/Marker/marker.cpp
index a8d679f..f4eb39f 100644
--- a/Software/PC_Application/Traces/Marker/marker.cpp
+++ b/Software/PC_Application/Traces/Marker/marker.cpp
@@ -1,18 +1,20 @@
 #include "marker.h"
-#include <QPainter>
+
 #include "CustomWidgets/siunitedit.h"
+#include "markermodel.h"
+#include "unit.h"
+#include "preferences.h"
+#include "markergroup.h"
+#include "Util/util.h"
+
+#include <QPainter>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QSpinBox>
 #include <QDebug>
-#include "markermodel.h"
-#include "unit.h"
 #include <QMenu>
 #include <QActionGroup>
 #include <QApplication>
-#include "preferences.h"
-#include "markergroup.h"
-#include "Util/util.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/Traces/Marker/marker.h b/Software/PC_Application/Traces/Marker/marker.h
index 365fb08..9e2117a 100644
--- a/Software/PC_Application/Traces/Marker/marker.h
+++ b/Software/PC_Application/Traces/Marker/marker.h
@@ -1,14 +1,15 @@
 #ifndef TRACEMARKER_H
 #define TRACEMARKER_H
 
-#include <QPixmap>
-#include <QObject>
 #include "../trace.h"
-#include <QMenu>
-#include <QComboBox>
 #include "CustomWidgets/siunitedit.h"
 #include "savable.h"
 
+#include <QPixmap>
+#include <QObject>
+#include <QMenu>
+#include <QComboBox>
+
 class MarkerModel;
 class MarkerGroup;
 
diff --git a/Software/PC_Application/Traces/Marker/markergroup.h b/Software/PC_Application/Traces/Marker/markergroup.h
index db0603b..4883573 100644
--- a/Software/PC_Application/Traces/Marker/markergroup.h
+++ b/Software/PC_Application/Traces/Marker/markergroup.h
@@ -1,10 +1,10 @@
 #ifndef MARKERGROUP_H
 #define MARKERGROUP_H
 
-#include <QObject>
-
 #include "marker.h"
 
+#include <QObject>
+
 class MarkerGroup : public QObject
 {
     Q_OBJECT
diff --git a/Software/PC_Application/Traces/Marker/markermodel.cpp b/Software/PC_Application/Traces/Marker/markermodel.cpp
index ca7703a..4787be9 100644
--- a/Software/PC_Application/Traces/Marker/markermodel.cpp
+++ b/Software/PC_Application/Traces/Marker/markermodel.cpp
@@ -1,10 +1,13 @@
 #include "markermodel.h"
+
+#include "markergroup.h"
+#include "CustomWidgets/siunitedit.h"
 #include "unit.h"
+
 #include <QComboBox>
 #include <QApplication>
-#include "CustomWidgets/siunitedit.h"
 #include <QDebug>
-#include "markergroup.h"
+
 
 using namespace std;
 
diff --git a/Software/PC_Application/Traces/Marker/markermodel.h b/Software/PC_Application/Traces/Marker/markermodel.h
index 7903a92..8847ae2 100644
--- a/Software/PC_Application/Traces/Marker/markermodel.h
+++ b/Software/PC_Application/Traces/Marker/markermodel.h
@@ -1,13 +1,14 @@
 #ifndef TRACEMARKERMODEL_H
 #define TRACEMARKERMODEL_H
 
-#include <QAbstractTableModel>
 #include "marker.h"
-#include <vector>
 #include "../tracemodel.h"
-#include <QStyledItemDelegate>
 #include "savable.h"
 
+#include <QAbstractTableModel>
+#include <vector>
+#include <QStyledItemDelegate>
+
 class MarkerTraceDelegate : public QStyledItemDelegate
 {
     Q_OBJECT;
diff --git a/Software/PC_Application/Traces/Marker/markerwidget.cpp b/Software/PC_Application/Traces/Marker/markerwidget.cpp
index 5d70a94..bc4bfde 100644
--- a/Software/PC_Application/Traces/Marker/markerwidget.cpp
+++ b/Software/PC_Application/Traces/Marker/markerwidget.cpp
@@ -1,8 +1,10 @@
 #include "markerwidget.h"
+
 #include "ui_markerwidget.h"
+#include "markergroup.h"
+
 #include <QKeyEvent>
 #include <QMenu>
-#include "markergroup.h"
 
 MarkerWidget::MarkerWidget(MarkerModel &model, QWidget *parent) :
     QWidget(parent),
diff --git a/Software/PC_Application/Traces/Marker/markerwidget.h b/Software/PC_Application/Traces/Marker/markerwidget.h
index 767889f..29b2aca 100644
--- a/Software/PC_Application/Traces/Marker/markerwidget.h
+++ b/Software/PC_Application/Traces/Marker/markerwidget.h
@@ -1,9 +1,10 @@
 #ifndef MARKERWIDGET_H
 #define MARKERWIDGET_H
 
-#include <QWidget>
 #include "markermodel.h"
 
+#include <QWidget>
+
 namespace Ui {
 class MarkerWidget;
 }
diff --git a/Software/PC_Application/Traces/Math/dft.cpp b/Software/PC_Application/Traces/Math/dft.cpp
index dbc4ac2..b2d3990 100644
--- a/Software/PC_Application/Traces/Math/dft.cpp
+++ b/Software/PC_Application/Traces/Math/dft.cpp
@@ -1,9 +1,11 @@
 #include "dft.h"
+
 #include "tdr.h"
 #include "Traces/fftcomplex.h"
 #include "unit.h"
 #include "ui_dftdialog.h"
 #include "ui_dftexplanationwidget.h"
+
 using namespace std;
 
 Math::DFT::DFT()
diff --git a/Software/PC_Application/Traces/Math/expression.cpp b/Software/PC_Application/Traces/Math/expression.cpp
index a15e448..8d05357 100644
--- a/Software/PC_Application/Traces/Math/expression.cpp
+++ b/Software/PC_Application/Traces/Math/expression.cpp
@@ -1,11 +1,12 @@
 #include "expression.h"
-#include <QWidget>
+
 #include "ui_expressiondialog.h"
-#include <QWidget>
-#include <QDebug>
 #include "Traces/trace.h"
 #include "ui_expressionexplanationwidget.h"
 
+#include <QWidget>
+#include <QDebug>
+
 using namespace mup;
 using namespace std;
 
diff --git a/Software/PC_Application/Traces/Math/medianfilter.cpp b/Software/PC_Application/Traces/Math/medianfilter.cpp
index c0a9691..e72a3aa 100644
--- a/Software/PC_Application/Traces/Math/medianfilter.cpp
+++ b/Software/PC_Application/Traces/Math/medianfilter.cpp
@@ -1,7 +1,7 @@
 #include "medianfilter.h"
+
 #include "ui_medianfilterdialog.h"
 #include "ui_medianexplanationwidget.h"
-
 #include "CustomWidgets/informationbox.h"
 
 using namespace Math;
diff --git a/Software/PC_Application/Traces/Math/tdr.cpp b/Software/PC_Application/Traces/Math/tdr.cpp
index 71d51bf..9ce2231 100644
--- a/Software/PC_Application/Traces/Math/tdr.cpp
+++ b/Software/PC_Application/Traces/Math/tdr.cpp
@@ -2,11 +2,12 @@
 
 #include "Traces/fftcomplex.h"
 #include "ui_tdrdialog.h"
+#include "ui_tdrexplanationwidget.h"
+#include "Util/util.h"
+
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QDebug>
-#include "ui_tdrexplanationwidget.h"
-#include "Util/util.h"
 
 using namespace Math;
 using namespace std;
diff --git a/Software/PC_Application/Traces/Math/timegate.cpp b/Software/PC_Application/Traces/Math/timegate.cpp
index bae7e35..ebbe22f 100644
--- a/Software/PC_Application/Traces/Math/timegate.cpp
+++ b/Software/PC_Application/Traces/Math/timegate.cpp
@@ -1,16 +1,19 @@
 #include "timegate.h"
-#include <QWidget>
-#include <QDialog>
+
 #include "ui_timegatedialog.h"
 #include "ui_timegateexplanationwidget.h"
 #include "preferences.h"
-#include <QPainter>
 #include "Util/util.h"
 #include "Traces/fftcomplex.h"
 #include "Util/util.h"
-#include <QMouseEvent>
 #include "unit.h"
 
+#include <QWidget>
+#include <QDialog>
+#include <QPainter>
+#include <QMouseEvent>
+
+
 Math::TimeGate::TimeGate()
 {
     bandpass = true;
diff --git a/Software/PC_Application/Traces/Math/tracemath.h b/Software/PC_Application/Traces/Math/tracemath.h
index 8e38bf0..cce935f 100644
--- a/Software/PC_Application/Traces/Math/tracemath.h
+++ b/Software/PC_Application/Traces/Math/tracemath.h
@@ -1,11 +1,11 @@
 #ifndef TRACEMATH_H
 #define TRACEMATH_H
 
+#include "savable.h"
+
 #include <QObject>
 #include <vector>
 #include <complex>
-#include "savable.h"
-
 /*
  * How to implement a new type of math operation:
  * 1. Create your new math operation class by deriving from this class. Put the new class in the namespace
diff --git a/Software/PC_Application/Traces/Math/windowfunction.cpp b/Software/PC_Application/Traces/Math/windowfunction.cpp
index 5790043..c2f9804 100644
--- a/Software/PC_Application/Traces/Math/windowfunction.cpp
+++ b/Software/PC_Application/Traces/Math/windowfunction.cpp
@@ -1,10 +1,12 @@
 #include "windowfunction.h"
+
+#include "CustomWidgets/siunitedit.h"
 #define _USE_MATH_DEFINES
+
 #include <math.h>
 #include <QComboBox>
 #include <QLabel>
 #include <QFormLayout>
-#include "CustomWidgets/siunitedit.h"
 #include <QDebug>
 
 QString WindowFunction::typeToName(WindowFunction::Type type)
diff --git a/Software/PC_Application/Traces/Math/windowfunction.h b/Software/PC_Application/Traces/Math/windowfunction.h
index e66577e..79c96a0 100644
--- a/Software/PC_Application/Traces/Math/windowfunction.h
+++ b/Software/PC_Application/Traces/Math/windowfunction.h
@@ -1,10 +1,11 @@
 #ifndef WINDOWFUNCTION_H
 #define WINDOWFUNCTION_H
 
+#include "savable.h"
+
 #include <QWidget>
 #include <complex>
 #include <vector>
-#include "savable.h"
 
 class WindowFunction : public QObject, public Savable
 {
diff --git a/Software/PC_Application/Traces/fftcomplex.cpp b/Software/PC_Application/Traces/fftcomplex.cpp
index 9846004..6c07ae3 100644
--- a/Software/PC_Application/Traces/fftcomplex.cpp
+++ b/Software/PC_Application/Traces/fftcomplex.cpp
@@ -21,11 +21,13 @@
  *   Software.
  */
 
+
+#include "fftcomplex.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <stdexcept>
 #include <utility>
-#include "fftcomplex.h"
 #include <algorithm>
 
 using std::complex;
diff --git a/Software/PC_Application/Traces/sparamtraceselector.h b/Software/PC_Application/Traces/sparamtraceselector.h
index d90560e..c9da0db 100644
--- a/Software/PC_Application/Traces/sparamtraceselector.h
+++ b/Software/PC_Application/Traces/sparamtraceselector.h
@@ -1,8 +1,9 @@
 #ifndef SPARAMTRACESELECTOR_H
 #define SPARAMTRACESELECTOR_H
 
-#include <QWidget>
 #include "tracemodel.h"
+
+#include <QWidget>
 #include <QComboBox>
 
 class SparamTraceSelector : public QWidget
diff --git a/Software/PC_Application/Traces/trace.cpp b/Software/PC_Application/Traces/trace.cpp
index 049ba03..38e5408 100644
--- a/Software/PC_Application/Traces/trace.cpp
+++ b/Software/PC_Application/Traces/trace.cpp
@@ -1,12 +1,14 @@
 #include "trace.h"
-#include <math.h>
+
 #include "fftcomplex.h"
+#include "Util/util.h"
+#include "Marker/marker.h"
+
+#include <math.h>
 #include <QDebug>
 #include <QScrollBar>
 #include <QSettings>
 #include <functional>
-#include "Util/util.h"
-#include "Marker/marker.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/Traces/trace.h b/Software/PC_Application/Traces/trace.h
index d6bc401..124b43d 100644
--- a/Software/PC_Application/Traces/trace.h
+++ b/Software/PC_Application/Traces/trace.h
@@ -1,15 +1,16 @@
 #ifndef TRACE_H
 #define TRACE_H
 
+#include "touchstone.h"
+#include "csv.h"
+#include "Device/device.h"
+#include "Math/tracemath.h"
+
 #include <QObject>
 #include <complex>
 #include <map>
 #include <QColor>
 #include <set>
-#include "touchstone.h"
-#include "csv.h"
-#include "Device/device.h"
-#include "Math/tracemath.h"
 
 class Marker;
 
diff --git a/Software/PC_Application/Traces/tracecsvexport.cpp b/Software/PC_Application/Traces/tracecsvexport.cpp
index 72e3ccd..55eeb99 100644
--- a/Software/PC_Application/Traces/tracecsvexport.cpp
+++ b/Software/PC_Application/Traces/tracecsvexport.cpp
@@ -1,9 +1,12 @@
 #include "tracecsvexport.h"
+
 #include "ui_tracecsvexport.h"
+#include "csv.h"
+
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QFileDialog>
-#include "csv.h"
+
 
 using namespace std;
 
diff --git a/Software/PC_Application/Traces/tracecsvexport.h b/Software/PC_Application/Traces/tracecsvexport.h
index 2325eda..9085089 100644
--- a/Software/PC_Application/Traces/tracecsvexport.h
+++ b/Software/PC_Application/Traces/tracecsvexport.h
@@ -1,9 +1,10 @@
 #ifndef TRACECSVEXPORT_H
 #define TRACECSVEXPORT_H
 
-#include <QDialog>
 #include "tracemodel.h"
 
+#include <QDialog>
+
 namespace Ui {
 class TraceCSVExport;
 }
diff --git a/Software/PC_Application/Traces/traceeditdialog.cpp b/Software/PC_Application/Traces/traceeditdialog.cpp
index e1e3bc1..0f9e21d 100644
--- a/Software/PC_Application/Traces/traceeditdialog.cpp
+++ b/Software/PC_Application/Traces/traceeditdialog.cpp
@@ -1,10 +1,12 @@
 #include "traceeditdialog.h"
+
 #include "ui_traceeditdialog.h"
-#include <QColorDialog>
-#include <QFileDialog>
 #include "ui_newtracemathdialog.h"
 #include "Math/tdr.h"
 
+#include <QColorDialog>
+#include <QFileDialog>
+
 namespace Ui {
 class NewTraceMathDialog;
 }
diff --git a/Software/PC_Application/Traces/traceeditdialog.h b/Software/PC_Application/Traces/traceeditdialog.h
index a590548..bce9ae7 100644
--- a/Software/PC_Application/Traces/traceeditdialog.h
+++ b/Software/PC_Application/Traces/traceeditdialog.h
@@ -1,8 +1,9 @@
 #ifndef TRACEEDITDIALOG_H
 #define TRACEEDITDIALOG_H
 
-#include <QDialog>
 #include "trace.h"
+
+#include <QDialog>
 #include <QAbstractTableModel>
 
 namespace Ui {
diff --git a/Software/PC_Application/Traces/traceimportdialog.cpp b/Software/PC_Application/Traces/traceimportdialog.cpp
index 4f574fc..467f6df 100644
--- a/Software/PC_Application/Traces/traceimportdialog.cpp
+++ b/Software/PC_Application/Traces/traceimportdialog.cpp
@@ -1,5 +1,7 @@
 #include "traceimportdialog.h"
+
 #include "ui_traceimportdialog.h"
+
 #include <QAbstractTableModel>
 #include <QObject>
 #include <QModelIndex>
diff --git a/Software/PC_Application/Traces/traceimportdialog.h b/Software/PC_Application/Traces/traceimportdialog.h
index 19dc5e1..1cabf20 100644
--- a/Software/PC_Application/Traces/traceimportdialog.h
+++ b/Software/PC_Application/Traces/traceimportdialog.h
@@ -1,8 +1,9 @@
 #ifndef TRACEIMPORTDIALOG_H
 #define TRACEIMPORTDIALOG_H
 
-#include <QDialog>
 #include "tracemodel.h"
+
+#include <QDialog>
 #include <vector>
 
 namespace Ui {
diff --git a/Software/PC_Application/Traces/tracemodel.cpp b/Software/PC_Application/Traces/tracemodel.cpp
index 048014d..78f293f 100644
--- a/Software/PC_Application/Traces/tracemodel.cpp
+++ b/Software/PC_Application/Traces/tracemodel.cpp
@@ -1,4 +1,5 @@
 #include "tracemodel.h"
+
 #include <QIcon>
 #include <QDebug>
 
diff --git a/Software/PC_Application/Traces/tracemodel.h b/Software/PC_Application/Traces/tracemodel.h
index 6b57b1c..4017c4d 100644
--- a/Software/PC_Application/Traces/tracemodel.h
+++ b/Software/PC_Application/Traces/tracemodel.h
@@ -1,11 +1,12 @@
 #ifndef TRACEMODEL_H
 #define TRACEMODEL_H
 
-#include <QAbstractTableModel>
-#include "trace.h"
-#include <vector>
 #include "Device/device.h"
 #include "savable.h"
+#include "trace.h"
+
+#include <QAbstractTableModel>
+#include <vector>
 
 class MarkerModel;
 
diff --git a/Software/PC_Application/Traces/traceplot.cpp b/Software/PC_Application/Traces/traceplot.cpp
index af3bde2..eb15c13 100644
--- a/Software/PC_Application/Traces/traceplot.cpp
+++ b/Software/PC_Application/Traces/traceplot.cpp
@@ -1,11 +1,13 @@
 #include "traceplot.h"
+
 #include "Marker/marker.h"
+#include "unit.h"
+#include "Marker/markermodel.h"
 #include "preferences.h"
+
 #include <QPainter>
 #include <QMimeData>
 #include <QDebug>
-#include "unit.h"
-#include "Marker/markermodel.h"
 
 std::set<TracePlot*> TracePlot::plots;
 
diff --git a/Software/PC_Application/Traces/traceplot.h b/Software/PC_Application/Traces/traceplot.h
index 65ccfc4..557b987 100644
--- a/Software/PC_Application/Traces/traceplot.h
+++ b/Software/PC_Application/Traces/traceplot.h
@@ -1,13 +1,14 @@
 #ifndef TRACEPLOT_H
 #define TRACEPLOT_H
 
-#include <QWidget>
 #include "tracemodel.h"
+#include "savable.h"
+
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QTime>
 #include <QLabel>
-#include "savable.h"
+#include <QWidget>
 
 class TracePlot : public QWidget, public Savable
 {
diff --git a/Software/PC_Application/Traces/tracesmithchart.cpp b/Software/PC_Application/Traces/tracesmithchart.cpp
index 9ece00c..dd6b551 100644
--- a/Software/PC_Application/Traces/tracesmithchart.cpp
+++ b/Software/PC_Application/Traces/tracesmithchart.cpp
@@ -1,14 +1,16 @@
 #include "tracesmithchart.h"
-#include <QPainter>
-#include <array>
-#include <math.h>
+
 #include "Marker/marker.h"
-#include <QDebug>
 #include "preferences.h"
 #include "ui_smithchartdialog.h"
 #include "unit.h"
 #include "QFileDialog"
 
+#include <QPainter>
+#include <array>
+#include <math.h>
+#include <QDebug>
+
 using namespace std;
 
 TraceSmithChart::TraceSmithChart(TraceModel &model, QWidget *parent)
diff --git a/Software/PC_Application/Traces/tracesmithchart.h b/Software/PC_Application/Traces/tracesmithchart.h
index 5a9924e..f5de4c4 100644
--- a/Software/PC_Application/Traces/tracesmithchart.h
+++ b/Software/PC_Application/Traces/tracesmithchart.h
@@ -2,6 +2,7 @@
 #define TRACESMITHCHART_H
 
 #include "traceplot.h"
+
 #include <QPen>
 #include <QPainterPath>
 #include <QTransform>
diff --git a/Software/PC_Application/Traces/tracetouchstoneexport.cpp b/Software/PC_Application/Traces/tracetouchstoneexport.cpp
index f426487..c0ca130 100644
--- a/Software/PC_Application/Traces/tracetouchstoneexport.cpp
+++ b/Software/PC_Application/Traces/tracetouchstoneexport.cpp
@@ -1,8 +1,10 @@
 #include "tracetouchstoneexport.h"
+
 #include "ui_tracetouchstoneexport.h"
+#include "touchstone.h"
+
 #include <QDebug>
 #include <QFileDialog>
-#include "touchstone.h"
 #include <QPushButton>
 
 TraceTouchstoneExport::TraceTouchstoneExport(TraceModel &model, QWidget *parent) :
diff --git a/Software/PC_Application/Traces/tracetouchstoneexport.h b/Software/PC_Application/Traces/tracetouchstoneexport.h
index 11819ab..e095df2 100644
--- a/Software/PC_Application/Traces/tracetouchstoneexport.h
+++ b/Software/PC_Application/Traces/tracetouchstoneexport.h
@@ -1,9 +1,10 @@
 #ifndef TRACETOUCHSTONEEXPORT_H
 #define TRACETOUCHSTONEEXPORT_H
 
+#include "tracemodel.h"
+
 #include <QDialog>
 #include <QComboBox>
-#include "tracemodel.h"
 #include <QSignalMapper>
 
 namespace Ui {
diff --git a/Software/PC_Application/Traces/tracewidget.cpp b/Software/PC_Application/Traces/tracewidget.cpp
index 4f67fdd..cd7965e 100644
--- a/Software/PC_Application/Traces/tracewidget.cpp
+++ b/Software/PC_Application/Traces/tracewidget.cpp
@@ -1,17 +1,20 @@
 #include "tracewidget.h"
+
 #include "ui_tracewidget.h"
-#include "trace.h"
-#include <QKeyEvent>
 #include "traceeditdialog.h"
 #include "traceimportdialog.h"
 #include "tracetouchstoneexport.h"
+#include "trace.h"
+#include "unit.h"
+#include "Util/util.h"
+
+#include <QKeyEvent>
 #include <QFileDialog>
 #include <QDrag>
 #include <QMimeData>
 #include <QDebug>
 #include <QMenu>
-#include "unit.h"
-#include "Util/util.h"
+
 
 TraceWidget::TraceWidget(TraceModel &model, QWidget *parent) :
     QWidget(parent),
diff --git a/Software/PC_Application/Traces/tracewidget.h b/Software/PC_Application/Traces/tracewidget.h
index 336849e..a668276 100644
--- a/Software/PC_Application/Traces/tracewidget.h
+++ b/Software/PC_Application/Traces/tracewidget.h
@@ -1,10 +1,11 @@
 #ifndef TRACEWIDGET_H
 #define TRACEWIDGET_H
 
-#include <QWidget>
 #include "tracemodel.h"
 #include "scpi.h"
 
+#include <QWidget>
+
 namespace Ui {
 class TraceWidget;
 }
diff --git a/Software/PC_Application/Traces/tracexyplot.cpp b/Software/PC_Application/Traces/tracexyplot.cpp
index 5c7833d..fb5fa0b 100644
--- a/Software/PC_Application/Traces/tracexyplot.cpp
+++ b/Software/PC_Application/Traces/tracexyplot.cpp
@@ -1,16 +1,18 @@
 #include "tracexyplot.h"
-#include <QGridLayout>
+
 #include "trace.h"
-#include <cmath>
-#include <QFrame>
+#include "CustomWidgets/informationbox.h"
 #include "Marker/marker.h"
 #include "xyplotaxisdialog.h"
-#include <preferences.h>
-#include <QPainter>
 #include "Util/util.h"
 #include "unit.h"
+#include "preferences.h"
+
+#include <QGridLayout>
+#include <cmath>
+#include <QFrame>
+#include <QPainter>
 #include <QDebug>
-#include "CustomWidgets/informationbox.h"
 #include <QFileDialog>
 
 using namespace std;
diff --git a/Software/PC_Application/Traces/tracexyplot.h b/Software/PC_Application/Traces/tracexyplot.h
index 969bf65..cf7b1a2 100644
--- a/Software/PC_Application/Traces/tracexyplot.h
+++ b/Software/PC_Application/Traces/tracexyplot.h
@@ -2,6 +2,7 @@
 #define TRACEXYPLOT_H
 
 #include "traceplot.h"
+
 #include <set>
 
 class TraceXYPlot : public TracePlot
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.cpp b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
index 0a9c381..5c57bf7 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.cpp
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.cpp
@@ -1,5 +1,7 @@
 #include "xyplotaxisdialog.h"
+
 #include "ui_xyplotaxisdialog.h"
+
 #include <QStandardItemModel>
 
 using namespace std;
diff --git a/Software/PC_Application/Traces/xyplotaxisdialog.h b/Software/PC_Application/Traces/xyplotaxisdialog.h
index 0a75284..8daa8df 100644
--- a/Software/PC_Application/Traces/xyplotaxisdialog.h
+++ b/Software/PC_Application/Traces/xyplotaxisdialog.h
@@ -1,9 +1,10 @@
 #ifndef XYPLOTAXISDIALOG_H
 #define XYPLOTAXISDIALOG_H
 
-#include <QDialog>
 #include "tracexyplot.h"
 
+#include <QDialog>
+
 namespace Ui {
 class XYplotAxisDialog;
 }
diff --git a/Software/PC_Application/VNA/Deembedding/deembedding.cpp b/Software/PC_Application/VNA/Deembedding/deembedding.cpp
index f7c4d83..8dac4a0 100644
--- a/Software/PC_Application/VNA/Deembedding/deembedding.cpp
+++ b/Software/PC_Application/VNA/Deembedding/deembedding.cpp
@@ -1,9 +1,11 @@
 #include "deembedding.h"
+
 #include "deembeddingdialog.h"
-#include <QDebug>
 #include "ui_measurementdialog.h"
 #include "Traces/sparamtraceselector.h"
 
+#include <QDebug>
+
 using namespace std;
 
 void Deembedding::configure()
diff --git a/Software/PC_Application/VNA/Deembedding/deembedding.h b/Software/PC_Application/VNA/Deembedding/deembedding.h
index 7a7d2ba..462d85f 100644
--- a/Software/PC_Application/VNA/Deembedding/deembedding.h
+++ b/Software/PC_Application/VNA/Deembedding/deembedding.h
@@ -2,10 +2,11 @@
 #define DEEMBEDDING_H
 
 #include "deembeddingoption.h"
-#include <vector>
-#include <QObject>
 #include "savable.h"
 #include "Traces/tracemodel.h"
+
+#include <vector>
+#include <QObject>
 #include <QDialog>
 #include <QComboBox>
 
diff --git a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.cpp b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.cpp
index 5548f2d..b296c96 100644
--- a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.cpp
+++ b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.cpp
@@ -1,6 +1,8 @@
 #include "deembeddingdialog.h"
+
 #include "ui_deembeddingdialog.h"
 #include "deembeddingoption.h"
+
 #include <QMenu>
 
 DeembeddingDialog::DeembeddingDialog(Deembedding *d, QWidget *parent) :
diff --git a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.h b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.h
index 881abe7..1ba6696 100644
--- a/Software/PC_Application/VNA/Deembedding/deembeddingdialog.h
+++ b/Software/PC_Application/VNA/Deembedding/deembeddingdialog.h
@@ -1,9 +1,10 @@
 #ifndef DEEMBEDDINGDIALOG_H
 #define DEEMBEDDINGDIALOG_H
 
-#include <QDialog>
 #include "deembeddingoption.h"
 #include "deembedding.h"
+
+#include <QDialog>
 #include <QAbstractTableModel>
 
 namespace Ui {
diff --git a/Software/PC_Application/VNA/Deembedding/deembeddingoption.h b/Software/PC_Application/VNA/Deembedding/deembeddingoption.h
index 337884a..86177a0 100644
--- a/Software/PC_Application/VNA/Deembedding/deembeddingoption.h
+++ b/Software/PC_Application/VNA/Deembedding/deembeddingoption.h
@@ -1,10 +1,11 @@
 #ifndef DEEMBEDDINGOPTION_H
 #define DEEMBEDDINGOPTION_H
 
-#include <QWidget>
 #include "savable.h"
 #include "Device/device.h"
 
+#include <QWidget>
+
 class DeembeddingOption : public QObject, public Savable
 {
     Q_OBJECT
diff --git a/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.cpp b/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.cpp
index c93db74..5a9b897 100644
--- a/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.cpp
+++ b/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.cpp
@@ -1,4 +1,5 @@
 #include "manualdeembeddingdialog.h"
+
 #include "ui_manualdeembeddingdialog.h"
 #include "Traces/sparamtraceselector.h"
 
diff --git a/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.h b/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.h
index 9771a63..ae7adf8 100644
--- a/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.h
+++ b/Software/PC_Application/VNA/Deembedding/manualdeembeddingdialog.h
@@ -1,10 +1,11 @@
 #ifndef MANUALDEEMBEDDINGDIALOG_H
 #define MANUALDEEMBEDDINGDIALOG_H
 
-#include <QDialog>
 #include "Traces/tracemodel.h"
 #include "deembedding.h"
 
+#include <QDialog>
+
 namespace Ui {
 class ManualDeembeddingDialog;
 }
diff --git a/Software/PC_Application/VNA/Deembedding/matchingnetwork.cpp b/Software/PC_Application/VNA/Deembedding/matchingnetwork.cpp
index f5b3bfa..f6592c0 100644
--- a/Software/PC_Application/VNA/Deembedding/matchingnetwork.cpp
+++ b/Software/PC_Application/VNA/Deembedding/matchingnetwork.cpp
@@ -1,7 +1,8 @@
 #include "matchingnetwork.h"
-#include "ui_matchingnetworkdialog.h"
-#include <QDialog>
 
+#include "ui_matchingnetworkdialog.h"
+
+#include <QDialog>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QSpacerItem>
diff --git a/Software/PC_Application/VNA/Deembedding/matchingnetwork.h b/Software/PC_Application/VNA/Deembedding/matchingnetwork.h
index 8f2bbb8..7ea983e 100644
--- a/Software/PC_Application/VNA/Deembedding/matchingnetwork.h
+++ b/Software/PC_Application/VNA/Deembedding/matchingnetwork.h
@@ -1,13 +1,15 @@
 #ifndef MATCHINGNETWORK_H
 #define MATCHINGNETWORK_H
 
-#include <QWidget>
-#include <CustomWidgets/siunitedit.h>
+#include "CustomWidgets/siunitedit.h"
 #include "deembeddingoption.h"
-#include <vector>
 #include "Tools/parameters.h"
 #include "savable.h"
 
+#include <QWidget>
+#include <vector>
+
+
 class MatchingComponent : public QFrame, public Savable
 {
     Q_OBJECT
diff --git a/Software/PC_Application/VNA/Deembedding/portextension.cpp b/Software/PC_Application/VNA/Deembedding/portextension.cpp
index 6346a23..8edbb80 100644
--- a/Software/PC_Application/VNA/Deembedding/portextension.cpp
+++ b/Software/PC_Application/VNA/Deembedding/portextension.cpp
@@ -1,9 +1,11 @@
 #include "portextension.h"
+
 #include "ui_portextensioneditdialog.h"
+#include "Util/util.h"
+
 #include <QCheckBox>
 #include <cmath>
 #include <QDebug>
-#include "Util/util.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/VNA/Deembedding/portextension.h b/Software/PC_Application/VNA/Deembedding/portextension.h
index 53e4e81..28fd17e 100644
--- a/Software/PC_Application/VNA/Deembedding/portextension.h
+++ b/Software/PC_Application/VNA/Deembedding/portextension.h
@@ -1,13 +1,14 @@
 #ifndef PORTEXTENSION_H
 #define PORTEXTENSION_H
 
-#include <QObject>
 #include "../VNA_embedded/Application/Communication/Protocol.hpp"
-#include <QToolBar>
 #include "Calibration/calkit.h"
-#include <QMessageBox>
 #include "deembeddingoption.h"
 
+#include <QObject>
+#include <QMessageBox>
+#include <QToolBar>
+
 namespace Ui {
 class PortExtensionEditDialog;
 }
diff --git a/Software/PC_Application/VNA/Deembedding/twothru.cpp b/Software/PC_Application/VNA/Deembedding/twothru.cpp
index 63fd06b..ed1e9e8 100644
--- a/Software/PC_Application/VNA/Deembedding/twothru.cpp
+++ b/Software/PC_Application/VNA/Deembedding/twothru.cpp
@@ -1,10 +1,12 @@
 #include "twothru.h"
+
 #include "CustomWidgets/informationbox.h"
 #include "ui_twothrudialog.h"
 #include "Traces/fftcomplex.h"
-#include <QDebug>
 #include "unit.h"
 
+#include <QDebug>
+
 using namespace std;
 
 TwoThru::TwoThru()
diff --git a/Software/PC_Application/VNA/Deembedding/twothru.h b/Software/PC_Application/VNA/Deembedding/twothru.h
index f8c0bdf..0f56cd7 100644
--- a/Software/PC_Application/VNA/Deembedding/twothru.h
+++ b/Software/PC_Application/VNA/Deembedding/twothru.h
@@ -3,6 +3,7 @@
 
 #include "deembeddingoption.h"
 #include "Tools/parameters.h"
+
 #include <complex>
 #include <QMessageBox>
 
diff --git a/Software/PC_Application/VNA/tracewidgetvna.cpp b/Software/PC_Application/VNA/tracewidgetvna.cpp
index 928d14d..2c9a824 100644
--- a/Software/PC_Application/VNA/tracewidgetvna.cpp
+++ b/Software/PC_Application/VNA/tracewidgetvna.cpp
@@ -1,6 +1,5 @@
 #include "tracewidgetvna.h"
 
-#include <QFileDialog>
 #include "Traces/traceimportdialog.h"
 #include "Traces/tracetouchstoneexport.h"
 #include "Traces/tracecsvexport.h"
@@ -8,6 +7,7 @@
 #include "ui_s2pImportOptions.h"
 #include "CustomWidgets/informationbox.h"
 
+#include <QFileDialog>
 #include <QMenu>
 
 TraceWidgetVNA::TraceWidgetVNA(TraceModel &model, Calibration &cal, Deembedding &deembed, QWidget *parent)
diff --git a/Software/PC_Application/VNA/vna.cpp b/Software/PC_Application/VNA/vna.cpp
index 0859876..13b8881 100644
--- a/Software/PC_Application/VNA/vna.cpp
+++ b/Software/PC_Application/VNA/vna.cpp
@@ -1,4 +1,26 @@
 #include "vna.h"
+
+#include "unit.h"
+#include "CustomWidgets/toggleswitch.h"
+#include "Device/manualcontroldialog.h"
+#include "Traces/tracemodel.h"
+#include "tracewidgetvna.h"
+#include "Traces/tracesmithchart.h"
+#include "Traces/tracexyplot.h"
+#include "Traces/traceimportdialog.h"
+#include "CustomWidgets/tilewidget.h"
+#include "CustomWidgets/siunitedit.h"
+#include "Traces/Marker/markerwidget.h"
+#include "Tools/impedancematchdialog.h"
+#include "Calibration/calibrationtracedialog.h"
+#include "ui_main.h"
+#include "Device/firmwareupdatedialog.h"
+#include "preferences.h"
+#include "Generator/signalgenwidget.h"
+#include "CustomWidgets/informationbox.h"
+#include "Deembedding/manualdeembeddingdialog.h"
+#include "Calibration/manualcalibrationdialog.h"
+
 #include <QGridLayout>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -19,33 +41,13 @@
 #include <iostream>
 #include <fstream>
 #include <QDateTime>
-#include "unit.h"
-#include <queue>
-#include "CustomWidgets/toggleswitch.h"
-#include "Device/manualcontroldialog.h"
-#include "Traces/tracemodel.h"
-#include "tracewidgetvna.h"
-#include "Traces/tracesmithchart.h"
-#include "Traces/tracexyplot.h"
-#include "Traces/traceimportdialog.h"
-#include "CustomWidgets/tilewidget.h"
-#include "CustomWidgets/siunitedit.h"
 #include <QDockWidget>
-#include "Traces/Marker/markerwidget.h"
-#include "Tools/impedancematchdialog.h"
-#include "Calibration/calibrationtracedialog.h"
-#include "ui_main.h"
-#include "Device/firmwareupdatedialog.h"
-#include "preferences.h"
-#include "Generator/signalgenwidget.h"
+#include <queue>
 #include <QDesktopWidget>
 #include <QApplication>
 #include <QActionGroup>
 #include <QErrorMessage>
-#include "CustomWidgets/informationbox.h"
 #include <QDebug>
-#include "Deembedding/manualdeembeddingdialog.h"
-#include "Calibration/manualcalibrationdialog.h"
 
 VNA::VNA(AppWindow *window)
     : Mode(window, "Vector Network Analyzer"),
diff --git a/Software/PC_Application/VNA/vna.h b/Software/PC_Application/VNA/vna.h
index eccba3f..c78f30a 100644
--- a/Software/PC_Application/VNA/vna.h
+++ b/Software/PC_Application/VNA/vna.h
@@ -1,17 +1,18 @@
 #ifndef VNA_H
 #define VNA_H
 
-#include <QObject>
-#include <QWidget>
 #include "appwindow.h"
 #include "mode.h"
 #include "CustomWidgets/tilewidget.h"
 #include "Device/device.h"
-#include <functional>
 #include "Deembedding/deembedding.h"
 #include "scpi.h"
 #include "Traces/tracewidget.h"
 
+#include <QObject>
+#include <QWidget>
+#include <functional>
+
 class VNA : public Mode, public SCPINode
 {
     Q_OBJECT
diff --git a/Software/PC_Application/about.cpp b/Software/PC_Application/about.cpp
index e6aae1f..874fe21 100644
--- a/Software/PC_Application/about.cpp
+++ b/Software/PC_Application/about.cpp
@@ -1,5 +1,6 @@
-#include "Util/app_common.h"
 #include "about.h"
+
+#include "Util/app_common.h"
 #include "ui_aboutdialog.h"
 
 About About::instance;
diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp
index 011b09d..84eaa70 100644
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@@ -1,4 +1,39 @@
 #include "appwindow.h"
+
+#include "unit.h"
+#include "CustomWidgets/toggleswitch.h"
+#include "Device/manualcontroldialog.h"
+#include "Traces/tracemodel.h"
+#include "Traces/tracewidget.h"
+#include "Traces/tracesmithchart.h"
+#include "Traces/tracexyplot.h"
+#include "Traces/traceimportdialog.h"
+#include "CustomWidgets/tilewidget.h"
+#include "CustomWidgets/siunitedit.h"
+#include "Traces/Marker/markerwidget.h"
+#include "Tools/impedancematchdialog.h"
+#include "Calibration/calibrationtracedialog.h"
+#include "ui_main.h"
+#include "Device/firmwareupdatedialog.h"
+#include "preferences.h"
+#include "Generator/signalgenwidget.h"
+#include "VNA/vna.h"
+#include "Generator/generator.h"
+#include "SpectrumAnalyzer/spectrumanalyzer.h"
+#include "Calibration/sourcecaldialog.h"
+#include "Calibration/receivercaldialog.h"
+#include "Calibration/frequencycaldialog.h"
+#include "CustomWidgets/jsonpickerdialog.h"
+#include "CustomWidgets/informationbox.h"
+#include "Util/app_common.h"
+#include "about.h"
+
+#include <QDockWidget>
+#include <QDesktopWidget>
+#include <QApplication>
+#include <QActionGroup>
+#include <mode.h>
+#include <QDebug>
 #include <QGridLayout>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -19,40 +54,7 @@
 #include <iostream>
 #include <fstream>
 #include <QDateTime>
-#include "unit.h"
-#include "CustomWidgets/toggleswitch.h"
-#include "Device/manualcontroldialog.h"
-#include "Traces/tracemodel.h"
-#include "Traces/tracewidget.h"
-#include "Traces/tracesmithchart.h"
-#include "Traces/tracexyplot.h"
-#include "Traces/traceimportdialog.h"
-#include "CustomWidgets/tilewidget.h"
-#include "CustomWidgets/siunitedit.h"
-#include <QDockWidget>
-#include "Traces/Marker/markerwidget.h"
-#include "Tools/impedancematchdialog.h"
-#include "Calibration/calibrationtracedialog.h"
-#include "ui_main.h"
-#include "Device/firmwareupdatedialog.h"
-#include "preferences.h"
-#include "Generator/signalgenwidget.h"
-#include <QDesktopWidget>
-#include <QApplication>
-#include <QActionGroup>
-#include <mode.h>
-#include "VNA/vna.h"
-#include "Generator/generator.h"
-#include "SpectrumAnalyzer/spectrumanalyzer.h"
-#include "Calibration/sourcecaldialog.h"
-#include "Calibration/receivercaldialog.h"
-#include "Calibration/frequencycaldialog.h"
-#include <QDebug>
-#include "CustomWidgets/jsonpickerdialog.h"
-#include "CustomWidgets/informationbox.h"
 #include <QCommandLineParser>
-#include "Util/app_common.h"
-#include "about.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/appwindow.h b/Software/PC_Application/appwindow.h
index f011243..7af4cbd 100644
--- a/Software/PC_Application/appwindow.h
+++ b/Software/PC_Application/appwindow.h
@@ -1,27 +1,28 @@
 #ifndef APPWINDOW_H
 #define APPWINDOW_H
 
+#include "Device/device.h"
+#include "Traces/traceplot.h"
+#include "Calibration/calibration.h"
+#include "Traces/tracemodel.h"
+#include "Traces/Marker/markermodel.h"
+#include "averaging.h"
+#include "Device/devicelog.h"
+#include "preferences.h"
+#include "scpi.h"
+#include "tcpserver.h"
+#include "Device/manualcontroldialog.h"
+
 #include <QWidget>
 #include <QMainWindow>
 #include <QGridLayout>
 #include <QComboBox>
 #include <QStackedWidget>
-#include "Device/device.h"
-#include "Traces/traceplot.h"
-#include "Calibration/calibration.h"
-#include <QProgressDialog>
-#include "Traces/tracemodel.h"
-#include "Traces/Marker/markermodel.h"
-#include "averaging.h"
-#include "Device/devicelog.h"
-#include "preferences.h"
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QLabel>
 #include <QCommandLineParser>
-#include "scpi.h"
-#include "tcpserver.h"
-#include "Device/manualcontroldialog.h"
+#include <QProgressDialog>
 
 namespace Ui {
 class MainWindow;
diff --git a/Software/PC_Application/averaging.h b/Software/PC_Application/averaging.h
index 7745b3b..7f5a768 100644
--- a/Software/PC_Application/averaging.h
+++ b/Software/PC_Application/averaging.h
@@ -1,8 +1,8 @@
 #ifndef AVERAGING_H
 #define AVERAGING_H
 
-
 #include "Device/device.h"
+
 #include <array>
 #include <deque>
 #include <complex>
diff --git a/Software/PC_Application/csv.cpp b/Software/PC_Application/csv.cpp
index 83084df..673a2f1 100644
--- a/Software/PC_Application/csv.cpp
+++ b/Software/PC_Application/csv.cpp
@@ -1,4 +1,5 @@
 #include "csv.h"
+
 #include <exception>
 #include <fstream>
 #include <QStringList>
diff --git a/Software/PC_Application/main.cpp b/Software/PC_Application/main.cpp
index 51accd6..e2ad0dc 100644
--- a/Software/PC_Application/main.cpp
+++ b/Software/PC_Application/main.cpp
@@ -1,14 +1,11 @@
-#include <iostream>
-
-#include <unistd.h>
-#include <QtWidgets/QApplication>
 #include "appwindow.h"
-
 #include "Calibration/calkit.h"
 #include "touchstone.h"
 
+#include <iostream>
+#include <unistd.h>
+#include <QtWidgets/QApplication>
 #include <signal.h>
-
 #include <complex>
 
 static QApplication *app;
diff --git a/Software/PC_Application/mode.cpp b/Software/PC_Application/mode.cpp
index 12e32f6..220e2e8 100644
--- a/Software/PC_Application/mode.cpp
+++ b/Software/PC_Application/mode.cpp
@@ -1,8 +1,9 @@
 #include "mode.h"
 
+#include "ui_main.h"
+
 #include <QPushButton>
 #include <QSettings>
-#include "ui_main.h"
 #include <QDebug>
 #include <QFileDialog>
 
diff --git a/Software/PC_Application/mode.h b/Software/PC_Application/mode.h
index b5219d6..08c2212 100644
--- a/Software/PC_Application/mode.h
+++ b/Software/PC_Application/mode.h
@@ -1,14 +1,15 @@
 #ifndef MODE_H
 #define MODE_H
 
+#include "appwindow.h"
+#include "savable.h"
+
 #include <QString>
 #include <QWidget>
 #include <QButtonGroup>
 #include <QToolBar>
 #include <QDockWidget>
 #include <set>
-#include "appwindow.h"
-#include "savable.h"
 
 class Mode : public QObject, public Savable
 {
diff --git a/Software/PC_Application/preferences.cpp b/Software/PC_Application/preferences.cpp
index 738d10e..2ba2925 100644
--- a/Software/PC_Application/preferences.cpp
+++ b/Software/PC_Application/preferences.cpp
@@ -1,11 +1,13 @@
 #include "preferences.h"
+
 #include "ui_preferencesdialog.h"
+#include "CustomWidgets/informationbox.h"
+
 #include <QSettings>
 #include <QPushButton>
 #include <QMessageBox>
 #include <map>
 #include <QDebug>
-#include "CustomWidgets/informationbox.h"
 
 using namespace std;
 
diff --git a/Software/PC_Application/preferences.h b/Software/PC_Application/preferences.h
index ae00929..d72637c 100644
--- a/Software/PC_Application/preferences.h
+++ b/Software/PC_Application/preferences.h
@@ -1,10 +1,11 @@
 #ifndef PREFERENCESDIALOG_H
 #define PREFERENCESDIALOG_H
 
+#include "Util/qpointervariant.h"
+
 #include <QDialog>
 #include <QVariant>
 #include <exception>
-#include "Util/qpointervariant.h"
 
 enum GraphDomainChangeBehavior {
     RemoveChangedTraces = 0,
diff --git a/Software/PC_Application/scpi.cpp b/Software/PC_Application/scpi.cpp
index a788905..a89e2d2 100644
--- a/Software/PC_Application/scpi.cpp
+++ b/Software/PC_Application/scpi.cpp
@@ -1,4 +1,5 @@
 #include "scpi.h"
+
 #include <QDebug>
 
 SCPI::SCPI() :
diff --git a/Software/PC_Application/tcpserver.cpp b/Software/PC_Application/tcpserver.cpp
index c0655af..a65f830 100644
--- a/Software/PC_Application/tcpserver.cpp
+++ b/Software/PC_Application/tcpserver.cpp
@@ -1,4 +1,5 @@
 #include "tcpserver.h"
+
 #include <QDebug>
 
 TCPServer::TCPServer(int port)
diff --git a/Software/PC_Application/touchstone.cpp b/Software/PC_Application/touchstone.cpp
index 8b22cac..555667e 100644
--- a/Software/PC_Application/touchstone.cpp
+++ b/Software/PC_Application/touchstone.cpp
@@ -1,4 +1,7 @@
 #include "touchstone.h"
+
+#include "Util/util.h"
+
 #include <limits>
 #include <algorithm>
 #include <fstream>
@@ -6,7 +9,6 @@
 #include <cmath>
 #include <cctype>
 #include <string>
-#include "Util/util.h"
 #include <QDebug>
 
 using namespace std;
diff --git a/Software/PC_Application/unit.cpp b/Software/PC_Application/unit.cpp
index 08d154a..0b487af 100644
--- a/Software/PC_Application/unit.cpp
+++ b/Software/PC_Application/unit.cpp
@@ -1,4 +1,5 @@
 #include "unit.h"
+
 #include <math.h>
 #include <sstream>
 #include <iomanip>