Disable warnings around all wx includes.

92 files changed, 295 insertions, 10 deletions

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index ef8816708..1b84ca2bc 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -36,12 +36,15 @@
 #include "lib/transcode_job.h"
 #include "lib/util.h"
 #include "lib/version.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/aboutdlg.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 #include <set>
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 02543a0ee..7bea907cc 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -56,9 +56,12 @@
 #include "lib/util.h"
 #include "lib/verify_dcp_job.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/exceptions.h>
+#include <dcp/search.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/cmdline.h>
 #include <wx/display.h>
 #include <wx/preferences.h>
@@ -66,6 +69,7 @@
 #include <wx/splash.h>
 #include <wx/stdpaths.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #ifdef __WXGTK__
 #include <X11/Xlib.h>
 #endif
diff --git a/src/tools/dcpomatic_playlist.cc b/src/tools/dcpomatic_playlist.cc
index da162bf6e..82e7abc6c 100644
--- a/src/tools/dcpomatic_playlist.cc
+++ b/src/tools/dcpomatic_playlist.cc
@@ -32,11 +32,14 @@
 #include "lib/spl.h"
 #include "lib/spl_entry.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/imaglist.h>
 #include <wx/listctrl.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;
diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index 2c0f17c0a..13510e9d1 100644
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -22,7 +22,10 @@
 #include "audio_gain_dialog.h"
 #include "wx_util.h"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <cmath>
 
 
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index fed1e9c6a..cfea4f026 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -36,7 +36,10 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/job_manager.h"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index b4bb6ef93..b77ecb1ce 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -26,7 +26,10 @@
 #include "lib/audio_analysis.h"
 #include "lib/compose.hpp"
 #include "lib/maths_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <cfloat>
 
diff --git a/src/wx/batch_job_view.cc b/src/wx/batch_job_view.cc
index c93bf1eba..6ce9f4680 100644
--- a/src/wx/batch_job_view.cc
+++ b/src/wx/batch_job_view.cc
@@ -22,8 +22,11 @@
 #include "batch_job_view.h"
 #include "dcpomatic_button.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/button.h>
 #include <wx/sizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;
diff --git a/src/wx/check_box.h b/src/wx/check_box.h
index 5176cd2e8..65952040a 100644
--- a/src/wx/check_box.h
+++ b/src/wx/check_box.h
@@ -24,7 +24,10 @@
 
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class CheckBox : public wxCheckBox, public I18NHook
diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index e0594b5d8..32dd77264 100644
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.h
@@ -22,7 +22,10 @@
 #include "editable_list.h"
 #include "email_dialog.h"
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 #include <vector>
 
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 908968712..b4cf90fe7 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -24,14 +24,17 @@
 #include "static_text.h"
 #include "wx_util.h"
 #include "lib/colour_conversion.h"
+#include "lib/warnings.h"
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/identity_transfer_function.h>
 #include <dcp/locale_convert.h>
 #include <dcp/modified_gamma_transfer_function.h>
 #include <dcp/s_gamut3_transfer_function.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/numformatter.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::dynamic_pointer_cast;
diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index bdf185227..294cdbf82 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -23,8 +23,11 @@
 #define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
 
 
-#include <boost/signals2.hpp>
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
 
 
 class ColourConversion;
diff --git a/src/wx/confirm_kdm_email_dialog.h b/src/wx/confirm_kdm_email_dialog.h
index 311cb08ea..7360f3513 100644
--- a/src/wx/confirm_kdm_email_dialog.h
+++ b/src/wx/confirm_kdm_email_dialog.h
@@ -18,10 +18,15 @@
 
 */
 
+
 #include "question_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
+
 class ConfirmKDMEmailDialog : public QuestionDialog
 {
 public:
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index b970618a7..54f56f432 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/statline.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 
diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h
index d0fb74823..ec9d374b7 100644
--- a/src/wx/content_colour_conversion_dialog.h
+++ b/src/wx/content_colour_conversion_dialog.h
@@ -20,7 +20,10 @@
 
 
 #include "lib/colour_conversion.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 2c05f732b..b86137358 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -44,12 +44,15 @@
 #include "lib/job_manager.h"
 #include "lib/playlist.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/decrypted_kdm.h>
 #include <dcp/exceptions.h>
 #include <dcp/search.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/dirdlg.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::dynamic_pointer_cast;
diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 147f95946..b288dcaec 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -25,7 +25,10 @@
 
 #include "timeline_content_view.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <memory>
 
 
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 097c05166..3058d3a5e 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -45,10 +45,13 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/display.h>
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
diff --git a/src/wx/content_panel.h b/src/wx/content_panel.h
index 21acd28b2..604a15fe4 100644
--- a/src/wx/content_panel.h
+++ b/src/wx/content_panel.h
@@ -22,7 +22,10 @@
 #include "content_menu.h"
 #include "lib/film.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/splitter.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
 
diff --git a/src/wx/content_sub_panel.cc b/src/wx/content_sub_panel.cc
index d170d6edd..0c775287a 100644
--- a/src/wx/content_sub_panel.cc
+++ b/src/wx/content_sub_panel.cc
@@ -25,7 +25,10 @@
 #include "lib/dcp_content.h"
 #include "lib/compose.hpp"
 #include "lib/log.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 7a20cc344..a020f8148 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -28,10 +28,13 @@
 #include "lib/dcpomatic_assert.h"
 #include "lib/examine_content_job.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
 #include <dcp/exceptions.h>
 #include <boost/filesystem.hpp>
 #include <boost/optional.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/progdlg.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;
diff --git a/src/wx/content_widget.h b/src/wx/content_widget.h
index 881f9a790..a914474aa 100644
--- a/src/wx/content_widget.h
+++ b/src/wx/content_widget.h
@@ -29,9 +29,12 @@
 
 #include "wx_util.h"
 #include "lib/content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 
diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index ea7deab18..569d03924 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -36,14 +36,17 @@
 #include "lib/job.h"
 #include "lib/job_manager.h"
 #include "lib/player_video.h"
+#include "lib/warnings.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 322bb1d32..bda56dc2e 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -43,11 +43,14 @@
 #include "lib/text_content.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/notebook.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/lexical_cast.hpp>
 
 
diff --git a/src/wx/dcpomatic_button.h b/src/wx/dcpomatic_button.h
index aba41b125..7e0e01dc2 100644
--- a/src/wx/dcpomatic_button.h
+++ b/src/wx/dcpomatic_button.h
@@ -18,11 +18,17 @@
 
 */
 
+
 #ifndef DCPOMATIC_BUTTON_H
 #define DCPOMATIC_BUTTON_H
 
+
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/button.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 class Button : public wxButton, public I18NHook
 {
@@ -33,4 +39,5 @@ public:
 	wxString get_text () const override;
 };
 
+
 #endif
diff --git a/src/wx/dcpomatic_spin_ctrl.cc b/src/wx/dcpomatic_spin_ctrl.cc
index 9d255f77a..7d3972151 100644
--- a/src/wx/dcpomatic_spin_ctrl.cc
+++ b/src/wx/dcpomatic_spin_ctrl.cc
@@ -20,9 +20,12 @@
 
 
 #include "dcpomatic_spin_ctrl.h"
+#include "lib/warnings.h"
 #include <boost/bind/bind.hpp>
 #include <boost/version.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 #if BOOST_VERSION >= 106100
diff --git a/src/wx/dkdm_dialog.cc b/src/wx/dkdm_dialog.cc
index e9fd89304..5743cd712 100644
--- a/src/wx/dkdm_dialog.cc
+++ b/src/wx/dkdm_dialog.cc
@@ -32,10 +32,13 @@
 #include "lib/film.h"
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 
diff --git a/src/wx/dkdm_dialog.h b/src/wx/dkdm_dialog.h
index 132b30aef..5e7f01908 100644
--- a/src/wx/dkdm_dialog.h
+++ b/src/wx/dkdm_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include "wx_util.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <map>
 
 
diff --git a/src/wx/dkdm_output_panel.h b/src/wx/dkdm_output_panel.h
index 821a41deb..9ad2a40a5 100644
--- a/src/wx/dkdm_output_panel.h
+++ b/src/wx/dkdm_output_panel.h
@@ -22,8 +22,11 @@
 #include "name_format_editor.h"
 #include "wx_util.h"
 #include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index ac201580b..6bf7f7b62 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -25,8 +25,11 @@
 
 #include "dcpomatic_button.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 
diff --git a/src/wx/export_subtitles_dialog.h b/src/wx/export_subtitles_dialog.h
index 173dd3462..c53df820e 100644
--- a/src/wx/export_subtitles_dialog.h
+++ b/src/wx/export_subtitles_dialog.h
@@ -18,13 +18,19 @@
 
 */
 
+
 #include "dir_picker_ctrl.h"
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 class FilePickerCtrl;
 
+
 class ExportSubtitlesDialog : public TableDialog
 {
 public:
diff --git a/src/wx/export_video_file_dialog.h b/src/wx/export_video_file_dialog.h
index a58fadd38..0c93965ad 100644
--- a/src/wx/export_video_file_dialog.h
+++ b/src/wx/export_video_file_dialog.h
@@ -18,13 +18,19 @@
 
 */
 
+
 #include "table_dialog.h"
 #include "lib/ffmpeg_encoder.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
+
 class FilePickerCtrl;
 
+
 class ExportVideoFileDialog : public TableDialog
 {
 public:
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 4884a9be7..1e07bb9cc 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -32,8 +32,11 @@
 #include "lib/dcp_content.h"
 #include "lib/film.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;
diff --git a/src/wx/film_name_location_dialog.cc b/src/wx/film_name_location_dialog.cc
index 098676a9e..e6a311901 100644
--- a/src/wx/film_name_location_dialog.cc
+++ b/src/wx/film_name_location_dialog.cc
@@ -28,7 +28,10 @@
 #endif
 #include "lib/compose.hpp"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 4c4142d5b..ce3b2faa1 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -51,11 +51,14 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
+#include "lib/warnings.h"
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iomanip>
 
 
diff --git a/src/wx/fonts_dialog.cc b/src/wx/fonts_dialog.cc
index 43e914cee..668d8798b 100644
--- a/src/wx/fonts_dialog.cc
+++ b/src/wx/fonts_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/content.h"
 #include "lib/font.h"
 #include "lib/text_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <memory>
 
 
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index c79abb638..315ccd1a8 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -52,13 +52,16 @@
 #include "lib/log.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index df9a565b4..19e52ff14 100644
--- a/src/wx/full_language_tag_dialog.cc
+++ b/src/wx/full_language_tag_dialog.cc
@@ -21,10 +21,13 @@
 
 #include "full_language_tag_dialog.h"
 #include "lib/dcpomatic_assert.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/srchctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/optional.hpp>
diff --git a/src/wx/gain_calculator_dialog.h b/src/wx/gain_calculator_dialog.h
index addc07288..41312cdca 100644
--- a/src/wx/gain_calculator_dialog.h
+++ b/src/wx/gain_calculator_dialog.h
@@ -18,10 +18,15 @@
 
 */
 
+
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
+
 class GainCalculatorDialog : public TableDialog
 {
 public:
diff --git a/src/wx/i18n_hook.cc b/src/wx/i18n_hook.cc
index f6b963622..15b9c1024 100644
--- a/src/wx/i18n_hook.cc
+++ b/src/wx/i18n_hook.cc
@@ -23,7 +23,10 @@
 #include "instant_i18n_dialog.h"
 #include "wx_util.h"
 #include "lib/cross.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 
diff --git a/src/wx/image_sequence_dialog.h b/src/wx/image_sequence_dialog.h
index 65d1cb922..1a7ae5de7 100644
--- a/src/wx/image_sequence_dialog.h
+++ b/src/wx/image_sequence_dialog.h
@@ -18,8 +18,13 @@
 
 */
 
-#include <wx/wx.h>
+
 #include "table_dialog.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
+
 
 class ImageSequenceDialog : public TableDialog
 {
diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc
index ad932bc67..08626c0ed 100644
--- a/src/wx/interop_metadata_dialog.cc
+++ b/src/wx/interop_metadata_dialog.cc
@@ -24,8 +24,11 @@
 #include "language_tag_widget.h"
 #include "rating_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/wx/interop_metadata_dialog.h b/src/wx/interop_metadata_dialog.h
index b730c1238..fc1f9381d 100644
--- a/src/wx/interop_metadata_dialog.h
+++ b/src/wx/interop_metadata_dialog.h
@@ -21,9 +21,12 @@
 
 #include "editable_list.h"
 #include "metadata_dialog.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 
diff --git a/src/wx/job_view.cc b/src/wx/job_view.cc
index 12e9d90d2..b03c099d1 100644
--- a/src/wx/job_view.cc
+++ b/src/wx/job_view.cc
@@ -34,7 +34,10 @@
 #include "lib/job_manager.h"
 #include "lib/send_notification_email_job.h"
 #include "lib/transcode_job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 
 
diff --git a/src/wx/kdm_advanced_dialog.cc b/src/wx/kdm_advanced_dialog.cc
index ba1e7a4d3..1ae145e66 100644
--- a/src/wx/kdm_advanced_dialog.cc
+++ b/src/wx/kdm_advanced_dialog.cc
@@ -22,7 +22,10 @@
 #include "check_box.h"
 #include "kdm_advanced_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using boost::optional;
diff --git a/src/wx/kdm_choice.h b/src/wx/kdm_choice.h
index 109c552f0..8b216924a 100644
--- a/src/wx/kdm_choice.h
+++ b/src/wx/kdm_choice.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class KDMChoice : public wxChoice
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 715568122..c7be18622 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -34,10 +34,13 @@
 #include "lib/job_manager.h"
 #include "lib/kdm_with_metadata.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <libcxml/cxml.h>
 #include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/treectrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::exception;
diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 0c6076fb4..052c07f81 100644
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -20,8 +20,11 @@
 
 
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <map>
 
diff --git a/src/wx/kdm_output_panel.h b/src/wx/kdm_output_panel.h
index 37cca30de..829b26544 100644
--- a/src/wx/kdm_output_panel.h
+++ b/src/wx/kdm_output_panel.h
@@ -19,10 +19,13 @@
 */
 
 
-#include "lib/kdm_with_metadata.h"
 #include "wx_util.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
diff --git a/src/wx/language_tag_dialog.cc b/src/wx/language_tag_dialog.cc
index ca08996c6..91ac3512d 100644
--- a/src/wx/language_tag_dialog.cc
+++ b/src/wx/language_tag_dialog.cc
@@ -23,8 +23,11 @@
 #include "language_tag_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <dcp/language_tag.h>
 
 
diff --git a/src/wx/language_tag_dialog.h b/src/wx/language_tag_dialog.h
index ae6ea4ef7..0675ed88a 100644
--- a/src/wx/language_tag_dialog.h
+++ b/src/wx/language_tag_dialog.h
@@ -23,8 +23,11 @@
 #define DCPOMATIC_LANGUAGE_TAG_DIALOG_H
 
 
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class wxListCtrl;
diff --git a/src/wx/language_tag_widget.cc b/src/wx/language_tag_widget.cc
index f0766c9d6..3df2b6914 100644
--- a/src/wx/language_tag_widget.cc
+++ b/src/wx/language_tag_widget.cc
@@ -23,7 +23,10 @@
 #include "language_tag_dialog.h"
 #include "language_tag_widget.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using boost::optional;
diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h
index 16c00e3a6..422c97918 100644
--- a/src/wx/language_tag_widget.h
+++ b/src/wx/language_tag_widget.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index feeebe929..e1d760681 100644
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -28,8 +28,11 @@
 #include "timecode.h"
 #include "wx_util.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 
diff --git a/src/wx/metadata_dialog.cc b/src/wx/metadata_dialog.cc
index 84b9d2898..a06a3f7fc 100644
--- a/src/wx/metadata_dialog.cc
+++ b/src/wx/metadata_dialog.cc
@@ -25,11 +25,14 @@
 #include "metadata_dialog.h"
 #include "wx_util.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <boost/bind.hpp>
 #include <boost/weak_ptr.hpp>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/notebook.h>
 #include <wx/spinctrl.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::weak_ptr;
diff --git a/src/wx/move_to_dialog.cc b/src/wx/move_to_dialog.cc
index fdd118520..db6229711 100644
--- a/src/wx/move_to_dialog.cc
+++ b/src/wx/move_to_dialog.cc
@@ -21,7 +21,10 @@
 
 #include "move_to_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;
diff --git a/src/wx/normal_job_view.cc b/src/wx/normal_job_view.cc
index 6d2b7e9f2..9d29efd57 100644
--- a/src/wx/normal_job_view.cc
+++ b/src/wx/normal_job_view.cc
@@ -19,10 +19,13 @@
 */
 
 
-#include "normal_job_view.h"
 #include "dcpomatic_button.h"
+#include "normal_job_view.h"
 #include "lib/job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 947afa500..8cedd12e5 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -45,13 +45,16 @@
 #include "lib/log.h"
 #include "lib/ratio.h"
 #include "lib/util.h"
+#include "lib/warnings.h"
 #include <dcp/certificate_chain.h>
 #include <dcp/exceptions.h>
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/filepicker.h>
 #include <wx/preferences.h>
 #include <wx/spinctrl.h>
 #include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <RtAudio.h>
 #include <boost/filesystem.hpp>
 
diff --git a/src/wx/player_stress_tester.cc b/src/wx/player_stress_tester.cc
index b299ccbf8..0b5889c37 100644
--- a/src/wx/player_stress_tester.cc
+++ b/src/wx/player_stress_tester.cc
@@ -21,9 +21,12 @@
 
 #include "controls.h"
 #include "player_stress_tester.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <iostream>
diff --git a/src/wx/playlist_controls.cc b/src/wx/playlist_controls.cc
index 3d6cbf341..4a29ffd82 100644
--- a/src/wx/playlist_controls.cc
+++ b/src/wx/playlist_controls.cc
@@ -32,10 +32,13 @@
 #include "lib/internet.h"
 #include "lib/player_video.h"
 #include "lib/scoped_temporary.h"
-#include <dcp/exceptions.h>
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
+#include <dcp/exceptions.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/progdlg.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;
diff --git a/src/wx/rating_dialog.cc b/src/wx/rating_dialog.cc
index 9f64c2c66..22d10813b 100644
--- a/src/wx/rating_dialog.cc
+++ b/src/wx/rating_dialog.cc
@@ -22,10 +22,13 @@
 #include "dcpomatic_spin_ctrl.h"
 #include "rating_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <unicode/unistr.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/notebook.h>
 #include <wx/srchctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/wx/rating_dialog.h b/src/wx/rating_dialog.h
index 27887baa2..77deece79 100644
--- a/src/wx/rating_dialog.h
+++ b/src/wx/rating_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
+#include "lib/warnings.h"
 #include <dcp/rating.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
diff --git a/src/wx/recipient_dialog.h b/src/wx/recipient_dialog.h
index 3ad9789e9..a3de94d56 100644
--- a/src/wx/recipient_dialog.h
+++ b/src/wx/recipient_dialog.h
@@ -23,8 +23,11 @@
 #include "email_dialog.h"
 #include "wx_util.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 
diff --git a/src/wx/recreate_chain_dialog.h b/src/wx/recreate_chain_dialog.h
index 10086be86..bef0e2de6 100644
--- a/src/wx/recreate_chain_dialog.h
+++ b/src/wx/recreate_chain_dialog.h
@@ -18,11 +18,16 @@
 
 */
 
+
 #include "question_dialog.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
+
 class RecreateChainDialog : public QuestionDialog
 {
 public:
diff --git a/src/wx/report_problem_dialog.cc b/src/wx/report_problem_dialog.cc
index 13ddb0539..52c1e70be 100644
--- a/src/wx/report_problem_dialog.cc
+++ b/src/wx/report_problem_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/config.h"
 #include "lib/job_manager.h"
 #include "lib/send_problem_report_job.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/sizer.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::make_shared;
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index fcb3fba5d..7d315b533 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -21,8 +21,11 @@
 
 #include "editable_list.h"
 #include "lib/screen.h"
+#include "lib/warnings.h"
 #include <dcp/certificate.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/optional.hpp>
 
 
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 1eff50a59..f19aef680 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -21,10 +21,10 @@
 
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
-#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treelist.h>
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <list>
 #include <map>
diff --git a/src/wx/send_i18n_dialog.cc b/src/wx/send_i18n_dialog.cc
index 05cd87d44..6ce8f6558 100644
--- a/src/wx/send_i18n_dialog.cc
+++ b/src/wx/send_i18n_dialog.cc
@@ -22,7 +22,10 @@
 #include "i18n_hook.h"
 #include "send_i18n_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/wx/send_i18n_dialog.h b/src/wx/send_i18n_dialog.h
index 68eec51b2..24884bd84 100644
--- a/src/wx/send_i18n_dialog.h
+++ b/src/wx/send_i18n_dialog.h
@@ -20,7 +20,10 @@
 
 
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class SendI18NDialog : public wxDialog
diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 45fcf4405..b2bafcddf 100644
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -26,8 +26,11 @@
 #include "lib/butler.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/image.h"
+#include "lib/warnings.h"
 #include <dcp/util.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 
 
diff --git a/src/wx/smpte_metadata_dialog.cc b/src/wx/smpte_metadata_dialog.cc
index 979afde8d..0f8929cb1 100644
--- a/src/wx/smpte_metadata_dialog.cc
+++ b/src/wx/smpte_metadata_dialog.cc
@@ -26,9 +26,12 @@
 #include "rating_dialog.h"
 #include "smpte_metadata_dialog.h"
 #include "lib/film.h"
+#include "lib/warnings.h"
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/wx/smpte_metadata_dialog.h b/src/wx/smpte_metadata_dialog.h
index 2d1b30757..ee2a9f47c 100644
--- a/src/wx/smpte_metadata_dialog.h
+++ b/src/wx/smpte_metadata_dialog.h
@@ -24,9 +24,12 @@
 #include "metadata_dialog.h"
 #include "lib/film.h"
 #include "lib/weak_film.h"
+#include "lib/warnings.h"
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <vector>
 
 
diff --git a/src/wx/standard_controls.cc b/src/wx/standard_controls.cc
index 6196c1b5c..cef06d29c 100644
--- a/src/wx/standard_controls.cc
+++ b/src/wx/standard_controls.cc
@@ -21,8 +21,11 @@
 
 #include "film_viewer.h"
 #include "standard_controls.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
diff --git a/src/wx/static_text.h b/src/wx/static_text.h
index f690815eb..bb9ee612c 100644
--- a/src/wx/static_text.h
+++ b/src/wx/static_text.h
@@ -20,7 +20,10 @@
 
 
 #include "i18n_hook.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class StaticText : public wxStaticText, public I18NHook
diff --git a/src/wx/system_font_dialog.cc b/src/wx/system_font_dialog.cc
index df5b8e21b..6b0a650c7 100644
--- a/src/wx/system_font_dialog.cc
+++ b/src/wx/system_font_dialog.cc
@@ -21,7 +21,10 @@
 
 #include "system_font_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/listctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <iostream>
 
diff --git a/src/wx/templates_dialog.cc b/src/wx/templates_dialog.cc
index 30c692e5e..5173cdc5a 100644
--- a/src/wx/templates_dialog.cc
+++ b/src/wx/templates_dialog.cc
@@ -24,7 +24,10 @@
 #include "templates_dialog.h"
 #include "wx_util.h"
 #include "lib/config.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::string;
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 1a9834901..8407d9f8c 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -45,7 +45,10 @@
 #include "lib/string_text_file_decoder.h"
 #include "lib/subtitle_analysis.h"
 #include "lib/text_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;
diff --git a/src/wx/text_view.h b/src/wx/text_view.h
index b44742b63..24641b2ab 100644
--- a/src/wx/text_view.h
+++ b/src/wx/text_view.h
@@ -21,9 +21,9 @@
 #include "lib/content_text.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
+#include <wx/listctrl.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <wx/listctrl.h>
 
 class Decoder;
 class FilmViewer;
diff --git a/src/wx/time_picker.cc b/src/wx/time_picker.cc
index 6b37d864b..614ea9424 100644
--- a/src/wx/time_picker.cc
+++ b/src/wx/time_picker.cc
@@ -22,8 +22,11 @@
 #include "static_text.h"
 #include "time_picker.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iomanip>
 
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 84ef5cc1b..529cc2943 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -26,8 +26,11 @@
 #include "wx_util.h"
 #include "lib/dcpomatic_time.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
 #include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index ebdcfdc53..f274ba5fa 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -38,7 +38,10 @@
 #include "lib/text_content.h"
 #include "lib/timer.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iterator>
 #include <list>
 
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 926ca3258..79c87f7e0 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -23,7 +23,10 @@
 #include "timeline_content_view.h"
 #include "wx_util.h"
 #include "lib/content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 8cdc6d63d..07295d46a 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -26,7 +26,10 @@
 #include "lib/compose.hpp"
 #include "lib/cross.h"
 #include "lib/playlist.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <list>
 
 
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 17128e108..04fc52aa1 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -19,8 +19,11 @@
 */
 
 
-#include <wx/wx.h>
 #include "timeline.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
+#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 class Playlist;
diff --git a/src/wx/timeline_labels_view.cc b/src/wx/timeline_labels_view.cc
index cc0d76aa7..413fed843 100644
--- a/src/wx/timeline_labels_view.cc
+++ b/src/wx/timeline_labels_view.cc
@@ -21,8 +21,11 @@
 
 #include "timeline.h"
 #include "timeline_labels_view.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::list;
diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc
index 588ae7819..22aa998dc 100644
--- a/src/wx/timeline_reels_view.cc
+++ b/src/wx/timeline_reels_view.cc
@@ -21,8 +21,10 @@
 
 #include "timeline.h"
 #include "timeline_reels_view.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::min;
diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index ef58b70c2..ca4b87bc9 100644
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -21,8 +21,11 @@
 #include "timeline.h"
 #include "timeline_time_axis_view.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 using std::cout;
diff --git a/src/wx/try_unmount_dialog.cc b/src/wx/try_unmount_dialog.cc
index dcec6bb0b..93ebc6240 100644
--- a/src/wx/try_unmount_dialog.cc
+++ b/src/wx/try_unmount_dialog.cc
@@ -22,7 +22,10 @@
 #include "static_text.h"
 #include "try_unmount_dialog.h"
 #include "wx_util.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 
 
 static int constexpr width = 300;
diff --git a/src/wx/verify_dcp_progress_dialog.cc b/src/wx/verify_dcp_progress_dialog.cc
index c62d198a0..320510c60 100644
--- a/src/wx/verify_dcp_progress_dialog.cc
+++ b/src/wx/verify_dcp_progress_dialog.cc
@@ -24,7 +24,10 @@
 #include "lib/cross.h"
 #include "lib/job.h"
 #include "lib/job_manager.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/evtloop.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <string>
 
 
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index ff249a7ac..74b2d2219 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -38,8 +38,11 @@
 #include "lib/ratio.h"
 #include "lib/util.h"
 #include "lib/video_content.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/spinctrl.h>
 #include <wx/tglbtn.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_set.hpp>
 #include <set>
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 2aebf39d4..3bfbae9e2 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -28,7 +28,10 @@
 #include "lib/signaller.h"
 #include "lib/timer.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
 
diff --git a/src/wx/video_waveform_plot.cc b/src/wx/video_waveform_plot.cc
index 766432ec6..f45a5662e 100644
--- a/src/wx/video_waveform_plot.cc
+++ b/src/wx/video_waveform_plot.cc
@@ -26,10 +26,13 @@
 #include "lib/film.h"
 #include "lib/image.h"
 #include "lib/player_video.h"
+#include "lib/warnings.h"
 #include <dcp/locale_convert.h>
 #include <dcp/openjpeg_image.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/rawbmp.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <iostream>
 
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index f0fa50292..fad9223cb 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -31,9 +31,9 @@
 #include "lib/dcpomatic_time.h"
 #include "lib/warnings.h"
 DCPOMATIC_DISABLE_WARNINGS
+#include <wx/gbsizer.h>
 #include <wx/wx.h>
 DCPOMATIC_ENABLE_WARNINGS
-#include <wx/gbsizer.h>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>