diff --git a/luna/include/luna/LinkedList.h b/luna/include/luna/LinkedList.h
index 6a899ea1..c390f986 100644
--- a/luna/include/luna/LinkedList.h
+++ b/luna/include/luna/LinkedList.h
@@ -2,13 +2,6 @@
 #include <luna/Option.h>
 #include <luna/TypeTraits.h>
 
-template <typename T> inline Option<T*> nonnull_or_empty_option(T* ptr)
-{
-    if (ptr == nullptr) return {};
-    else
-        return ptr;
-}
-
 template <typename T> class LinkedList;
 
 template <typename T> class LinkedListNode
diff --git a/luna/include/luna/Option.h b/luna/include/luna/Option.h
index 2173b704..8dcf4521 100644
--- a/luna/include/luna/Option.h
+++ b/luna/include/luna/Option.h
@@ -142,4 +142,11 @@ template <typename T> class Option
     };
     Storage m_storage;
     bool m_has_value { false };
-};
\ No newline at end of file
+};
+
+template <typename T> inline Option<T*> nonnull_or_empty_option(T* ptr)
+{
+    if (ptr == nullptr) return {};
+    else
+        return ptr;
+}
\ No newline at end of file