Index: src/OFApplication.h
==================================================================
--- src/OFApplication.h
+++ src/OFApplication.h
@@ -189,11 +189,11 @@
  *
  * @param argc A pointer where a pointer to argc should be stored
  * @param argv A pointer where a pointer to argv should be stored
  */
 - (void)getArgumentCount: (int *_Nonnull *_Nonnull)argc
-       andArgumentValues: (char *_Nonnull *_Nonnull *_Nonnull[])argv;
+       andArgumentValues: (char *_Nonnull *_Nonnull *_Nonnull[_Nonnull])argv;
 
 /*!
  * @brief Returns the delegate of the application.
  *
  * @return The delegate of the application
@@ -221,12 +221,12 @@
 @end
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern int of_application_main(int *_Nonnull, char *_Nonnull *_Nonnull[],
-    Class);
+extern int of_application_main(int *_Nonnull,
+    char *_Nonnull *_Nonnull[_Nonnull], Class);
 #ifdef __cplusplus
 }
 #endif
 
 OF_ASSUME_NONNULL_END

Index: src/OFTarArchiveEntry+Private.h
==================================================================
--- src/OFTarArchiveEntry+Private.h
+++ src/OFTarArchiveEntry+Private.h
@@ -17,11 +17,11 @@
 #import "OFTarArchiveEntry.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OFTarArchiveEntry ()
-- (instancetype)OF_initWithHeader: (char[512])header
+- (instancetype)OF_initWithHeader: (char[_Nonnull 512])header
 			   stream: (OFStream*)stream;
 - (void)OF_skip;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/scrypt.h
==================================================================
--- src/scrypt.h
+++ src/scrypt.h
@@ -30,11 +30,11 @@
 @class OFHMAC;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-extern void of_salsa20_8_core(uint32_t buffer[16]);
+extern void of_salsa20_8_core(uint32_t buffer[_Nonnull 16]);
 extern void of_scrypt_block_mix(uint32_t *output, const uint32_t *input,
     size_t blockSize);
 extern void of_scrypt_romix(uint32_t *buffer, size_t blockSize,
     size_t costFactor, uint32_t *tmp);
 extern void of_scrypt(size_t blockSize, size_t costFactor,