@@ -14,10 +14,12 @@
  * file.
  */
 
 #import "OFObject.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 @class OFString;
 
 #ifndef _WIN32
 typedef void* of_plugin_handle_t;
 #else
@@ -39,7 +41,9 @@
  * @brief Loads a plugin from a file.
  *
  * @param path Path to the plugin file. The suffix is appended automatically.
  * @return The loaded plugin
  */
-+ (id)pluginFromFile: (OFString*)path;
++ (OF_KINDOF(OFPlugin*))pluginFromFile: (OFString*)path;
 @end
+
+OF_ASSUME_NONNULL_END