2 files changed, 6 insertions, 5 deletions
diff --git a/dev/kernel/NetworkKit/NetworkDevice.h b/dev/kernel/NetworkKit/NetworkDevice.h
index 7ed67bab..48fed575 100644
--- a/dev/kernel/NetworkKit/NetworkDevice.h
+++ b/dev/kernel/NetworkKit/NetworkDevice.h
@@ -23,7 +23,7 @@ class NetworkDevice final : public IDeviceObject<NetworkDeviceCommand> {
  public:
   NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand),
                 void (*in)(IDeviceObject<NetworkDeviceCommand>*, NetworkDeviceCommand),
-                void (*onCleanup)(void) = nullptr);
+                void (*cleanup)(void) = nullptr);
 
   ~NetworkDevice() override;
 
@@ -36,10 +36,9 @@ class NetworkDevice final : public IDeviceObject<NetworkDeviceCommand> {
   Boolean     Name(const Char* newStr);
 
  private:
-  static constexpr auto cNetworkNameLen = 512;
+  static constexpr auto kNetworkNameLen = 512;
 
   Void (*fCleanup)(void);
-  Char fNetworkName[cNetworkNameLen];
 };
 
 struct NetworkDeviceCommand final {
diff --git a/dev/kernel/NetworkKit/NetworkDevice.inl b/dev/kernel/NetworkKit/NetworkDevice.inl
index 812c0248..84ec9edc 100644
--- a/dev/kernel/NetworkKit/NetworkDevice.inl
+++ b/dev/kernel/NetworkKit/NetworkDevice.inl
@@ -8,6 +8,10 @@
   Dtor and ctors.
 */
 
+#ifndef __INC_NETWORK_DEVICE_H__
+#include <NetworkKit/NetworkDevice.h>
+#endif  // __INC_NETWORK_DEVICE_H__
+
 namespace Kernel {
 inline NetworkDevice::NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceCommand>*,
                                                 NetworkDeviceCommand),
@@ -21,8 +25,6 @@ inline NetworkDevice::NetworkDevice(void (*out)(IDeviceObject<NetworkDeviceComma
 }
 
 inline NetworkDevice::~NetworkDevice() {
-  MUST_PASS(fCleanup);
-
   kout << "NetworkDevice cleanup.\r";
 
   if (fCleanup) fCleanup();