diff --git a/companion/src/firmwares/helpersdata.h b/companion/src/firmwares/helpersdata.h
index 850bcb8a7..29273e5f0 100644
--- a/companion/src/firmwares/helpersdata.h
+++ b/companion/src/firmwares/helpersdata.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _HELPERS_DATA_H_
-#define _HELPERS_DATA_H_
+#pragma once
 
 #include <QtCore>
 
@@ -49,5 +48,3 @@ class FieldRange
     QString prefix;
     QString unit;
 };
-
-#endif // _HELPERS_DATA_H_
diff --git a/companion/src/firmwares/sensordata.h b/companion/src/firmwares/sensordata.h
index 5870d9649..5e888d749 100644
--- a/companion/src/firmwares/sensordata.h
+++ b/companion/src/firmwares/sensordata.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef SENSORDATA_H
-#define SENSORDATA_H
+#pragma once
 
 #include "helpersdata.h"
 
@@ -214,5 +213,3 @@ class SensorData {
     static AbstractStaticItemModel * unitItemModel();
     static PrecisionItemModel * precisionItemModel();
 };
-
-#endif // SENSORDATA_H
diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h
index 2ed0ab2e8..3f04bebf6 100644
--- a/companion/src/modeledit/telemetry.h
+++ b/companion/src/modeledit/telemetry.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _TELEMETRY_H_
-#define _TELEMETRY_H_
+#pragma once
 
 #include "modeledit.h"
 #include "eeprominterface.h"
@@ -180,5 +179,3 @@ class TelemetryPanel : public ModelPanel
     void connectItemModelEvents(const int id);
     inline bool isLocked() { return lock; }
 };
-
-#endif // _TELEMETRY_H_
diff --git a/companion/src/modelprinter.h b/companion/src/modelprinter.h
index 639eddb0e..ea2eab2d8 100644
--- a/companion/src/modelprinter.h
+++ b/companion/src/modelprinter.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _MODELPRINTER_H_
-#define _MODELPRINTER_H_
+#pragma once
 
 #include <QString>
 #include <QStringList>
@@ -132,5 +131,3 @@ class ModelPrinter: public QObject
     const ModelData & model;
 
 };
-
-#endif // _MODELPRINTER_H_
diff --git a/companion/src/shared/autobitsetcheckbox.h b/companion/src/shared/autobitsetcheckbox.h
index 6274e0117..ea86db956 100644
--- a/companion/src/shared/autobitsetcheckbox.h
+++ b/companion/src/shared/autobitsetcheckbox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef AUTOBITSETCHECKBOX_H
-#define AUTOBITSETCHECKBOX_H
+#pragma once
 
 #include <QCheckBox>
 #include "genericpanel.h"
@@ -174,5 +173,3 @@ class AutoBitsetCheckBox: public QCheckBox
     bool m_lock = false;
     GenericPanel * m_panel = nullptr;
 };
-
-#endif // AUTOBITSETCHECKBOX_H
diff --git a/companion/src/shared/autocheckbox.h b/companion/src/shared/autocheckbox.h
index d65753168..f5b233fed 100644
--- a/companion/src/shared/autocheckbox.h
+++ b/companion/src/shared/autocheckbox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _AUTOCHECKBOX_H_
-#define _AUTOCHECKBOX_H_
+#pragma once
 
 #include <QCheckBox>
 #include "modeledit/modeledit.h"
@@ -75,5 +74,3 @@ class AutoCheckBox: public QCheckBox
     ModelPanel * panel;
     bool lock;
 };
-
-#endif // _AUTOCHECKBOX_H_
diff --git a/companion/src/shared/autocombobox.h b/companion/src/shared/autocombobox.h
index 158352f97..784abaefa 100644
--- a/companion/src/shared/autocombobox.h
+++ b/companion/src/shared/autocombobox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _AUTOCOMBOBOX_H_
-#define _AUTOCOMBOBOX_H_
+#pragma once
 
 #include <QComboBox>
 #include "genericpanel.h"
@@ -137,5 +136,3 @@ class AutoComboBox: public QComboBox
     bool lock = false;
     bool hasModel = false;
 };
-
-#endif // _AUTOCOMBOBOX_H_
diff --git a/companion/src/shared/autodoublespinbox.h b/companion/src/shared/autodoublespinbox.h
index 17188243b..6560b6ea2 100644
--- a/companion/src/shared/autodoublespinbox.h
+++ b/companion/src/shared/autodoublespinbox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _AUTODOUBLESPINBOX_H_
-#define _AUTODOUBLESPINBOX_H_
+#pragma once
 
 #include <QDoubleSpinBox>
 #include "modeledit/modeledit.h"
@@ -97,5 +96,3 @@ class AutoDoubleSpinBox: public QDoubleSpinBox
     ModelPanel * panel;
     bool lock;
 };
-
-#endif // _AUTODOUBLESPINBOX_H_
diff --git a/companion/src/shared/autohexspinbox.h b/companion/src/shared/autohexspinbox.h
index 7db76d2a3..d7df46bd6 100644
--- a/companion/src/shared/autohexspinbox.h
+++ b/companion/src/shared/autohexspinbox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _AUTOHEXSPINBOX_H_
-#define _AUTOHEXSPINBOX_H_
+#pragma once
 
 #include "hexspinbox.h"
 #include "modeledit/modeledit.h"
@@ -68,5 +67,3 @@ class AutoHexSpinBox: public HexSpinBox
     ModelPanel * panel;
     bool lock;
 };
-
-#endif // _AUTOHEXSPINBOX_H_
diff --git a/companion/src/shared/autolineedit.h b/companion/src/shared/autolineedit.h
index e8567c803..0f888e6df 100644
--- a/companion/src/shared/autolineedit.h
+++ b/companion/src/shared/autolineedit.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _AUTOLINEEDIT_H_
-#define _AUTOLINEEDIT_H_
+#pragma once
 
 #include <QLineEdit>
 #include <QRegExpValidator>
@@ -99,5 +98,3 @@ class AutoLineEdit: public QLineEdit
     GenericPanel * panel;
     bool lock;
 };
-
-#endif // _AUTOLINEEDIT_H_
diff --git a/companion/src/shared/autoprecisioncombobox.h b/companion/src/shared/autoprecisioncombobox.h
index 4e143f286..e93059199 100644
--- a/companion/src/shared/autoprecisioncombobox.h
+++ b/companion/src/shared/autoprecisioncombobox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _AUTOPRECISIONCOMBOBOX_H_
-#define _AUTOPRECISIONCOMBOBOX_H_
+#pragma once
 
 #include "genericpanel.h"
 
@@ -253,5 +252,3 @@ class AutoPrecisionComboBox: public QComboBox
     QString m_suffix = "";
     bool m_lock = false;
 };
-
-#endif // _AUTOPRECISIONCOMBOBOX_H_
diff --git a/companion/src/shared/genericpanel.h b/companion/src/shared/genericpanel.h
index 5351355b6..bbb9b7254 100644
--- a/companion/src/shared/genericpanel.h
+++ b/companion/src/shared/genericpanel.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _GENERICPANEL_H_
-#define _GENERICPANEL_H_
+#pragma once
 
 #include <QWidget>
 
@@ -65,5 +64,3 @@ class GenericPanel : public QWidget
     void setFocusFilter(QWidget * w);
     void disableMouseScrolling();
 };
-
-#endif // _GENERICPANEL_H_
diff --git a/companion/src/shared/hexspinbox.h b/companion/src/shared/hexspinbox.h
index fc404d98a..204cc8a55 100644
--- a/companion/src/shared/hexspinbox.h
+++ b/companion/src/shared/hexspinbox.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _HEXSPINBOX_H_
-#define _HEXSPINBOX_H_
+#pragma once
 
 #include <QSpinBox>
 
@@ -40,5 +39,3 @@ class HexSpinBox : public QSpinBox
   private:
     QRegExpValidator *validator;
 };
-
-#endif // _HEXSPINBOX_H_
diff --git a/companion/src/shared/verticalscrollarea.h b/companion/src/shared/verticalscrollarea.h
index 36f564dd7..d409a18ca 100644
--- a/companion/src/shared/verticalscrollarea.h
+++ b/companion/src/shared/verticalscrollarea.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _VERTICALSCROLLAREA_H_
-#define _VERTICALSCROLLAREA_H_
+#pragma once
 
 #include <QScrollArea>
 
@@ -36,6 +35,3 @@ class VerticalScrollArea : public QScrollArea
   private:
     GenericPanel * panel;
 };
-
-#endif // _VERTICALSCROLLAREA_H_
-