diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac355680..2dc81a3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,8 @@ target_sources(telnetpp
         src/command.cpp
         src/element.cpp
         src/negotiation.cpp
+        src/options/echo/client.cpp
+        src/options/echo/server.cpp
         src/options/mccp/client.cpp
         src/options/mccp/codec.cpp
         src/options/mccp/server.cpp
@@ -151,6 +153,8 @@ target_sources(telnetpp
         src/options/naws/server.cpp
         src/options/new_environ/client.cpp
         src/options/new_environ/server.cpp
+        src/options/suppress_ga/client.cpp
+        src/options/suppress_ga/server.cpp
         src/options/terminal_type/client.cpp
         src/session.cpp
         src/subnegotiation.cpp
diff --git a/include/telnetpp/options/echo/client.hpp b/include/telnetpp/options/echo/client.hpp
index 697a1615..351b51d8 100644
--- a/include/telnetpp/options/echo/client.hpp
+++ b/include/telnetpp/options/echo/client.hpp
@@ -16,10 +16,7 @@ class TELNETPP_EXPORT client : public telnetpp::options::basic_client<
                                    telnetpp::options::echo::detail::option>
 {
  public:
-  constexpr explicit client(telnetpp::session &sess) noexcept
-    : basic_client(sess)
-  {
-  }
+  explicit client(telnetpp::session &sess) noexcept;
 };
 
 }  // namespace telnetpp::options::echo
diff --git a/include/telnetpp/options/echo/server.hpp b/include/telnetpp/options/echo/server.hpp
index 2885be9b..e2d624d8 100644
--- a/include/telnetpp/options/echo/server.hpp
+++ b/include/telnetpp/options/echo/server.hpp
@@ -16,10 +16,7 @@ class TELNETPP_EXPORT server : public telnetpp::options::basic_server<
                                    telnetpp::options::echo::detail::option>
 {
  public:
-  constexpr explicit server(telnetpp::session &sess) noexcept
-    : basic_server(sess)
-  {
-  }
+  explicit server(telnetpp::session &sess) noexcept;
 };
 
 }  // namespace telnetpp::options::echo
diff --git a/include/telnetpp/options/suppress_ga/client.hpp b/include/telnetpp/options/suppress_ga/client.hpp
index 5c51cdc3..b5c1234c 100644
--- a/include/telnetpp/options/suppress_ga/client.hpp
+++ b/include/telnetpp/options/suppress_ga/client.hpp
@@ -18,10 +18,7 @@ class TELNETPP_EXPORT client
         telnetpp::options::suppress_ga::detail::option>
 {
  public:
-  constexpr explicit client(telnetpp::session &sess) noexcept
-    : basic_client(sess)
-  {
-  }
+  explicit client(telnetpp::session &sess) noexcept;
 };
 
 }  // namespace telnetpp::options::suppress_ga
diff --git a/include/telnetpp/options/suppress_ga/server.hpp b/include/telnetpp/options/suppress_ga/server.hpp
index 7670e673..ed61f079 100644
--- a/include/telnetpp/options/suppress_ga/server.hpp
+++ b/include/telnetpp/options/suppress_ga/server.hpp
@@ -18,10 +18,7 @@ class TELNETPP_EXPORT server
         telnetpp::options::suppress_ga::detail::option>
 {
  public:
-  constexpr explicit server(telnetpp::session &sess) noexcept
-    : basic_server(sess)
-  {
-  }
+  explicit server(telnetpp::session &sess) noexcept;
 };
 
 }  // namespace telnetpp::options::suppress_ga
diff --git a/src/options/echo/client.cpp b/src/options/echo/client.cpp
new file mode 100644
index 00000000..01c0c947
--- /dev/null
+++ b/src/options/echo/client.cpp
@@ -0,0 +1,9 @@
+#include "telnetpp/options/echo/client.hpp"
+
+namespace telnetpp::options::echo {
+
+client::client(telnetpp::session &sess) noexcept : basic_client(sess)
+{
+}
+
+}  // namespace telnetpp::options::echo
diff --git a/src/options/echo/server.cpp b/src/options/echo/server.cpp
new file mode 100644
index 00000000..3b654956
--- /dev/null
+++ b/src/options/echo/server.cpp
@@ -0,0 +1,9 @@
+#include "telnetpp/options/echo/server.hpp"
+
+namespace telnetpp::options::echo {
+
+server::server(telnetpp::session &sess) noexcept : basic_server(sess)
+{
+}
+
+}  // namespace telnetpp::options::echo
diff --git a/src/options/suppress_ga/client.cpp b/src/options/suppress_ga/client.cpp
new file mode 100644
index 00000000..0476c513
--- /dev/null
+++ b/src/options/suppress_ga/client.cpp
@@ -0,0 +1,9 @@
+#include "telnetpp/options/suppress_ga/client.hpp"
+
+namespace telnetpp::options::suppress_ga {
+
+client::client(telnetpp::session &sess) noexcept : basic_client(sess)
+{
+}
+
+}  // namespace telnetpp::options::suppress_ga
diff --git a/src/options/suppress_ga/server.cpp b/src/options/suppress_ga/server.cpp
new file mode 100644
index 00000000..e0f954e8
--- /dev/null
+++ b/src/options/suppress_ga/server.cpp
@@ -0,0 +1,9 @@
+#include "telnetpp/options/suppress_ga/server.hpp"
+
+namespace telnetpp::options::suppress_ga {
+
+server::server(telnetpp::session &sess) noexcept : basic_server(sess)
+{
+}
+
+}  // namespace telnetpp::options::suppress_ga