#include "frontends/FontMetrics.h"
#include "insets/InsetBibitem.h"
-#include "insets/InsetOptArg.h"
+#include "insets/InsetArgument.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/lstrings.h"
#include "support/textutils.h"
-#include <boost/bind.hpp>
+#include "support/bind.h"
#include <boost/crc.hpp>
#include <algorithm>