Pressio · fnrizzi · Oct 25, 2024 · Oct 24, 2024
diff --git a/helper_scripts/fix_headers.sh b/helper_scripts/fix_headers.sh
@@ -9,7 +9,7 @@
 PCK_REL_DIR=${PWD}/../include/pressio
 
 # array of names
-declare -a pcks=("mpl" "utils" "type_traits" "expressions" "ops" "qr" "solvers_linear" "solvers_nonlinear" "ode" "rom")
+declare -a pcks=("utils" "solvers_linear" "solvers_nonlinear" "ode" "rom")
 
 # loop over and fix he
 for packName in ${pcks[@]}; do
@@ -24,5 +24,5 @@ for packName in ${pcks[@]}; do
     # first, convert all guards to pragmas
     guard2once -r .
     # then converts from pragmas to header with specific pattern
-    once2guard -r -p "path -1 | prepend ${packName}_ | upper | append _" -s "#endif  // %\n" .
+    once2guard -r -p "path -1 | prepend PRESSIO_${packName}_ | upper | append _" -s "#endif  // %\n" .
 done
diff --git a/include/pressio/ode/concepts/ode_has_const_discrete_residual_jacobian_method.hpp b/include/pressio/ode/concepts/ode_has_const_discrete_residual_jacobian_method.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_CONCEPTS_PREDICATES_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
-#define ODE_CONCEPTS_PREDICATES_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
+#ifndef PRESSIO_ODE_CONCEPTS_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
+#define PRESSIO_ODE_CONCEPTS_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
 
 #ifdef PRESSIO_ENABLE_CXX17
 #include <optional>
@@ -182,4 +182,4 @@ struct has_const_discrete_residual_jacobian_method<
   > : std::true_type{};
 
 }}
-#endif  // ODE_CONCEPTS_PREDICATES_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
+#endif  // PRESSIO_ODE_CONCEPTS_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
diff --git a/include/pressio/ode/concepts/ode_others.hpp b/include/pressio/ode/concepts/ode_others.hpp
@@ -1,6 +1,6 @@
 
-#ifndef ODE_CONCEPTS_OTHERS_HPP_
-#define ODE_CONCEPTS_OTHERS_HPP_
+#ifndef PRESSIO_ODE_CONCEPTS_ODE_OTHERS_HPP_
+#define PRESSIO_ODE_CONCEPTS_ODE_OTHERS_HPP_
 
 namespace pressio{ namespace ode{
 
@@ -152,4 +152,4 @@ struct StepSizePolicyWithReductionScheme<
   > : std::true_type{};
 
 }} // end namespace pressio::ode
-#endif
+#endif  // PRESSIO_ODE_CONCEPTS_ODE_OTHERS_HPP_
diff --git a/include/pressio/ode/concepts/ode_others_cxx20.hpp b/include/pressio/ode/concepts/ode_others_cxx20.hpp
@@ -1,6 +1,6 @@
 
-#ifndef ODE_CONCEPTS_OTHERS_HPP_
-#define ODE_CONCEPTS_OTHERS_HPP_
+#ifndef PRESSIO_ODE_CONCEPTS_ODE_OTHERS_CXX20_HPP_
+#define PRESSIO_ODE_CONCEPTS_ODE_OTHERS_CXX20_HPP_
 
 #include <concepts>
 
@@ -88,4 +88,4 @@ concept StepSizePolicyWithReductionScheme =
   };
 
 }}// end namespace pressio::ode
-#endif
+#endif  // PRESSIO_ODE_CONCEPTS_ODE_OTHERS_CXX20_HPP_
diff --git a/include/pressio/ode/concepts/ode_predicates_for_system.hpp b/include/pressio/ode/concepts/ode_predicates_for_system.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_CONCEPTS_PREDICATES_HPP_
-#define ODE_CONCEPTS_PREDICATES_HPP_
+#ifndef PRESSIO_ODE_CONCEPTS_ODE_PREDICATES_FOR_SYSTEM_HPP_
+#define PRESSIO_ODE_CONCEPTS_ODE_PREDICATES_FOR_SYSTEM_HPP_
 
 namespace pressio{ namespace ode{
 
@@ -162,4 +162,4 @@ struct has_const_create_discrete_jacobian_method_return_result<
   > : std::true_type{};
 
 }}
-#endif  // ODE_CONCEPTS_PREDICATES_ODE_HAS_CONST_DISCRETE_RESIDUAL_JACOBIAN_METHOD_HPP_
+#endif  // PRESSIO_ODE_CONCEPTS_ODE_PREDICATES_FOR_SYSTEM_HPP_
diff --git a/include/pressio/ode/concepts/ode_system.hpp b/include/pressio/ode/concepts/ode_system.hpp
@@ -1,6 +1,6 @@
 
-#ifndef ODE_CONCEPTS_SYSTEM_ALL_HPP_
-#define ODE_CONCEPTS_SYSTEM_ALL_HPP_
+#ifndef PRESSIO_ODE_CONCEPTS_ODE_SYSTEM_HPP_
+#define PRESSIO_ODE_CONCEPTS_ODE_SYSTEM_HPP_
 
 #include "ode_predicates_for_system.hpp"
 #include "ode_has_const_discrete_residual_jacobian_method.hpp"
@@ -339,4 +339,4 @@ struct ImplicitResidualJacobianPolicy<
   > : std::true_type{};
 
 }}
-#endif
+#endif  // PRESSIO_ODE_CONCEPTS_ODE_SYSTEM_HPP_
diff --git a/include/pressio/ode/concepts/ode_system_cxx20.hpp b/include/pressio/ode/concepts/ode_system_cxx20.hpp
@@ -1,6 +1,6 @@
 
-#ifndef ODE_CONCEPTS_SYSTEM_ALL_HPP_
-#define ODE_CONCEPTS_SYSTEM_ALL_HPP_
+#ifndef PRESSIO_ODE_CONCEPTS_ODE_SYSTEM_CXX20_HPP_
+#define PRESSIO_ODE_CONCEPTS_ODE_SYSTEM_CXX20_HPP_
 
 #include <concepts>
 #include "ode_has_const_discrete_residual_jacobian_method.hpp"
@@ -211,4 +211,4 @@ struct scalar_of{
 template <class T, int n=0> using scalar_of_t = typename scalar_of<T,n>::type;
 
 }}
-#endif
+#endif  // PRESSIO_ODE_CONCEPTS_ODE_SYSTEM_CXX20_HPP_
diff --git a/include/pressio/ode/exceptions.hpp b/include/pressio/ode/exceptions.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_EXCEPTIONS_HPP_
-#define ODE_EXCEPTIONS_HPP_
+#ifndef PRESSIO_ODE_EXCEPTIONS_HPP_
+#define PRESSIO_ODE_EXCEPTIONS_HPP_
 
 #include <exception>
 
@@ -126,4 +126,4 @@ class DiscreteTimeResidualFailureUnrecoverable
 };
 
 }}//end namespace pressio::eh
-#endif  // ODE_EXCEPTIONS_HPP_
+#endif  // PRESSIO_ODE_EXCEPTIONS_HPP_
diff --git a/include/pressio/ode/impl/ode_advance_mandates.hpp b/include/pressio/ode/impl/ode_advance_mandates.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_ADVANCE_MANDATES_HPP_
-#define ODE_IMPL_ODE_ADVANCE_MANDATES_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_ADVANCE_MANDATES_HPP_
+#define PRESSIO_ODE_IMPL_ODE_ADVANCE_MANDATES_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -65,4 +65,4 @@ constexpr void mandate_on_ind_var_and_state_types(const StepperType & /*unused*/
 }
 
 }}} //end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_ADVANCE_MANDATES_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_ADVANCE_MANDATES_HPP_
diff --git a/include/pressio/ode/impl/ode_advance_n_steps.hpp b/include/pressio/ode/impl/ode_advance_n_steps.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_ADVANCE_N_STEPS_HPP_
-#define ODE_IMPL_ODE_ADVANCE_N_STEPS_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_ADVANCE_N_STEPS_HPP_
+#define PRESSIO_ODE_IMPL_ODE_ADVANCE_N_STEPS_HPP_
 
 #include "ode_advance_printing_helpers.hpp"
 
@@ -139,4 +139,4 @@ void advance_n_steps_with_fixed_dt(StepperType & stepper,
 }
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_ADVANCE_N_STEPS_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_ADVANCE_N_STEPS_HPP_
diff --git a/include/pressio/ode/impl/ode_advance_noop_guesser.hpp b/include/pressio/ode/impl/ode_advance_noop_guesser.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_ADVANCE_NOOP_GUESSER_HPP_
-#define ODE_IMPL_ODE_ADVANCE_NOOP_GUESSER_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_ADVANCE_NOOP_GUESSER_HPP_
+#define PRESSIO_ODE_IMPL_ODE_ADVANCE_NOOP_GUESSER_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -63,4 +63,4 @@ struct NoOpStateGuesser
 };
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_ADVANCE_NOOP_GUESSER_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_ADVANCE_NOOP_GUESSER_HPP_
diff --git a/include/pressio/ode/impl/ode_advance_noop_observer.hpp b/include/pressio/ode/impl/ode_advance_noop_observer.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_ADVANCE_NOOP_OBSERVER_HPP_
-#define ODE_IMPL_ODE_ADVANCE_NOOP_OBSERVER_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_ADVANCE_NOOP_OBSERVER_HPP_
+#define PRESSIO_ODE_IMPL_ODE_ADVANCE_NOOP_OBSERVER_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -63,4 +63,4 @@ struct NoOpStateObserver
 };
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_ADVANCE_NOOP_OBSERVER_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_ADVANCE_NOOP_OBSERVER_HPP_
diff --git a/include/pressio/ode/impl/ode_advance_printing_helpers.hpp b/include/pressio/ode/impl/ode_advance_printing_helpers.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_ADVANCE_PRINTING_HELPERS_HPP_
-#define ODE_IMPL_ODE_ADVANCE_PRINTING_HELPERS_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_ADVANCE_PRINTING_HELPERS_HPP_
+#define PRESSIO_ODE_IMPL_ODE_ADVANCE_PRINTING_HELPERS_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -61,4 +61,4 @@ void print_step_and_current_time(const typename StepCount::value_type & step,
 }
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_ADVANCE_PRINTING_HELPERS_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_ADVANCE_PRINTING_HELPERS_HPP_
diff --git a/include/pressio/ode/impl/ode_advance_to_target_time.hpp b/include/pressio/ode/impl/ode_advance_to_target_time.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_ADVANCE_TO_TARGET_TIME_HPP_
-#define ODE_IMPL_ODE_ADVANCE_TO_TARGET_TIME_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_ADVANCE_TO_TARGET_TIME_HPP_
+#define PRESSIO_ODE_IMPL_ODE_ADVANCE_TO_TARGET_TIME_HPP_
 
 #include "ode_advance_printing_helpers.hpp"
 
@@ -188,4 +188,4 @@ void to_target_time_with_step_size_policy(StepperType & stepper,
 }
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_ADVANCE_TO_TARGET_TIME_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_ADVANCE_TO_TARGET_TIME_HPP_
diff --git a/include/pressio/ode/impl/ode_explicit_create_impl.hpp b/include/pressio/ode/impl/ode_explicit_create_impl.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_EXPLICIT_CREATE_IMPL_HPP_
-#define ODE_IMPL_ODE_EXPLICIT_CREATE_IMPL_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_EXPLICIT_CREATE_IMPL_HPP_
+#define PRESSIO_ODE_IMPL_ODE_EXPLICIT_CREATE_IMPL_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -83,4 +83,4 @@ auto create_explicit_stepper(StepScheme name,
 }
 
 }}}
-#endif  // ODE_IMPL_ODE_EXPLICIT_CREATE_IMPL_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_EXPLICIT_CREATE_IMPL_HPP_
diff --git a/include/pressio/ode/impl/ode_explicit_stepper_with_mass_matrix.hpp b/include/pressio/ode/impl/ode_explicit_stepper_with_mass_matrix.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_EXPLICIT_STEPPER_WITH_MASS_MATRIX_HPP_
-#define ODE_IMPL_ODE_EXPLICIT_STEPPER_WITH_MASS_MATRIX_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_EXPLICIT_STEPPER_WITH_MASS_MATRIX_HPP_
+#define PRESSIO_ODE_IMPL_ODE_EXPLICIT_STEPPER_WITH_MASS_MATRIX_HPP_
 
 #include <vector>
 
@@ -405,4 +405,4 @@ class ExplicitStepperWithMassMatrixImpl
 };
 
 }}}//end namespace pressio::ode::explicitmethods::impl
-#endif  // ODE_IMPL_ODE_EXPLICIT_STEPPER_WITH_MASS_MATRIX_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_EXPLICIT_STEPPER_WITH_MASS_MATRIX_HPP_
diff --git a/include/pressio/ode/impl/ode_explicit_stepper_without_mass_matrix.hpp b/include/pressio/ode/impl/ode_explicit_stepper_without_mass_matrix.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_EXPLICIT_STEPPER_WITHOUT_MASS_MATRIX_HPP_
-#define ODE_IMPL_ODE_EXPLICIT_STEPPER_WITHOUT_MASS_MATRIX_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_EXPLICIT_STEPPER_WITHOUT_MASS_MATRIX_HPP_
+#define PRESSIO_ODE_IMPL_ODE_EXPLICIT_STEPPER_WITHOUT_MASS_MATRIX_HPP_
 
 #include <array>
 
@@ -339,4 +339,4 @@ class ExplicitStepperNoMassMatrixImpl{
 };
 
 }}}//end namespace pressio::ode::explicitmethods::impl
-#endif  // ODE_IMPL_ODE_EXPLICIT_STEPPER_WITHOUT_MASS_MATRIX_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_EXPLICIT_STEPPER_WITHOUT_MASS_MATRIX_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_create_impl.hpp b/include/pressio/ode/impl/ode_implicit_create_impl.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_CREATE_IMPL_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_CREATE_IMPL_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_CREATE_IMPL_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_CREATE_IMPL_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -77,4 +77,4 @@ auto create_implicit_stepper_impl(StepScheme name,
 }
 
 }}}
-#endif  // ODE_IMPL_ODE_IMPLICIT_CREATE_IMPL_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_CREATE_IMPL_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_discrete_jacobian.hpp b/include/pressio/ode/impl/ode_implicit_discrete_jacobian.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_DISCRETE_JACOBIAN_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_DISCRETE_JACOBIAN_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_DISCRETE_JACOBIAN_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_DISCRETE_JACOBIAN_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -171,4 +171,4 @@ discrete_jacobian(::pressio::ode::CrankNicolson,
 }
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_IMPLICIT_DISCRETE_JACOBIAN_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_DISCRETE_JACOBIAN_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_discrete_residual.hpp b/include/pressio/ode/impl/ode_implicit_discrete_residual.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_DISCRETE_RESIDUAL_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_DISCRETE_RESIDUAL_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_DISCRETE_RESIDUAL_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_DISCRETE_RESIDUAL_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -268,4 +268,4 @@ discrete_residual(::pressio::ode::CrankNicolson,
 }
 
 }}}//end namespace pressio::ode::impl
-#endif  // ODE_IMPL_ODE_IMPLICIT_DISCRETE_RESIDUAL_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_DISCRETE_RESIDUAL_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_with_mass_matrix.hpp b/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_with_mass_matrix.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITH_MASS_MATRIX_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITH_MASS_MATRIX_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITH_MASS_MATRIX_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITH_MASS_MATRIX_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -244,4 +244,4 @@ class ResidualJacobianWithMassMatrixStandardPolicy
 };
 
 }}}//end namespace pressio::ode::implicitmethods::policy
-#endif  // ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITH_MASS_MATRIX_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITH_MASS_MATRIX_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_without_mass_matrix.hpp b/include/pressio/ode/impl/ode_implicit_policy_residual_jacobian_without_mass_matrix.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITHOUT_MASS_MATRIX_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITHOUT_MASS_MATRIX_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITHOUT_MASS_MATRIX_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITHOUT_MASS_MATRIX_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -304,4 +304,4 @@ class ResidualJacobianStandardPolicy
 };
 
 }}}//end namespace pressio::ode::implicitmethods::policy
-#endif  // ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITHOUT_MASS_MATRIX_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_POLICY_RESIDUAL_JACOBIAN_WITHOUT_MASS_MATRIX_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_stepper_arbitrary.hpp b/include/pressio/ode/impl/ode_implicit_stepper_arbitrary.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_STEPPER_ARBITRARY_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_STEPPER_ARBITRARY_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_STEPPER_ARBITRARY_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_STEPPER_ARBITRARY_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -276,4 +276,4 @@ class StepperArbitrary
 };
 
 }}}
-#endif  // ODE_IMPL_ODE_IMPLICIT_STEPPER_ARBITRARY_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_STEPPER_ARBITRARY_HPP_
diff --git a/include/pressio/ode/impl/ode_implicit_stepper_standard.hpp b/include/pressio/ode/impl/ode_implicit_stepper_standard.hpp
@@ -46,8 +46,8 @@
 //@HEADER
 */
 
-#ifndef ODE_IMPL_ODE_IMPLICIT_STEPPER_STANDARD_HPP_
-#define ODE_IMPL_ODE_IMPLICIT_STEPPER_STANDARD_HPP_
+#ifndef PRESSIO_ODE_IMPL_ODE_IMPLICIT_STEPPER_STANDARD_HPP_
+#define PRESSIO_ODE_IMPL_ODE_IMPLICIT_STEPPER_STANDARD_HPP_
 
 namespace pressio{ namespace ode{ namespace impl{
 
@@ -325,4 +325,4 @@ class ImplicitStepperStandardImpl
 };
 
 }}} // end namespace pressio::ode::implicitmethods
-#endif  // ODE_IMPL_ODE_IMPLICIT_STEPPER_STANDARD_HPP_
+#endif  // PRESSIO_ODE_IMPL_ODE_IMPLICIT_STEPPER_STANDARD_HPP_