diff --git a/src/config_parser.cpp b/src/config_parser.cpp
index 1e8e646..74a47ba 100644
--- a/src/config_parser.cpp
+++ b/src/config_parser.cpp
@@ -123,12 +123,12 @@
     setFile(filename);
 }
 
-inline bool isspace(char c) noexcept
+constexpr bool isspace(char c) noexcept
 {
     return c == ' ' || c == '\t';
 }
 
-inline bool iscomment(char c) noexcept
+constexpr bool iscomment(char c) noexcept
 {
     return c == '#' || c == ';';
 }
diff --git a/src/config_parser.hpp b/src/config_parser.hpp
index 461a22d..5d98f52 100644
--- a/src/config_parser.hpp
+++ b/src/config_parser.hpp
@@ -35,28 +35,27 @@
     };
 
     template <typename... Args>
-    inline constexpr Checked(Args&&... args) :
-        t(conCheck(std::forward<Args>(args)...))
+    constexpr Checked(Args&&... args) : t(conCheck(std::forward<Args>(args)...))
     {
     }
 
     template <typename... Args>
-    inline constexpr Checked(unchecked, Args&&... args) :
+    constexpr Checked(unchecked, Args&&... args) :
         t(std::forward<Args>(args)...)
     {
     }
 
-    inline const T& get() const noexcept
+    constexpr const T& get() const noexcept
     {
         return t;
     }
 
-    inline constexpr operator const T&() const noexcept
+    constexpr operator const T&() const noexcept
     {
         return t;
     }
 
-    inline constexpr bool operator==(const auto& rhs) const
+    constexpr bool operator==(const auto& rhs) const noexcept
     {
         return t == rhs;
     }
@@ -65,7 +64,7 @@
     T t;
 
     template <typename... Args>
-    inline static constexpr T conCheck(Args&&... args)
+    static constexpr T conCheck(Args&&... args)
     {
         T t(std::forward<Args>(args)...);
         Check{}(t);
@@ -74,14 +73,14 @@
 };
 
 template <typename T, typename Check>
-inline constexpr bool operator==(const auto& lhs, const Checked<T, Check>& rhs)
+constexpr bool operator==(const auto& lhs,
+                          const Checked<T, Check>& rhs) noexcept
 {
     return lhs == rhs.get();
 }
 
 template <typename T, typename Check>
-inline constexpr std::ostream& operator<<(std::ostream& s,
-                                          const Checked<T, Check>& rhs)
+inline std::ostream& operator<<(std::ostream& s, const Checked<T, Check>& rhs)
 {
     return s << rhs.get();
 }
