diff --git a/internal/frontend/bridge-gui/AppController.h b/internal/frontend/bridge-gui/AppController.h
index 9e19cd89..b8117a64 100644
--- a/internal/frontend/bridge-gui/AppController.h
+++ b/internal/frontend/bridge-gui/AppController.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_APP_CONTROLLER_H
-#define BRIDGE_QT6_APP_CONTROLLER_H
+#ifndef BRIDGE_GUI_APP_CONTROLLER_H
+#define BRIDGE_GUI_APP_CONTROLLER_H
 
 
 class QMLBackend;
@@ -60,4 +60,4 @@ private: // data members
 AppController& app(); ///< Return a reference to the app controller.
 
 
-#endif // BRIDGE_QT6_APP_CONTROLLER_H
+#endif // BRIDGE_GUI_APP_CONTROLLER_H
diff --git a/internal/frontend/bridge-gui/DockIcon/DockIcon.h b/internal/frontend/bridge-gui/DockIcon/DockIcon.h
index f312d064..d77516ed 100644
--- a/internal/frontend/bridge-gui/DockIcon/DockIcon.h
+++ b/internal/frontend/bridge-gui/DockIcon/DockIcon.h
@@ -16,12 +16,12 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_DOCK_ICON_H
-#define BRIDGE_QT6_DOCK_ICON_H
+#ifndef BRIDGE_GUI_DOCK_ICON_H
+#define BRIDGE_GUI_DOCK_ICON_H
 
 
 void setDockIconVisibleState(bool visible); ///< Set the DOCK icon visibility state
 bool getDockIconVisibleState(); ///< Get the Dock icon visibility state
 
 
-#endif // #ifndef BRIDGE_QT6_DOCK_ICON_H
+#endif // #ifndef BRIDGE_GUI_DOCK_ICON_H
diff --git a/internal/frontend/bridge-gui/EventStreamWorker.h b/internal/frontend/bridge-gui/EventStreamWorker.h
index 27c628dd..cd3e4939 100644
--- a/internal/frontend/bridge-gui/EventStreamWorker.h
+++ b/internal/frontend/bridge-gui/EventStreamWorker.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_EVENT_STREAM_WORKER_H
-#define BRIDGE_QT6_EVENT_STREAM_WORKER_H
+#ifndef BRIDGE_GUI_EVENT_STREAM_WORKER_H
+#define BRIDGE_GUI_EVENT_STREAM_WORKER_H
 
 
 #include "GRPC/bridge.grpc.pb.h"
@@ -49,4 +49,4 @@ signals:
 };
 
 
-#endif //BRIDGE_QT6_EVENT_STREAM_WORKER_H
+#endif //BRIDGE_GUI_EVENT_STREAM_WORKER_H
diff --git a/internal/frontend/bridge-gui/Exception.h b/internal/frontend/bridge-gui/Exception.h
index f88d10c5..cc1d4984 100644
--- a/internal/frontend/bridge-gui/Exception.h
+++ b/internal/frontend/bridge-gui/Exception.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_EXCEPTION_H
-#define BRIDGE_QT6_EXCEPTION_H
+#ifndef BRIDGE_GUI_EXCEPTION_H
+#define BRIDGE_GUI_EXCEPTION_H
 
 
 #include <stdexcept>
@@ -43,4 +43,4 @@ private: // data members
 };
 
 
-#endif //BRIDGE_QT6_EXCEPTION_H
+#endif //BRIDGE_GUI_EXCEPTION_H
diff --git a/internal/frontend/bridge-gui/GRPC/GRPCClient.h b/internal/frontend/bridge-gui/GRPC/GRPCClient.h
index adeed0ee..20e932b5 100644
--- a/internal/frontend/bridge-gui/GRPC/GRPCClient.h
+++ b/internal/frontend/bridge-gui/GRPC/GRPCClient.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_RPC_CLIENT_H
-#define BRIDGE_QT6_RPC_CLIENT_H
+#ifndef BRIDGE_GUI_RPC_CLIENT_H
+#define BRIDGE_GUI_RPC_CLIENT_H
 
 
 #include "GRPC/bridge.grpc.pb.h"
@@ -218,4 +218,4 @@ private: // data members.
 };
 
 
-#endif // BRIDGE_QT6_RPC_CLIENT_H
+#endif // BRIDGE_GUI_RPC_CLIENT_H
diff --git a/internal/frontend/bridge-gui/GRPC/GRPCUtils.h b/internal/frontend/bridge-gui/GRPC/GRPCUtils.h
index 0212d04d..913396ad 100644
--- a/internal/frontend/bridge-gui/GRPC/GRPCUtils.h
+++ b/internal/frontend/bridge-gui/GRPC/GRPCUtils.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_GRPCUTILS_H
-#define BRIDGE_QT6_GRPCUTILS_H
+#ifndef BRIDGE_GUI_GRPCUTILS_H
+#define BRIDGE_GUI_GRPCUTILS_H
 
 
 #include "Log.h"
@@ -31,4 +31,4 @@ SPUser parsegrpcUser(grpc::User const& grpcUser); ///< Parse a gRPC user struct
 grpc::LogLevel logLevelToGRPC(Log::Level level); ///< Convert a Log::Level to gRPC enum value.
 
 
-#endif // BRIDGE_QT6_GRPCUTILS_H
+#endif // BRIDGE_GUI_GRPCUTILS_H
diff --git a/internal/frontend/bridge-gui/Log.h b/internal/frontend/bridge-gui/Log.h
index cdc4dbe5..2112ef58 100644
--- a/internal/frontend/bridge-gui/Log.h
+++ b/internal/frontend/bridge-gui/Log.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_LOG_H
-#define BRIDGE_QT6_LOG_H
+#ifndef BRIDGE_GUI_LOG_H
+#define BRIDGE_GUI_LOG_H
 
 
 //****************************************************************************************************************************************************
@@ -79,4 +79,4 @@ private: // data members
 };
 
 
-#endif //BRIDGE_QT6_LOG_H
+#endif //BRIDGE_GUI_LOG_H
diff --git a/internal/frontend/bridge-gui/Pch.h b/internal/frontend/bridge-gui/Pch.h
index e9fb5c88..d18a9fb3 100644
--- a/internal/frontend/bridge-gui/Pch.h
+++ b/internal/frontend/bridge-gui/Pch.h
@@ -16,8 +16,15 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
+#ifndef BRIDGE_GUI_PCH_H
+#define BRIDGE_GUI_PCH_H
+
+
 #include <QtCore>
 #include <QtQuick>
 #include <QtQml>
 #include <QtQuickControls2>
 #include <AppController.h>
+
+
+#endif // BRIDGE_GUI_PCH_H
diff --git a/internal/frontend/bridge-gui/QMLBackend.h b/internal/frontend/bridge-gui/QMLBackend.h
index 2eac792d..b586d30e 100644
--- a/internal/frontend/bridge-gui/QMLBackend.h
+++ b/internal/frontend/bridge-gui/QMLBackend.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_QMLBACKEND_H
-#define BRIDGE_QT6_QMLBACKEND_H
+#ifndef BRIDGE_GUI_QMLBACKEND_H
+#define BRIDGE_GUI_QMLBACKEND_H
 
 
 #include <grpcpp/support/status.h>
@@ -221,4 +221,4 @@ private: // data members
 };
 
 
-#endif // BRIDGE_QT6_QMLBACKEND_H
+#endif // BRIDGE_GUI_QMLBACKEND_H
diff --git a/internal/frontend/bridge-gui/User/User.h b/internal/frontend/bridge-gui/User/User.h
index ff63f6a6..45163c49 100644
--- a/internal/frontend/bridge-gui/User/User.h
+++ b/internal/frontend/bridge-gui/User/User.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_USER_H
-#define BRIDGE_QT6_USER_H
+#ifndef BRIDGE_GUI_USER_H
+#define BRIDGE_GUI_USER_H
 
 
 #include "Log.h"
@@ -90,4 +90,4 @@ private:
 typedef std::shared_ptr<User> SPUser;
 
 
-#endif // BRIDGE_QT6_USER_H
+#endif // BRIDGE_GUI_USER_H
diff --git a/internal/frontend/bridge-gui/User/UserList.h b/internal/frontend/bridge-gui/User/UserList.h
index aff6c56c..7b7a1d40 100644
--- a/internal/frontend/bridge-gui/User/UserList.h
+++ b/internal/frontend/bridge-gui/User/UserList.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_USER_LIST_H
-#define BRIDGE_QT6_USER_LIST_H
+#ifndef BRIDGE_GUI_USER_LIST_H
+#define BRIDGE_GUI_USER_LIST_H
 
 #include "User.h"
 
@@ -61,4 +61,4 @@ private: // data members
 };
 
 
-#endif // BRIDGE_QT6_USER_LIST_H
+#endif // BRIDGE_GUI_USER_LIST_H
diff --git a/internal/frontend/bridge-gui/Version.h.in b/internal/frontend/bridge-gui/Version.h.in
index 66efe509..72ed218e 100644
--- a/internal/frontend/bridge-gui/Version.h.in
+++ b/internal/frontend/bridge-gui/Version.h.in
@@ -1,6 +1,24 @@
-#ifndef VERSION_H
-#define VERSION_H
+// Copyright (c) 2022 Proton AG
+//
+// This file is part of Proton Mail Bridge.
+//
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Proton Mail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
+
+
+#ifndef BRIDGE_GUI_VERSION_H
+#define BRIDGE_GUI_VERSION_H
 
 #define PROJECT_VER  "@BRIDGE_APP_VERSION@"
 
-#endif // VERSION_H
+#endif // BRIDGE_GUI_VERSION_H
diff --git a/internal/frontend/bridge-gui/Worker/Overseer.h b/internal/frontend/bridge-gui/Worker/Overseer.h
index 3482306c..a49d6e22 100644
--- a/internal/frontend/bridge-gui/Worker/Overseer.h
+++ b/internal/frontend/bridge-gui/Worker/Overseer.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_OVERSEER_H
-#define BRIDGE_QT6_OVERSEER_H
+#ifndef BRIDGE_GUI_OVERSEER_H
+#define BRIDGE_GUI_OVERSEER_H
 
 
 #include "Worker.h"
@@ -53,4 +53,4 @@ typedef std::unique_ptr<Overseer> UPOverseer; ///< Type definition for unique po
 typedef std::shared_ptr<Overseer> SPOverseer; ///< Type definition for shared pointer to Overseer.
 
 
-#endif //BRIDGE_QT6_OVERSEER_H
+#endif //BRIDGE_GUI_OVERSEER_H
diff --git a/internal/frontend/bridge-gui/Worker/Worker.h b/internal/frontend/bridge-gui/Worker/Worker.h
index e9c934f4..6111d943 100644
--- a/internal/frontend/bridge-gui/Worker/Worker.h
+++ b/internal/frontend/bridge-gui/Worker/Worker.h
@@ -16,8 +16,8 @@
 // along with Proton Mail Bridge. If not, see <https://www.gnu.org/licenses/>.
 
 
-#ifndef BRIDGE_QT6_WORKER_H
-#define BRIDGE_QT6_WORKER_H
+#ifndef BRIDGE_GUI_WORKER_H
+#define BRIDGE_GUI_WORKER_H
 
 //****************************************************************************************************************************************************
 /// \brief Pure virtual class for worker intended to perform a threaded operation.
@@ -43,4 +43,4 @@ signals:
 };
 
 
-#endif //BRIDGE_QT6_WORKER_H
+#endif //BRIDGE_GUI_WORKER_H