diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh
index d09bca67e..05b389b83 100644
--- a/ebos/ecloutputblackoilmodule.hh
+++ b/ebos/ecloutputblackoilmodule.hh
@@ -36,16 +36,10 @@
 
 #include <opm/material/common/Valgrind.hpp>
 
-#if HAVE_ECL_INPUT
 #include <opm/parser/eclipse/Units/Units.hpp>
 #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
-#endif
-
-#if HAVE_ECL_OUTPUT
 #include <opm/output/data/Cells.hpp>
 #include <opm/output/eclipse/EclipseIO.hpp>
-#endif
-
 #include <opm/common/OpmLog/OpmLog.hpp>
 
 #include <dune/common/fvector.hh>
diff --git a/ebos/eclwriter.hh b/ebos/eclwriter.hh
index 3ec9bc0d4..86c0c378c 100644
--- a/ebos/eclwriter.hh
+++ b/ebos/eclwriter.hh
@@ -35,11 +35,8 @@
 #include <ewoms/io/baseoutputwriter.hh>
 #include <ewoms/parallel/tasklets.hh>
 
-#if HAVE_ECL_OUTPUT
 #include <opm/output/eclipse/EclipseIO.hpp>
 #include <opm/output/eclipse/RestartValue.hpp>
-#endif
-
 #include <opm/parser/eclipse/Units/UnitSystem.hpp>
 
 #include <opm/grid/GridHelpers.hpp>
@@ -135,16 +132,12 @@ public:
 
     void writeInit()
     {
-#if !HAVE_ECL_OUTPUT
-        throw std::runtime_error("Eclipse output support not available in opm-common, unable to write ECL output!");
-#else
         if (collectToIORank_.isIORank()) {
             std::map<std::string, std::vector<int> > integerVectors;
             if (collectToIORank_.isParallel())
                 integerVectors.emplace("MPI_RANK", collectToIORank_.globalRanks());
             eclIO_->writeInitial(computeTrans_(), integerVectors, exportNncStructure_());
         }
-#endif
     }
 
     /*!
@@ -152,10 +145,6 @@ public:
      */
     void writeOutput(bool isSubStep)
     {
-
-#if !HAVE_ECL_INPUT
-        throw std::runtime_error("Unit support not available in opm-common.");
-#endif
         Scalar curTime = simulator_.time() + simulator_.timeStepSize();
         Scalar totalSolverTime = simulator_.executionTimer().realTimeElapsed();
         Scalar nextStepSize = simulator_.problem().nextTimeStepSize();