diff --git a/application/knownfieldmodel.cpp b/application/knownfieldmodel.cpp
index 7fca83f..7b45c51 100644
--- a/application/knownfieldmodel.cpp
+++ b/application/knownfieldmodel.cpp
@@ -12,11 +12,6 @@ using namespace QtUtilities;
 
 namespace Settings {
 
-/*
-    TRANSLATOR Settings::KnownFieldModel
-    Necessary for lupdate.
-*/
-
 const char *KnownFieldModel::fieldName(KnownField field)
 {
     switch (field) {
diff --git a/application/knownfieldmodel.h b/application/knownfieldmodel.h
index aa61beb..3568470 100644
--- a/application/knownfieldmodel.h
+++ b/application/knownfieldmodel.h
@@ -10,9 +10,11 @@
 #define Q_OBJECT
 #endif
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
-enum class KnownField : unsigned int;
+TAGEDITOR_ENUM_CLASS KnownField : unsigned int;
 }
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace Settings {
 
diff --git a/application/targetlevelmodel.cpp b/application/targetlevelmodel.cpp
index f22993d..6c11ac0 100644
--- a/application/targetlevelmodel.cpp
+++ b/application/targetlevelmodel.cpp
@@ -7,11 +7,6 @@ using namespace TagParser;
 
 namespace Settings {
 
-/*
-    TRANSLATOR Settings::TargetLevelModel
-    Necessary for lupdate.
-*/
-
 const char *TargetLevelModel::fieldName(TagTargetLevel targetLevel)
 {
     switch (targetLevel) {
diff --git a/application/targetlevelmodel.h b/application/targetlevelmodel.h
index 2197dc6..51a8498 100644
--- a/application/targetlevelmodel.h
+++ b/application/targetlevelmodel.h
@@ -6,9 +6,11 @@
 #include <QAbstractListModel>
 #include <QList>
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
-enum class TagTargetLevel : unsigned char;
+TAGEDITOR_ENUM_CLASS TagTargetLevel : unsigned char;
 }
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace Settings {
 
diff --git a/dbquery/dbquery.h b/dbquery/dbquery.h
index 26f5e53..2ef0a10 100644
--- a/dbquery/dbquery.h
+++ b/dbquery/dbquery.h
@@ -12,10 +12,12 @@
 
 QT_FORWARD_DECLARE_CLASS(QNetworkReply)
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
 class TagValue;
-enum class KnownField : unsigned int;
+TAGEDITOR_ENUM_CLASS KnownField : unsigned int;
 } // namespace TagParser
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace QtGui {
 
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 6201f8a..ac52ee3 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -13,9 +13,11 @@
 QT_FORWARD_DECLARE_CLASS(QFileSystemModel)
 QT_FORWARD_DECLARE_CLASS(QItemSelectionModel)
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
-enum class TagType : unsigned int;
-}
+TAGEDITOR_ENUM_CLASS TagType : unsigned int;
+} // namespace TagParser
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace QtUtilities {
 class AboutDialog;
diff --git a/gui/picturepreviewselection.h b/gui/picturepreviewselection.h
index cc989bb..59a27cf 100644
--- a/gui/picturepreviewselection.h
+++ b/gui/picturepreviewselection.h
@@ -16,15 +16,17 @@ QT_FORWARD_DECLARE_CLASS(QGraphicsTextItem)
 QT_FORWARD_DECLARE_CLASS(QGraphicsPixmapItem)
 QT_FORWARD_DECLARE_CLASS(QGraphicsRectItem)
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
 class Tag;
 class TagValue;
-enum class KnownField : unsigned int;
+TAGEDITOR_ENUM_CLASS KnownField : unsigned int;
 } // namespace TagParser
 
 namespace QtGui {
 
-enum class PreviousValueHandling : int;
+TAGEDITOR_ENUM_CLASS PreviousValueHandling : int;
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace Ui {
 class PicturePreviewSelection;
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 7f543e6..b0e1aee 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -633,11 +633,6 @@ QWidget *FileLayoutPage::setupWidget()
     return widget;
 }
 
-/*
-    TRANSLATOR QtGui::SettingsDialog
-    Necessary for lupdate.
-*/
-
 SettingsDialog::SettingsDialog(QWidget *parent)
     : QtUtilities::SettingsDialog(parent)
 {
diff --git a/gui/tagedit.h b/gui/tagedit.h
index c8a1223..f7d8f7b 100644
--- a/gui/tagedit.h
+++ b/gui/tagedit.h
@@ -14,11 +14,13 @@
 QT_FORWARD_DECLARE_CLASS(QFormLayout)
 QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
 class Tag;
 class TagValue;
-enum class KnownField : unsigned int;
+TAGEDITOR_ENUM_CLASS KnownField : unsigned int;
 } // namespace TagParser
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace QtGui {
 
diff --git a/gui/tageditorwidget.h b/gui/tageditorwidget.h
index 360de17..908af9b 100644
--- a/gui/tageditorwidget.h
+++ b/gui/tageditorwidget.h
@@ -19,9 +19,11 @@ QT_FORWARD_DECLARE_CLASS(QTreeView)
 QT_FORWARD_DECLARE_CLASS(QFile)
 QT_FORWARD_DECLARE_CLASS(QTemporaryFile)
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
-enum class TagType : unsigned int;
+TAGEDITOR_ENUM_CLASS TagType : unsigned int;
 }
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace QtGui {
 
diff --git a/gui/tagfieldedit.h b/gui/tagfieldedit.h
index 8723249..b9db260 100644
--- a/gui/tagfieldedit.h
+++ b/gui/tagfieldedit.h
@@ -11,13 +11,15 @@
 QT_FORWARD_DECLARE_CLASS(QVBoxLayout)
 QT_FORWARD_DECLARE_CLASS(QLabel)
 
+#define TAGEDITOR_ENUM_CLASS enum class
 namespace TagParser {
 class TagValue;
 class Tag;
-enum class KnownField : unsigned int;
-enum class TagDataType : unsigned int;
-enum class TagTextEncoding : unsigned int;
+TAGEDITOR_ENUM_CLASS KnownField : unsigned int;
+TAGEDITOR_ENUM_CLASS TagDataType : unsigned int;
+TAGEDITOR_ENUM_CLASS TagTextEncoding : unsigned int;
 } // namespace TagParser
+#undef TAGEDITOR_ENUM_CLASS
 
 namespace QtUtilities {
 class ButtonOverlay;