Reorganised headers, removing redundant ones;

Tidy up of whitespace.

ebos/eclproblem.hh

@@ -225,7 +225,6 @@ public:
 #if HAVE_DAMARIS
         EWOMS_REGISTER_PARAM(TypeTag, bool, EnableDamarisOutput,
                              "Write a specific variable using Damaris in a separate core");
-                             
 #endif
         EWOMS_REGISTER_PARAM(TypeTag, bool, EclOutputDoublePrecision,
                              "Tell the output writer to use double precision. Useful for 'perfect' restarts");

opm/simulators/flow/Main.hpp

@@ -72,7 +72,9 @@
 #include <opm/simulators/utils/ParallelEclipseState.hpp>
 #endif
 
-
+#if HAVE_DAMARIS
+#include <opm/simulators/utils/DamarisKeywords.hpp>
+#endif
 
 #include <cassert>
 #include <cstdlib>
@@ -96,10 +98,6 @@ struct FlowEarlyBird {
 
 } // namespace Opm::Properties
 
-#if HAVE_DAMARIS
-#include <opm/simulators/utils/DamarisKeywords.hpp>
-#endif
-
 namespace Opm {
 
 namespace Action { class State; }