diff --git a/src/common/wx.h b/src/common/wx.h
index fdb083255..77bb63718 100644
--- a/src/common/wx.h
+++ b/src/common/wx.h
@@ -69,9 +69,17 @@ wxU(const wxString &s) {
 #define wxMB(s)  ((const char *)(s).mb_str(wxConvUTF8))
 
 /* i18n stuff */
-#if !defined Z
-# define Z(s) wxU(Y(s))
-# define NZ(s_singular, s_plural, count) wxU(NY(s))
+#if defined(HAVE_LIBINTL_H)
+# include <libintl.h>
+# if !defined Z
+#  define Z(s) wxU(gettext(s))
+#  define NZ(s_singular, s_plural, count) wxU(ngettext(s_singular, s_plural, count))
+# endif
+#else /* HAVE_LIBINTL_H */
+# if !defined Y
+#  define Z(s) (s)
+#  define NZ(s_singular, s_plural, count) (s_singular)
+# endif
 #endif
 
 // Use wxComboBox on non-Windows builds with wxWidgets 2.8.0 and newer
diff --git a/src/mmg/cli_options_dlg.cpp b/src/mmg/cli_options_dlg.cpp
index 03e0fccf2..ee0ff0d80 100644
--- a/src/mmg/cli_options_dlg.cpp
+++ b/src/mmg/cli_options_dlg.cpp
@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/common_pch.h"
+#include "common/os.h"
 
 #include <wx/wx.h>
 #include <wx/statline.h>
diff --git a/src/mmg/message_dialog.cpp b/src/mmg/message_dialog.cpp
index 957932694..697148bf7 100644
--- a/src/mmg/message_dialog.cpp
+++ b/src/mmg/message_dialog.cpp
@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/common_pch.h"
+#include "common/os.h"
 
 #include <wx/wx.h>
 #include <wx/statline.h>
diff --git a/src/mmg/mmg.cpp b/src/mmg/mmg.cpp
index 172fc510d..faa58ba3b 100644
--- a/src/mmg/mmg.cpp
+++ b/src/mmg/mmg.cpp
@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/common_pch.h"
+#include "common/os.h"
 
 #include <wx/wx.h>
 #include <wx/config.h>
diff --git a/src/mmg/update_checker.cpp b/src/mmg/update_checker.cpp
index 93cd87522..dbeac3c0e 100644
--- a/src/mmg/update_checker.cpp
+++ b/src/mmg/update_checker.cpp
@@ -11,7 +11,7 @@
    Written by Moritz Bunkus <moritz@bunkus.org>.
 */
 
-#include "common/common_pch.h"
+#include "common/os.h"
 
 #if defined(HAVE_CURL_EASY_H)