diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 028c081..77dae60 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -63,12 +63,6 @@ namespace QtGui {
  * \brief The MainWindow class provides the main window of the widgets-based GUI of the application.
  */
 
-/*
- * TRANSLATOR QtGui::MainWindow
- * This comment is needed by lupdate to prevent "Qualifying with unknown namespace/class ::MainWindow".
- * Even with Qt 5.13.0 this still seems required.
- */
-
 /*!
  * \brief Copies the selected cells to the clipboard.
  */
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index afc839b..b4ffb37 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -19,10 +19,12 @@ QT_FORWARD_DECLARE_CLASS(QUndoStack)
 QT_FORWARD_DECLARE_CLASS(QUndoView)
 QT_FORWARD_DECLARE_CLASS(QSettings)
 
+#define PASSWORD_MANAGER_ENUM_CLASS enum class
 namespace Io {
-enum class EntryType : int;
-enum class FieldType : int;
+PASSWORD_MANAGER_ENUM_CLASS EntryType : int;
+PASSWORD_MANAGER_ENUM_CLASS FieldType : int;
 } // namespace Io
+#undef PASSWORD_MANAGER_ENUM_CLASS
 
 namespace QtUtilities {
 class RecentMenuManager;