diff --git a/api/fs/common.hpp b/api/fs/common.hpp
index 15f56ba6a6..07e134b8cb 100644
--- a/api/fs/common.hpp
+++ b/api/fs/common.hpp
@@ -205,4 +205,4 @@ namespace fs {
 
 } //< namespace fs
 
-#endif //< FS_ERROR_HPP
+#endif //< FS_COMMON_HPP
diff --git a/api/net/http/connection.hpp b/api/net/http/connection.hpp
index 93e1a5e76f..ed8baf5bc6 100644
--- a/api/net/http/connection.hpp
+++ b/api/net/http/connection.hpp
@@ -67,7 +67,7 @@ namespace http {
     inline TCP_conn release();
 
     /**
-     * @brief      Wether the underlying TCP connection has been released or not
+     * @brief      Whether the underlying TCP connection has been released or not
      *
      * @return     true if the underlying TCP connection is released
      */
diff --git a/api/net/http/message.hpp b/api/net/http/message.hpp
index 48a22aa5b0..d4e9c6f546 100644
--- a/api/net/http/message.hpp
+++ b/api/net/http/message.hpp
@@ -99,7 +99,7 @@ class Message {
    *
    * @param[in]  len   The length of the content
    *
-   * @return     Outcome of wether the field got updated or not
+   * @return     Outcome of whether the field got updated or not
    */
   inline bool set_content_length(size_t len);
 
diff --git a/api/net/tcp/connection.hpp b/api/net/tcp/connection.hpp
index dc456157c9..0fa1cd5704 100644
--- a/api/net/tcp/connection.hpp
+++ b/api/net/tcp/connection.hpp
@@ -642,7 +642,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void writeq_reset();
 
   /*
-    Mark wether the Connection is in TCP write queue or not.
+    Mark whether the Connection is in TCP write queue or not.
   */
   void set_queued(bool queued)
   { queued_ = queued; }
@@ -888,7 +888,7 @@ class Connection : public std::enable_shared_from_this<Connection> {
   void timewait_timeout()
   { signal_close(); }
 
-  /** Wether to use Delayed ACK or not */
+  /** Whether to use Delayed ACK or not */
   bool use_dack() const;
 
   /**
diff --git a/api/net/tcp/rttm.hpp b/api/net/tcp/rttm.hpp
index 8a56deb4d9..a3e7c7f983 100644
--- a/api/net/tcp/rttm.hpp
+++ b/api/net/tcp/rttm.hpp
@@ -60,7 +60,7 @@ struct RTTM {
   {}
 
   /**
-   * @brief      Returns wether the RTTM is currently "measuring" (time is set)
+   * @brief      Returns whether the RTTM is currently "measuring" (time is set)
    *
    * @return     True if the RTTM is active (measuring)
    */
diff --git a/api/net/tcp/tcp.hpp b/api/net/tcp/tcp.hpp
index aa7986ac96..df257fb75b 100644
--- a/api/net/tcp/tcp.hpp
+++ b/api/net/tcp/tcp.hpp
@@ -69,7 +69,7 @@ namespace net {
      * map of listeners
      *
      * @param port listening port
-     * @return wether the listener had a port
+     * @return whether the listener had a port
      */
     bool unbind(const tcp::port_t port);
 
@@ -188,10 +188,10 @@ namespace net {
     { return wscale_; }
 
     /**
-     * @brief      Returns wether this TCP is using window scaling.
+     * @brief      Returns whether this TCP is using window scaling.
      *             A wscale factor of 0 means off.
      *
-     * @return     Wether wscale is being used
+     * @return     Whether wscale is being used
      */
     constexpr bool uses_wscale() const
     { return wscale_ > 0; }
diff --git a/api/util/chunk.hpp b/api/util/chunk.hpp
index 12fc3c43ab..62acb21ee2 100644
--- a/api/util/chunk.hpp
+++ b/api/util/chunk.hpp
@@ -121,7 +121,7 @@ class Chunk {
   Chunk operator+(const Chunk& c);
 
   /**
-   * @brief Check wether the chunk is valid/not empty
+   * @brief Check whether the chunk is valid/not empty
    */
   operator bool() const noexcept
   { return static_cast<bool>(buffer_) and (length_ > 0); }
diff --git a/api/util/timer.hpp b/api/util/timer.hpp
index 7e1642a216..bfce4d47b9 100644
--- a/api/util/timer.hpp
+++ b/api/util/timer.hpp
@@ -89,7 +89,7 @@ class Timer {
   /**
    * @brief If the timer is running (active)
    *
-   * @return Wether the timer is running or not
+   * @return whether the timer is running or not
    */
   bool is_running() const
   { return id_ != Timers::UNUSED_ID; }
diff --git a/lib/mana/include/mana/middleware/butler.hpp b/lib/mana/include/mana/middleware/butler.hpp
index 1b1399ebee..a45387dfaa 100644
--- a/lib/mana/include/mana/middleware/butler.hpp
+++ b/lib/mana/include/mana/middleware/butler.hpp
@@ -71,7 +71,7 @@ class Butler : public Middleware {
    * @details Very bad but easy way to assume the path is a request for a file.
    *
    * @param path
-   * @return wether a path is a file request or not
+   * @return whether a path is a file request or not
    */
   inline bool is_file_request(const std::string& path) const
   { return !get_extension(path).empty(); }
diff --git a/lib/mana/include/mana/response.hpp b/lib/mana/include/mana/response.hpp
index 9848906caa..db9685a9d2 100644
--- a/lib/mana/include/mana/response.hpp
+++ b/lib/mana/include/mana/response.hpp
@@ -131,14 +131,14 @@ class Response : public std::enable_shared_from_this<Response> {
    *             Mostly used for replying with an error.
    *
    * @param[in]  <unnamed>  { parameter_description }
-   * @param[in]  close      Wether to close the connection or not. Default = true
+   * @param[in]  close      Whether to close the connection or not. Default = true
    */
   void send_code(const Code, bool close = true);
 
   /**
    * @brief      Send the underlying Response as is.
    *
-   * @param[in]  force_close  Wether to forcefully close the connection. Default = false
+   * @param[in]  force_close  whether to forcefully close the connection. Default = false
    */
   void send(bool force_close = false);