Index: src/Makefile
==================================================================
--- src/Makefile
+++ src/Makefile
@@ -75,10 +75,11 @@
        OFSHA512Hash.m			\
        OFScrypt.m			\
        OFSecureData.m			\
        OFSeekableStream.m		\
        OFSet.m				\
+       OFSettings.m			\
        OFSortedList.m			\
        OFStdIOStream.m			\
        OFStream.m			\
        OFString.m			\
        OFString+CryptographicHashing.m	\
@@ -86,11 +87,10 @@
        OFString+PercentEncoding.m	\
        OFString+PropertyListParsing.m	\
        OFString+XMLEscaping.m		\
        OFString+XMLUnescaping.m		\
        ${OF_SUBPROCESS_M}		\
-       OFSettings.m			\
        OFSystemInfo.m			\
        OFTarArchive.m			\
        OFTarArchiveEntry.m		\
        OFThread.m			\
        OFTimer.m			\

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -1477,10 +1477,17 @@
 #endif
 extern id OFAllocObject(Class class_, size_t extraSize, size_t extraAlignment,
     void *_Nullable *_Nullable extra);
 extern void OF_NO_RETURN_FUNC OFMethodNotFound(id self, SEL _cmd);
 
+/**
+ * @brief Initializes the specified hash.
+ *
+ * @param hash A pointer to the hash to initialize
+ */
+extern void OFHashInit(unsigned long *_Nonnull hash);
+
 /**
  * @brief Returns 16 bit or non-cryptographical randomness.
  *
  * @return 16 bit or non-cryptographical randomness
  */
@@ -1497,17 +1504,10 @@
  * @brief Returns 64 bit or non-cryptographical randomness.
  *
  * @return 64 bit or non-cryptographical randomness
  */
 extern uint64_t OFRandom64(void);
-
-/**
- * @brief Initializes the specified hash.
- *
- * @param hash A pointer to the hash to initialize
- */
-extern void OFHashInit(unsigned long *_Nonnull hash);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END

Index: src/OFOnce.h
==================================================================
--- src/OFOnce.h
+++ src/OFOnce.h
@@ -29,10 +29,14 @@
 # define OFOnceControlInitValue 0
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
+/** @file */
+
+typedef void (*OFOnceFunction)(void);
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 /**
  * @brief Executes the specified function exactly once in the application's
@@ -40,11 +44,11 @@
  *
  * @param control An OFOnceControl. This should be a static variable
  *		  preinitialized to `OFOnceControlInitValue`.
  * @param function The function to execute once
  */
-extern void OFOnce(OFOnceControl *control, void (*function)(void));
+extern void OFOnce(OFOnceControl *control, OFOnceFunction function);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END

Index: src/OFPBKDF2.h
==================================================================
--- src/OFPBKDF2.h
+++ src/OFPBKDF2.h
@@ -64,13 +64,13 @@
  *
  * @note This will call @ref OFHMAC::reset on the `HMAC` first, making it
  *	 possible to reuse the `HMAC`, but also meaning all previous results
  *	 from the `HMAC` get invalidated if they have not been copied.
  *
- * @param param The parameters to use
+ * @param parameters The parameters to use
  */
-extern void OFPBKDF2(OFPBKDF2Parameters param);
+extern void OFPBKDF2(OFPBKDF2Parameters parameters);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END

Index: src/OFScrypt.h
==================================================================
--- src/OFScrypt.h
+++ src/OFScrypt.h
@@ -68,13 +68,13 @@
     size_t costFactor, uint32_t *tmp);
 
 /**
  * @brief Derives a key from a password and a salt using scrypt.
  *
- * @param param The parameters to use
+ * @param parameters The parameters to use
  */
-extern void OFScrypt(OFScryptParameters param);
+extern void OFScrypt(OFScryptParameters parameters);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END