#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 <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <boost/bind/bind.hpp>