diff --git a/src/gui/src/Action.h b/src/gui/src/Action.h
index be4c7338a..63c1ff1de 100644
--- a/src/gui/src/Action.h
+++ b/src/gui/src/Action.h
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined(ACTION_H)
-
-#define ACTION_H
+#pragma once
 
 #include "KeySequence.h"
 
@@ -100,5 +98,3 @@ private:
 typedef QList<Action> ActionList;
 
 QTextStream &operator<<(QTextStream &outStream, const Action &action);
-
-#endif
diff --git a/src/gui/src/ActionDialog.h b/src/gui/src/ActionDialog.h
index 373e2ac11..ce40bd69a 100644
--- a/src/gui/src/ActionDialog.h
+++ b/src/gui/src/ActionDialog.h
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined(ACTIONDIALOG_H)
-
-#define ACTIONDIALOG_H
+#pragma once
 
 #include <QDialog>
 
@@ -54,5 +52,3 @@ private:
 
   QButtonGroup *m_pButtonGroupType;
 };
-
-#endif
diff --git a/src/gui/src/AddClientDialog.h b/src/gui/src/AddClientDialog.h
index 5c88c0df6..b7f552b88 100644
--- a/src/gui/src/AddClientDialog.h
+++ b/src/gui/src/AddClientDialog.h
@@ -15,8 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ADDCLIENTDIALOG_H
-#define ADDCLIENTDIALOG_H
+#pragma once
 
 #include "ui_AddClientDialogBase.h"
 
@@ -57,5 +56,3 @@ private:
   QLabel *m_pLabelCenter;
   int m_AddResult;
 };
-
-#endif // ADDCLIENTDIALOG_H
diff --git a/src/gui/src/AppDelegate.h b/src/gui/src/AppDelegate.h
index 808d40b9a..6d9f99a5c 100644
--- a/src/gui/src/AppDelegate.h
+++ b/src/gui/src/AppDelegate.h
@@ -1,5 +1,4 @@
-#ifndef APPDELEGATE_H
-#define APPDELEGATE_H
+#pragma once
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -21,4 +20,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif // APPDELEGATE_H
diff --git a/src/gui/src/DataDownloader.h b/src/gui/src/DataDownloader.h
index 7bf455ae7..e37f8600d 100644
--- a/src/gui/src/DataDownloader.h
+++ b/src/gui/src/DataDownloader.h
@@ -15,8 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DATADOWNLOADER_H
-#define DATADOWNLOADER_H
+#pragma once
 
 #include <QByteArray>
 #include <QNetworkAccessManager>
@@ -48,5 +47,3 @@ private:
   QNetworkReply *m_pReply;
   bool m_IsFinished;
 };
-
-#endif // DATADOWNLOADER_H
diff --git a/src/gui/src/Hotkey.h b/src/gui/src/Hotkey.h
index 37463361b..4f2037a2b 100644
--- a/src/gui/src/Hotkey.h
+++ b/src/gui/src/Hotkey.h
@@ -15,10 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#if !defined(HOTKEY_H)
-
-#define HOTKEY_H
+#pragma once
 
 #include <QList>
 #include <QString>
@@ -62,5 +59,3 @@ private:
 typedef QList<Hotkey> HotkeyList;
 
 QTextStream &operator<<(QTextStream &outStream, const Hotkey &hotkey);
-
-#endif
diff --git a/src/gui/src/HotkeyDialog.h b/src/gui/src/HotkeyDialog.h
index cec916211..d13e220b6 100644
--- a/src/gui/src/HotkeyDialog.h
+++ b/src/gui/src/HotkeyDialog.h
@@ -15,10 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#if !defined(HOTKEYDIALOG_H)
-
-#define HOTKEYDIALOG_H
+#pragma once
 
 #include "Hotkey.h"
 #include "ui_HotkeyDialogBase.h"
@@ -46,5 +43,3 @@ protected:
 private:
   Hotkey &m_Hotkey;
 };
-
-#endif
diff --git a/src/gui/src/KeySequence.h b/src/gui/src/KeySequence.h
index d7863f706..712aa3f14 100644
--- a/src/gui/src/KeySequence.h
+++ b/src/gui/src/KeySequence.h
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined(KEYSEQUENCE_H)
-
-#define KEYSEQUENCE_H
+#pragma once
 
 #include <QList>
 #include <QString>
@@ -54,5 +52,3 @@ private:
 
   static QString keyToString(int key);
 };
-
-#endif
diff --git a/src/gui/src/KeySequenceWidget.h b/src/gui/src/KeySequenceWidget.h
index 6a7acf97d..2f66037a3 100644
--- a/src/gui/src/KeySequenceWidget.h
+++ b/src/gui/src/KeySequenceWidget.h
@@ -15,10 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#if !defined(KEYSEQUENCEWIDGET__H)
-
-#define KEYSEQUENCEWIDGET__H
+#pragma once
 
 #include <QPushButton>
 
@@ -75,5 +72,3 @@ private:
   QString m_KeyPrefix;
   QString m_KeyPostfix;
 };
-
-#endif
diff --git a/src/gui/src/ServerConfigDialog.h b/src/gui/src/ServerConfigDialog.h
index a71170a2b..bf6d55a04 100644
--- a/src/gui/src/ServerConfigDialog.h
+++ b/src/gui/src/ServerConfigDialog.h
@@ -16,9 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#if !defined(SERVERCONFIGDIALOG__H)
-
-#define SERVERCONFIGDIALOG__H
+#pragma once
 
 #include "ScreenSetupModel.h"
 #include "ServerConfig.h"
@@ -78,5 +76,3 @@ private:
 private slots:
   void onChange();
 };
-
-#endif
diff --git a/src/gui/src/TrashScreenWidget.h b/src/gui/src/TrashScreenWidget.h
index d50e0ed33..29879a338 100644
--- a/src/gui/src/TrashScreenWidget.h
+++ b/src/gui/src/TrashScreenWidget.h
@@ -15,10 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#if !defined(TRASHSCREENWIDGET__H)
-
-#define TRASHSCREENWIDGET__H
+#pragma once
 
 #include <QLabel>
 
@@ -39,5 +36,3 @@ public:
 signals:
   void screenRemoved();
 };
-
-#endif
diff --git a/src/lib/arch/vsnprintf.h b/src/lib/arch/vsnprintf.h
index c0dc7dfe8..2db258ccf 100644
--- a/src/lib/arch/vsnprintf.h
+++ b/src/lib/arch/vsnprintf.h
@@ -16,6 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include "arch/IArchString.h"
 
 #if HAVE_VSNPRINTF
diff --git a/src/lib/base/Path.h b/src/lib/base/Path.h
index f375aee44..45f1bad9f 100644
--- a/src/lib/base/Path.h
+++ b/src/lib/base/Path.h
@@ -14,8 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef DESKFLOW_PATH_H
-#define DESKFLOW_PATH_H
+#pragma once
 
 #include "String.h"
 
@@ -32,5 +31,3 @@ std::string path(const String &filePath);
 } // namespace filesystem
 
 } // namespace deskflow
-
-#endif // DESKFLOW_PATH_H
diff --git a/src/lib/common/MacOSXPrecomp.h b/src/lib/common/MacOSXPrecomp.h
index 18a43ceb1..e349ad3ae 100644
--- a/src/lib/common/MacOSXPrecomp.h
+++ b/src/lib/common/MacOSXPrecomp.h
@@ -20,5 +20,5 @@
 // Prefix header for all source files of the 'deleteme' target in the 'deleteme'
 // project.
 //
-
+#pragma once
 #include <Carbon/Carbon.h>
diff --git a/src/lib/common/stdbitset.h b/src/lib/common/stdbitset.h
index 49f0712ea..31a78274a 100644
--- a/src/lib/common/stdbitset.h
+++ b/src/lib/common/stdbitset.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/common/stddeque.h b/src/lib/common/stddeque.h
index 689aa5a3f..157e59859 100644
--- a/src/lib/common/stddeque.h
+++ b/src/lib/common/stddeque.h
@@ -15,9 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
 #include <deque>
 
-#include "common/stdpost.h"
\ No newline at end of file
+#include "common/stdpost.h"
diff --git a/src/lib/common/stdexcept.h b/src/lib/common/stdexcept.h
index 225499424..aed3defc9 100644
--- a/src/lib/common/stdexcept.h
+++ b/src/lib/common/stdexcept.h
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <stdexcept>
 
 // apple declares _NOEXCEPT
diff --git a/src/lib/common/stdfstream.h b/src/lib/common/stdfstream.h
index 825693760..243c56994 100644
--- a/src/lib/common/stdfstream.h
+++ b/src/lib/common/stdfstream.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/common/stdistream.h b/src/lib/common/stdistream.h
index b51a8a9fe..154d1a80c 100644
--- a/src/lib/common/stdistream.h
+++ b/src/lib/common/stdistream.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/common/stdlist.h b/src/lib/common/stdlist.h
index 253b5656c..384e4fcb4 100644
--- a/src/lib/common/stdlist.h
+++ b/src/lib/common/stdlist.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/common/stdmap.h b/src/lib/common/stdmap.h
index c11d65e93..5d855dcc2 100644
--- a/src/lib/common/stdmap.h
+++ b/src/lib/common/stdmap.h
@@ -15,9 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
 #include <map>
 
-#include "common/stdpost.h"
\ No newline at end of file
+#include "common/stdpost.h"
diff --git a/src/lib/common/stdostream.h b/src/lib/common/stdostream.h
index 4a2bed77e..201a1ea74 100644
--- a/src/lib/common/stdostream.h
+++ b/src/lib/common/stdostream.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/common/stdpost.h b/src/lib/common/stdpost.h
index 04977a037..6e7bb33ad 100644
--- a/src/lib/common/stdpost.h
+++ b/src/lib/common/stdpost.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
diff --git a/src/lib/common/stdpre.h b/src/lib/common/stdpre.h
index 89fa0c279..7619f3114 100644
--- a/src/lib/common/stdpre.h
+++ b/src/lib/common/stdpre.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #if defined(_MSC_VER)
 #pragma warning(disable : 4786) // identifier truncated
diff --git a/src/lib/common/stdset.h b/src/lib/common/stdset.h
index 7b08a3599..0d57237d2 100644
--- a/src/lib/common/stdset.h
+++ b/src/lib/common/stdset.h
@@ -15,9 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
 #include <set>
 
-#include "common/stdpost.h"
\ No newline at end of file
+#include "common/stdpost.h"
diff --git a/src/lib/common/stdsstream.h b/src/lib/common/stdsstream.h
index 3d1511026..3f7c8c630 100644
--- a/src/lib/common/stdsstream.h
+++ b/src/lib/common/stdsstream.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/common/stdstring.h b/src/lib/common/stdstring.h
index 228394d6f..b01ccf67e 100644
--- a/src/lib/common/stdstring.h
+++ b/src/lib/common/stdstring.h
@@ -15,9 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
 #include <string>
 
-#include "common/stdpost.h"
\ No newline at end of file
+#include "common/stdpost.h"
diff --git a/src/lib/common/stdvector.h b/src/lib/common/stdvector.h
index 55248dbfc..c7bc27bb2 100644
--- a/src/lib/common/stdvector.h
+++ b/src/lib/common/stdvector.h
@@ -15,6 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include "common/stdpre.h"
 
diff --git a/src/lib/deskflow/ClientArgs.h b/src/lib/deskflow/ClientArgs.h
index 0630aa5d0..55ec465c2 100644
--- a/src/lib/deskflow/ClientArgs.h
+++ b/src/lib/deskflow/ClientArgs.h
@@ -15,8 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DESKFLOW_CORE_CLIENTARGS_H
-#define DESKFLOW_CORE_CLIENTARGS_H
+#pragma once
 
 #include "ArgsBase.h"
 
@@ -54,5 +53,3 @@ public:
   std::string m_serverAddress;
 };
 } // namespace deskflow
-
-#endif // DESKFLOW_CORE_CLIENTARGS_H
diff --git a/src/lib/deskflow/ClientTaskBarReceiver.h b/src/lib/deskflow/ClientTaskBarReceiver.h
index 21556d4f0..fb5277ea0 100644
--- a/src/lib/deskflow/ClientTaskBarReceiver.h
+++ b/src/lib/deskflow/ClientTaskBarReceiver.h
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CCLIENTTASKBARRECEIVER_H
-#define CCLIENTTASKBARRECEIVER_H
+#pragma once
 
 #include "arch/IArchTaskBarReceiver.h"
 #include "base/String.h"
@@ -94,5 +93,3 @@ private:
 
 IArchTaskBarReceiver *createTaskBarReceiver(
     const BufferedLogOutputter *logBuffer, IEventQueue *events);
-
-#endif
diff --git a/src/lib/deskflow/DisplayInvalidException.h b/src/lib/deskflow/DisplayInvalidException.h
index 8c7fc8def..7ae5ddc9a 100644
--- a/src/lib/deskflow/DisplayInvalidException.h
+++ b/src/lib/deskflow/DisplayInvalidException.h
@@ -15,8 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef DESKFLOW_DISPLAYINVALIDEXCEPTION_H
-#define DESKFLOW_DISPLAYINVALIDEXCEPTION_H
+#pragma once
 
 #include <stdexcept>
 #include <string>
@@ -27,5 +26,3 @@ public:
 
   DisplayInvalidException(std::string msg) : std::runtime_error(msg) {}
 };
-
-#endif // DESKFLOW_DISPLAYINVALIDEXCEPTION_H
diff --git a/src/lib/deskflow/languages/LanguageManager.h b/src/lib/deskflow/languages/LanguageManager.h
index a7ffaf65f..675a35d66 100644
--- a/src/lib/deskflow/languages/LanguageManager.h
+++ b/src/lib/deskflow/languages/LanguageManager.h
@@ -14,8 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef DESKFLOW_LANGUAGESLANGUAGEMANAGER_H
-#define DESKFLOW_LANGUAGESLANGUAGEMANAGER_H
+#pragma once
 
 #include "base/String.h"
 #include "deskflow/AppUtil.h"
@@ -76,5 +75,3 @@ public:
 } // namespace languages
 
 } // namespace deskflow
-
-#endif // DESKFLOW_LANGUAGESLANGUAGEMANAGER_H
diff --git a/src/lib/deskflow/unix/DeskflowXkbKeyboard.h b/src/lib/deskflow/unix/DeskflowXkbKeyboard.h
index 93e0cae9a..c0f0b807a 100644
--- a/src/lib/deskflow/unix/DeskflowXkbKeyboard.h
+++ b/src/lib/deskflow/unix/DeskflowXkbKeyboard.h
@@ -17,8 +17,7 @@
  */
 #if WINAPI_XWINDOWS
 
-#ifndef XKBKEYBOARD_H
-#define XKBKEYBOARD_H
+#pragma once
 
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBrules.h>
@@ -46,6 +45,4 @@ public:
 
 } // namespace deskflow
 
-#endif // XKBKEYBOARD_H
-
 #endif // WINAPI_XWINDOWS
diff --git a/src/lib/gui/core/CommandProcess.h b/src/lib/gui/core/CommandProcess.h
index ee047081d..8fa6de1c4 100644
--- a/src/lib/gui/core/CommandProcess.h
+++ b/src/lib/gui/core/CommandProcess.h
@@ -15,8 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef COMMANDTHREAD_H
-#define COMMANDTHREAD_H
+#pragma once
 
 #include <QObject>
 #include <QStringList>
@@ -38,5 +37,3 @@ private:
   QStringList m_Arguments;
   QString m_Input;
 };
-
-#endif // COMMANDTHREAD_H
diff --git a/src/lib/gui/core/WaylandWarnings.h b/src/lib/gui/core/WaylandWarnings.h
index 1aab82810..a33ca64b2 100644
--- a/src/lib/gui/core/WaylandWarnings.h
+++ b/src/lib/gui/core/WaylandWarnings.h
@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#pragma once
+
 #include <QWidget>
 #include <memory>
 
diff --git a/src/lib/gui/ipc/QDataStreamProxy.h b/src/lib/gui/ipc/QDataStreamProxy.h
index 3004ef619..db0c0e7ef 100644
--- a/src/lib/gui/ipc/QDataStreamProxy.h
+++ b/src/lib/gui/ipc/QDataStreamProxy.h
@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #include <QTcpSocket>
 
diff --git a/src/lib/platform/IMSWindowsClipboardFacade.h b/src/lib/platform/IMSWindowsClipboardFacade.h
index 667836b56..0d5ac0639 100644
--- a/src/lib/platform/IMSWindowsClipboardFacade.h
+++ b/src/lib/platform/IMSWindowsClipboardFacade.h
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef IMWINDOWSCLIPBOARDFACADE
-#define IMWINDOWSCLIPBOARDFACADE
+#pragma once
 
 #include "common/IInterface.h"
 
@@ -31,5 +30,3 @@ public:
   virtual void write(HANDLE win32Data, UINT win32Format) = 0;
   virtual ~IMSWindowsClipboardFacade() {}
 };
-
-#endif
\ No newline at end of file
diff --git a/src/lib/platform/MSWindowsPowerManager.h b/src/lib/platform/MSWindowsPowerManager.h
index 75df747f7..77484d156 100644
--- a/src/lib/platform/MSWindowsPowerManager.h
+++ b/src/lib/platform/MSWindowsPowerManager.h
@@ -15,8 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef MSWINDOWSPOWERMANAGER_H
-#define MSWINDOWSPOWERMANAGER_H
+#pragma once
 
 class MSWindowsPowerManager {
 public:
@@ -32,5 +31,3 @@ public:
    */
   void enableSleep();
 };
-
-#endif // MSWINDOWSPOWERMANAGER_H
diff --git a/src/lib/platform/OSXDragView.h b/src/lib/platform/OSXDragView.h
index 7cc512f74..70b8972a2 100644
--- a/src/lib/platform/OSXDragView.h
+++ b/src/lib/platform/OSXDragView.h
@@ -14,6 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#pragma once
 
 #import <Cocoa/Cocoa.h>
 
diff --git a/src/lib/platform/OSXPowerManager.h b/src/lib/platform/OSXPowerManager.h
index 60b2c2289..2190af803 100644
--- a/src/lib/platform/OSXPowerManager.h
+++ b/src/lib/platform/OSXPowerManager.h
@@ -16,8 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef OSXPOWERMANAGER_H
-#define OSXPOWERMANAGER_H
+#pragma once
 
 #include <IOKit/pwr_mgt/IOPMLib.h>
 
@@ -43,5 +42,3 @@ private:
   // handler for assertion preventing the system from going to sleep
   IOPMAssertionID m_sleepPreventionAssertionID = 0;
 };
-
-#endif // OSXPOWERMANAGER_H
diff --git a/src/lib/platform/OSXScreenSaverControl.h b/src/lib/platform/OSXScreenSaverControl.h
index 7034fa6ee..a03f91625 100644
--- a/src/lib/platform/OSXScreenSaverControl.h
+++ b/src/lib/platform/OSXScreenSaverControl.h
@@ -18,6 +18,7 @@
 
 // ScreenSaver.framework private API
 // Class dumping by Alex Harper http://www.ragingmenace.com/
+#pragma once
 
 #import <Foundation/NSObject.h>
 
diff --git a/src/lib/platform/XWindowsPowerManager.h b/src/lib/platform/XWindowsPowerManager.h
index be2f23966..c6742c3ec 100644
--- a/src/lib/platform/XWindowsPowerManager.h
+++ b/src/lib/platform/XWindowsPowerManager.h
@@ -15,8 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef XWINDOWSPOWERMANAGER_H
-#define XWINDOWSPOWERMANAGER_H
+#pragma once
 
 class XWindowsPowerManager {
 public:
@@ -36,5 +35,3 @@ public:
   XWindowsPowerManager(const XWindowsPowerManager &) = delete;
   XWindowsPowerManager &operator=(const XWindowsPowerManager &) = delete;
 };
-
-#endif // XWINDOWSPOWERMANAGER_H
diff --git a/src/lib/server/ClientProxy1_8.h b/src/lib/server/ClientProxy1_8.h
index 81094a7dc..b2574ef0f 100644
--- a/src/lib/server/ClientProxy1_8.h
+++ b/src/lib/server/ClientProxy1_8.h
@@ -14,8 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef SERVER_CLIENTPROXY1_8_H
-#define SERVER_CLIENTPROXY1_8_H
+#pragma once
 
 #include "server/ClientProxy1_7.h"
 
@@ -31,5 +30,3 @@ public:
 private:
   void synchronizeLanguages() const;
 };
-
-#endif // SERVER_CLIENTPROXY1_8_H