Ignore new warnings from signals2.hpp.

I think I smell progress!

63 files changed, 105 insertions, 30 deletions

diff --git a/src/lib/analytics.h b/src/lib/analytics.h
index bc6f8a9a7..49746da98 100644
--- a/src/lib/analytics.h
+++ b/src/lib/analytics.h
@@ -21,7 +21,10 @@
 
 #include "signaller.h"
 #include "state.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Analytics : public State, public Signaller
diff --git a/src/lib/atmos_decoder.h b/src/lib/atmos_decoder.h
index 0dbeedebc..39824ad2a 100644
--- a/src/lib/atmos_decoder.h
+++ b/src/lib/atmos_decoder.h
@@ -22,7 +22,10 @@
 #include "atmos_metadata.h"
 #include "content_atmos.h"
 #include "decoder_part.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class AtmosDecoder : public DecoderPart
diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index 7417fee44..0b8b8c2d5 100644
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -32,7 +32,9 @@
 #include "content_audio.h"
 #include "decoder.h"
 #include "decoder_part.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class AudioBuffers;
diff --git a/src/lib/butler.h b/src/lib/butler.h
index d85ec90f4..75fc300de 100644
--- a/src/lib/butler.h
+++ b/src/lib/butler.h
@@ -32,7 +32,9 @@
 #include "text_type.h"
 #include "video_ring_buffers.h"
 #include <boost/asio.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 
diff --git a/src/lib/config.h b/src/lib/config.h
index 582e90cf9..d562481be 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -37,7 +37,10 @@
 #include <dcp/certificate_chain.h>
 #include <dcp/encrypted_kdm.h>
 #include <dcp/language_tag.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <vector>
 
diff --git a/src/lib/content.h b/src/lib/content.h
index d84505b72..0037f04e8 100644
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -36,7 +36,9 @@
 #include "text_type.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/mutex.hpp>
 
 
diff --git a/src/lib/dcp_film_encoder.cc b/src/lib/dcp_film_encoder.cc
index 631010071..654267195 100644
--- a/src/lib/dcp_film_encoder.cc
+++ b/src/lib/dcp_film_encoder.cc
@@ -39,7 +39,6 @@
 #include "text_content.h"
 #include "video_decoder.h"
 #include "writer.h"
-#include <boost/signals2.hpp>
 #include <iostream>
 
 #include "i18n.h"
diff --git a/src/lib/encode_server_finder.h b/src/lib/encode_server_finder.h
index 722786b77..89b6fe8d6 100644
--- a/src/lib/encode_server_finder.h
+++ b/src/lib/encode_server_finder.h
@@ -28,7 +28,9 @@
 #include "encode_server_description.h"
 #include "exception_store.h"
 #include "signaller.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/condition.hpp>
 
 
diff --git a/src/lib/film.h b/src/lib/film.h
index 258be7f31..8563565e0 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -53,7 +53,9 @@
 #include <dcp/rating.h>
 #include <dcp/types.h>
 #include <boost/filesystem.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <inttypes.h>
diff --git a/src/lib/film_encoder.h b/src/lib/film_encoder.h
index ed7626c68..b86692001 100644
--- a/src/lib/film_encoder.h
+++ b/src/lib/film_encoder.h
@@ -25,7 +25,9 @@
 
 #include "player.h"
 #include "player_text.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Film;
diff --git a/src/lib/font.h b/src/lib/font.h
index 669504579..55e3f33b7 100644
--- a/src/lib/font.h
+++ b/src/lib/font.h
@@ -24,9 +24,12 @@
 
 
 #include <dcp/array_data.h>
+#include <dcp/warnings.h>
 #include <libcxml/cxml.h>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 #include <string>
 
diff --git a/src/lib/hints.h b/src/lib/hints.h
index b17da2c99..ecaaaebb5 100644
--- a/src/lib/hints.h
+++ b/src/lib/hints.h
@@ -27,7 +27,9 @@
 #include "text_type.h"
 #include "weak_film.h"
 #include <boost/atomic.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <string>
 #include <vector>
 
diff --git a/src/lib/http_server.h b/src/lib/http_server.h
index f0ee50ef5..4c8acdc11 100644
--- a/src/lib/http_server.h
+++ b/src/lib/http_server.h
@@ -22,7 +22,9 @@
 #include "dcpomatic_time.h"
 #include "server.h"
 #include "signaller.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Response
diff --git a/src/lib/internal_player_server.h b/src/lib/internal_player_server.h
index 0648c9657..a5bd543e4 100644
--- a/src/lib/internal_player_server.h
+++ b/src/lib/internal_player_server.h
@@ -24,7 +24,9 @@
 #include "signaller.h"
 #include "types.h"
 #include <boost/filesystem.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 /** A server which is always started, that listens for requests from the main
diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index 5c8ad030d..c370c98d0 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -35,8 +35,11 @@
 #include "j2k_encoder_thread.h"
 #include "writer.h"
 #include "video_encoder.h"
+#include <dcp/warnings.h>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread/mutex.hpp>
diff --git a/src/lib/job.h b/src/lib/job.h
index d46e5c73a..f435d815a 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -29,8 +29,11 @@
 
 
 #include "signaller.h"
+#include <dcp/warnings.h>
 #include <boost/atomic.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
 #include <string>
diff --git a/src/lib/job_manager.h b/src/lib/job_manager.h
index 248639782..734ec5be5 100644
--- a/src/lib/job_manager.h
+++ b/src/lib/job_manager.h
@@ -28,7 +28,9 @@
 #include "signaller.h"
 #include <boost/thread/mutex.hpp>
 #include <boost/thread.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/condition.hpp>
 #include <list>
 
diff --git a/src/lib/log.h b/src/lib/log.h
index 142e46223..0487e5758 100644
--- a/src/lib/log.h
+++ b/src/lib/log.h
@@ -32,7 +32,9 @@
 #include <dcp/types.h>
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <string>
 
 
diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index 0d38cbf67..6c1524003 100644
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -29,7 +29,9 @@
 #include "path_behaviour.h"
 #include "types.h"
 #include <libcxml/cxml.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 #include <list>
 
diff --git a/src/lib/shuffler.h b/src/lib/shuffler.h
index 4d1404560..64641ad8b 100644
--- a/src/lib/shuffler.h
+++ b/src/lib/shuffler.h
@@ -24,7 +24,9 @@
 
 
 #include "content_video.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 struct shuffler_test5;
diff --git a/src/lib/spl.h b/src/lib/spl.h
index fc694d695..a02885c87 100644
--- a/src/lib/spl.h
+++ b/src/lib/spl.h
@@ -25,7 +25,9 @@
 
 #include "spl_entry.h"
 #include <dcp/util.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <algorithm>
 
 
diff --git a/src/lib/text_content.h b/src/lib/text_content.h
index 69a0581fc..bae7cc02e 100644
--- a/src/lib/text_content.h
+++ b/src/lib/text_content.h
@@ -28,7 +28,9 @@
 #include <libcxml/cxml.h>
 #include <dcp/language_tag.h>
 #include <dcp/types.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 namespace dcpomatic {
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 8afe9fae4..c21921e24 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -30,7 +30,9 @@
 #include "types.h"
 #include <dcp/subtitle_standard.h>
 #include <dcp/text_string.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 namespace sub {
diff --git a/src/lib/update_checker.h b/src/lib/update_checker.h
index f0ea9798c..6d08cd162 100644
--- a/src/lib/update_checker.h
+++ b/src/lib/update_checker.h
@@ -25,8 +25,11 @@
 
 
 #include "signaller.h"
+#include <dcp/warnings.h>
 #include <curl/curl.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread.hpp>
diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index b609404c4..da9d4efeb 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -32,7 +32,9 @@
 #include "decoder.h"
 #include "decoder_part.h"
 #include "video_content.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class VideoContent;
diff --git a/src/wx/audio_dialog.h b/src/wx/audio_dialog.h
index 2085a7220..152111405 100644
--- a/src/wx/audio_dialog.h
+++ b/src/wx/audio_dialog.h
@@ -30,8 +30,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class AudioPlot;
diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index f3e46532e..5c5efa1a9 100644
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -29,8 +29,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 /** @class AudioMappingView
diff --git a/src/wx/audio_plot.h b/src/wx/audio_plot.h
index fe7821e33..c03e1ddfd 100644
--- a/src/wx/audio_plot.h
+++ b/src/wx/audio_plot.h
@@ -24,8 +24,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 
diff --git a/src/wx/auto_crop_dialog.h b/src/wx/auto_crop_dialog.h
index 383f95a5a..b4a175010 100644
--- a/src/wx/auto_crop_dialog.h
+++ b/src/wx/auto_crop_dialog.h
@@ -25,7 +25,9 @@
 
 #include "table_dialog.h"
 #include "lib/crop.h"
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class SpinCtrl;
diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index de5ffb794..e70768a42 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -26,8 +26,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class ColourConversion;
diff --git a/src/wx/content_colour_conversion_dialog.h b/src/wx/content_colour_conversion_dialog.h
index 84fb47e5a..37a0f5f80 100644
--- a/src/wx/content_colour_conversion_dialog.h
+++ b/src/wx/content_colour_conversion_dialog.h
@@ -23,8 +23,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class ColourConversionEditor;
diff --git a/src/wx/content_timeline.h b/src/wx/content_timeline.h
index c82f31a83..a6c614761 100644
--- a/src/wx/content_timeline.h
+++ b/src/wx/content_timeline.h
@@ -31,8 +31,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class ContentPanel;
diff --git a/src/wx/controls.h b/src/wx/controls.h
index 109109f2c..3dec6fb88 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -29,8 +29,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class CheckBox;
diff --git a/src/wx/dir_picker_ctrl.h b/src/wx/dir_picker_ctrl.h
index fc5d5a755..f4b0fb31b 100644
--- a/src/wx/dir_picker_ctrl.h
+++ b/src/wx/dir_picker_ctrl.h
@@ -26,8 +26,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Button;
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 54d639ef5..5d58a0647 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -28,8 +28,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class ContentPanel;
diff --git a/src/wx/filter_dialog.h b/src/wx/filter_dialog.h
index aaa43c3e4..b667bf7b5 100644
--- a/src/wx/filter_dialog.h
+++ b/src/wx/filter_dialog.h
@@ -27,8 +27,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Film;
diff --git a/src/wx/focus_manager.h b/src/wx/focus_manager.h
index ca4c4e384..b03708112 100644
--- a/src/wx/focus_manager.h
+++ b/src/wx/focus_manager.h
@@ -19,7 +19,10 @@
 */
 
 
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class wxTextCtrl;
diff --git a/src/wx/full_language_tag_dialog.cc b/src/wx/full_language_tag_dialog.cc
index 89987715a..f72a32304 100644
--- a/src/wx/full_language_tag_dialog.cc
+++ b/src/wx/full_language_tag_dialog.cc
@@ -34,7 +34,9 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #include <boost/bind/bind.hpp>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <iterator>
 #include <string>
 #include <vector>
diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 44420405a..005f0f35d 100644
--- a/src/wx/hints_dialog.h
+++ b/src/wx/hints_dialog.h
@@ -23,8 +23,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class wxRichTextCtrl;
diff --git a/src/wx/job_view.h b/src/wx/job_view.h
index a3ec59bf5..e02ede087 100644
--- a/src/wx/job_view.h
+++ b/src/wx/job_view.h
@@ -23,7 +23,10 @@
 #define DCPOMATIC_JOB_VIEW_H
 
 
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class CheckBox;
diff --git a/src/wx/kdm_cpl_panel.h b/src/wx/kdm_cpl_panel.h
index 441823afa..f1144fa3d 100644
--- a/src/wx/kdm_cpl_panel.h
+++ b/src/wx/kdm_cpl_panel.h
@@ -26,7 +26,9 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class KDMCPLPanel : public wxPanel
diff --git a/src/wx/kdm_timing_panel.h b/src/wx/kdm_timing_panel.h
index 21478b1ab..db7a6e55e 100644
--- a/src/wx/kdm_timing_panel.h
+++ b/src/wx/kdm_timing_panel.h
@@ -26,7 +26,9 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
 #include <boost/date_time/posix_time/posix_time.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class Choice;
diff --git a/src/wx/language_subtag_panel.h b/src/wx/language_subtag_panel.h
index 6f1b5fd01..892784cbc 100644
--- a/src/wx/language_subtag_panel.h
+++ b/src/wx/language_subtag_panel.h
@@ -24,8 +24,8 @@
 LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 /** A panel which offers a list of subtags in two columns: subtag and name, and has a search box to
diff --git a/src/wx/language_tag_widget.h b/src/wx/language_tag_widget.h
index ff3eeb727..bda8386df 100644
--- a/src/wx/language_tag_widget.h
+++ b/src/wx/language_tag_widget.h
@@ -23,8 +23,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class wxButton;
diff --git a/src/wx/name_format_editor.h b/src/wx/name_format_editor.h
index 70a02a902..06641ef10 100644
--- a/src/wx/name_format_editor.h
+++ b/src/wx/name_format_editor.h
@@ -27,8 +27,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class NameFormatEditor
diff --git a/src/wx/password_entry.h b/src/wx/password_entry.h
index f2d4f9ed0..52386a183 100644
--- a/src/wx/password_entry.h
+++ b/src/wx/password_entry.h
@@ -22,8 +22,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class CheckBox;
diff --git a/src/wx/player_stress_tester.h b/src/wx/player_stress_tester.h
index 534cf8c76..f5070273d 100644
--- a/src/wx/player_stress_tester.h
+++ b/src/wx/player_stress_tester.h
@@ -22,8 +22,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/filesystem.hpp>
 
 
diff --git a/src/wx/preferences_page.h b/src/wx/preferences_page.h
index 44605ba86..2361cd70f 100644
--- a/src/wx/preferences_page.h
+++ b/src/wx/preferences_page.h
@@ -26,8 +26,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/preferences.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 #undef CreateWindow
 
diff --git a/src/wx/rating_dialog.h b/src/wx/rating_dialog.h
index e8dfc2d9c..dd423a646 100644
--- a/src/wx/rating_dialog.h
+++ b/src/wx/rating_dialog.h
@@ -23,8 +23,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class wxChoice;
diff --git a/src/wx/ratio_picker.h b/src/wx/ratio_picker.h
index 93e78ae9f..7c221916f 100644
--- a/src/wx/ratio_picker.h
+++ b/src/wx/ratio_picker.h
@@ -21,7 +21,9 @@
 
 #include <wx/wx.h>
 #include <boost/optional.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class CheckBox;
diff --git a/src/wx/recipients_panel.h b/src/wx/recipients_panel.h
index cecfa3d33..94e86fa57 100644
--- a/src/wx/recipients_panel.h
+++ b/src/wx/recipients_panel.h
@@ -27,8 +27,8 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treectrl.h>
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <map>
 
diff --git a/src/wx/region_subtag_widget.h b/src/wx/region_subtag_widget.h
index 725f8652c..f7be1db87 100644
--- a/src/wx/region_subtag_widget.h
+++ b/src/wx/region_subtag_widget.h
@@ -23,8 +23,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class wxButton;
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 88aa68a5b..cb625484e 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -27,8 +27,8 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/srchctrl.h>
 #include <wx/treelist.h>
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <list>
 #include <map>
 #include <set>
diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h
index 618cba65a..3281e121a 100644
--- a/src/wx/servers_list_dialog.h
+++ b/src/wx/servers_list_dialog.h
@@ -23,8 +23,8 @@
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 #include <wx/listctrl.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 class ServersListDialog : public wxDialog
 {
diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index cef264590..c9a2f8f68 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -25,8 +25,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class CheckBox;
diff --git a/src/wx/templates_dialog.h b/src/wx/templates_dialog.h
index e3568a08c..d386ea54a 100644
--- a/src/wx/templates_dialog.h
+++ b/src/wx/templates_dialog.h
@@ -23,8 +23,8 @@
 LIBDCP_DISABLE_WARNINGS
 #include <wx/listctrl.h>
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class TemplatesDialog : public wxDialog
diff --git a/src/wx/time_picker.h b/src/wx/time_picker.h
index 50177afd3..36e45a1c8 100644
--- a/src/wx/time_picker.h
+++ b/src/wx/time_picker.h
@@ -22,8 +22,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 class wxSpinCtrl;
 
diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 53cd93694..96609155f 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -31,7 +31,9 @@ LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
 LIBDCP_ENABLE_WARNINGS
 #include <fmt/format.h>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 class TimecodeBase : public wxPanel
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 7b206d30f..c3bb3ccc1 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -28,8 +28,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 class Content;
 
diff --git a/src/wx/video_view.h b/src/wx/video_view.h
index 6a4c2225e..68ed3239a 100644
--- a/src/wx/video_view.h
+++ b/src/wx/video_view.h
@@ -34,8 +34,8 @@
 #include <dcp/types.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 
diff --git a/src/wx/video_waveform_plot.h b/src/wx/video_waveform_plot.h
index e6e7a6f3d..12cc6f2ff 100644
--- a/src/wx/video_waveform_plot.h
+++ b/src/wx/video_waveform_plot.h
@@ -22,8 +22,8 @@
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 
 
 namespace dcp {
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 114caab15..1a30bd7b1 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -35,8 +35,8 @@
 LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
 #include <wx/wx.h>
-LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/thread.hpp>
 
 
diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc
index b08d9c9f5..e384266ae 100644
--- a/test/audio_merger_test.cc
+++ b/test/audio_merger_test.cc
@@ -32,9 +32,12 @@
 #include "test.h"
 #include <dcp/file.h>
 #include <dcp/raw_convert.h>
+#include <dcp/warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/bind/bind.hpp>
+LIBDCP_DISABLE_WARNINGS
 #include <boost/signals2.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <iostream>