Fix problems from bad merge-conflict resolution

Refs #11209

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Integrate3DEvents.h

@@ -2,6 +2,7 @@
 #define INTEGRATE_3D_EVENTS_H
 
 #include <vector>
+#include <boost/shared_ptr.hpp>
 #include <boost/unordered_map.hpp>
 #include "MantidKernel/V3D.h"
 #include "MantidKernel/Matrix.h"

Code/Mantid/Framework/MDAlgorithms/src/FitMD.cpp

@@ -23,7 +23,7 @@
 
 namespace Mantid {
 namespace MDAlgorithms {
-DECLARE_DOMAINCREATOR(FitMD);
+DECLARE_DOMAINCREATOR(FitMD)
 
 using namespace API;
 using namespace DataObjects;

Code/Mantid/Framework/MDAlgorithms/src/Quantification/ResolutionConvolvedCrossSection.cpp

@@ -48,6 +48,7 @@
 
 namespace Mantid {
 namespace MDAlgorithms {
+DECLARE_FUNCTION(ResolutionConvolvedCrossSection)
 
 using namespace DataObjects;
 using namespace Kernel;

Code/Mantid/Framework/MDAlgorithms/test/BinMDTest.h

@@ -14,7 +14,7 @@
 #include "MantidMDAlgorithms/FakeMDEventData.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 
-#include <boost/math/special_functions/math_fwd.hpp>
+#include <boost/math/special_functions/fpclassify.hpp>
 
 #include <cxxtest/TestSuite.h>