Index: src/OFASPrintF.m
==================================================================
--- src/OFASPrintF.m
+++ src/OFASPrintF.m
@@ -51,11 +51,11 @@
  */
 # define asprintf asprintf_
 # define vasprintf vasprintf_
 #endif
 
-struct context {
+struct Context {
 	const char *format;
 	size_t formatLen;
 	char subformat[maxSubformatLen + 1];
 	size_t subformatLen;
 	va_list arguments;
@@ -146,11 +146,11 @@
 	return ret;
 }
 #endif
 
 static bool
-appendString(struct context *ctx, const char *append, size_t appendLen)
+appendString(struct Context *ctx, const char *append, size_t appendLen)
 {
 	char *newBuf;
 
 	if (appendLen == 0)
 		return true;
@@ -166,11 +166,11 @@
 
 	return true;
 }
 
 static bool
-appendSubformat(struct context *ctx, const char *subformat,
+appendSubformat(struct Context *ctx, const char *subformat,
     size_t subformatLen)
 {
 	if (ctx->subformatLen + subformatLen > maxSubformatLen)
 		return false;
 
@@ -180,11 +180,11 @@
 
 	return true;
 }
 
 static bool
-stringState(struct context *ctx)
+stringState(struct Context *ctx)
 {
 	if (ctx->format[ctx->i] == '%') {
 		if (ctx->i > 0)
 			if (!appendString(ctx, ctx->format + ctx->last,
 			    ctx->i - ctx->last))
@@ -199,11 +199,11 @@
 
 	return true;
 }
 
 static bool
-formatFlagsState(struct context *ctx)
+formatFlagsState(struct Context *ctx)
 {
 	switch (ctx->format[ctx->i]) {
 	case '-':
 	case '+':
 	case ' ':
@@ -226,11 +226,11 @@
 
 	return true;
 }
 
 static bool
-formatFieldWidthState(struct context *ctx)
+formatFieldWidthState(struct Context *ctx)
 {
 	if ((ctx->format[ctx->i] >= '0' && ctx->format[ctx->i] <= '9') ||
 	    ctx->format[ctx->i] == '*' || ctx->format[ctx->i] == '.') {
 		if (!appendSubformat(ctx, ctx->format + ctx->i, 1))
 			return false;
@@ -241,11 +241,11 @@
 
 	return true;
 }
 
 static bool
-formatLengthModifierState(struct context *ctx)
+formatLengthModifierState(struct Context *ctx)
 {
 	/* Only one allowed */
 	switch (ctx->format[ctx->i]) {
 	case 'h': /* and also hh */
 		if (ctx->formatLen > ctx->i + 1 &&
@@ -371,11 +371,11 @@
 	ctx->state = stateFormatConversionSpecifier;
 	return true;
 }
 
 static bool
-formatConversionSpecifierState(struct context *ctx)
+formatConversionSpecifierState(struct Context *ctx)
 {
 	char *tmp = NULL;
 	int tmpLen = 0;
 #ifndef HAVE_ASPRINTF_L
 	OFString *point;
@@ -729,11 +729,11 @@
 	ctx->state = stateString;
 
 	return true;
 }
 
-static bool (*states[])(struct context *) = {
+static bool (*states[])(struct Context *) = {
 	stringState,
 	formatFlagsState,
 	formatFieldWidthState,
 	formatLengthModifierState,
 	formatConversionSpecifierState
@@ -740,11 +740,11 @@
 };
 
 int
 OFVASPrintF(char **string, const char *format, va_list arguments)
 {
-	struct context ctx;
+	struct Context ctx;
 
 	ctx.format = format;
 	ctx.formatLen = strlen(format);
 	memset(ctx.subformat, 0, maxSubformatLen + 1);
 	ctx.subformatLen = 0;

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -70,11 +70,11 @@
 #ifdef OF_APPLE_RUNTIME
 extern id _Nullable _objc_rootAutorelease(id _Nullable object);
 #endif
 #if defined(OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR)
 extern id OFForward(id, SEL, ...);
-extern struct stret OFForward_stret(id, SEL, ...);
+extern struct Stret OFForward_stret(id, SEL, ...);
 #else
 # define OFForward OFMethodNotFound
 # define OFForward_stret OFMethodNotFound_stret
 #endif
 

Index: src/OFSecureData.h
==================================================================
--- src/OFSecureData.h
+++ src/OFSecureData.h
@@ -30,11 +30,11 @@
  *	    memory.
  */
 OF_SUBCLASSING_RESTRICTED
 @interface OFSecureData: OFData
 {
-	struct page *_page;
+	void *_page;
 	bool _allowsSwappableMemory;
 }
 
 /**
  * @brief Whether the data may be stored in swappable memory.

Index: src/OFSecureData.m
==================================================================
--- src/OFSecureData.m
+++ src/OFSecureData.m
@@ -36,28 +36,28 @@
 #import "OFOutOfRangeException.h"
 
 #if defined(HAVE_MMAP) && defined(HAVE_MLOCK) && defined(MAP_ANON)
 static const size_t chunkSize = 16;
 
-struct page {
-	struct page *next, *previous;
+struct Page {
+	struct Page *next, *previous;
 	void *map;
 	unsigned char *page;
 };
 
 # if defined(OF_HAVE_COMPILER_TLS)
-static thread_local struct page *firstPage = NULL;
-static thread_local struct page *lastPage = NULL;
-static thread_local struct page **preallocatedPages = NULL;
+static thread_local struct Page *firstPage = NULL;
+static thread_local struct Page *lastPage = NULL;
+static thread_local struct Page **preallocatedPages = NULL;
 static thread_local size_t numPreallocatedPages = 0;
 # elif defined(OF_HAVE_THREADS)
 static OFTLSKey firstPageKey, lastPageKey;
 static OFTLSKey preallocatedPagesKey, numPreallocatedPagesKey;
 # else
-static struct page *firstPage = NULL;
-static struct page *lastPage = NULL;
-static struct page **preallocatedPages = NULL;
+static struct Page *firstPage = NULL;
+static struct Page *lastPage = NULL;
+static struct Page **preallocatedPages = NULL;
 static size_t numPreallocatedPages = 0;
 # endif
 
 static void *
 mapPages(size_t numPages)
@@ -92,19 +92,19 @@
 
 	munlock(pointer, numPages * pageSize);
 	munmap(pointer, numPages * pageSize);
 }
 
-static struct page *
+static struct Page *
 addPage(bool allowPreallocated)
 {
 	size_t pageSize = [OFSystemInfo pageSize];
 	size_t mapSize = OFRoundUpToPowerOf2(CHAR_BIT, pageSize / chunkSize) /
 	    CHAR_BIT;
-	struct page *page;
+	struct Page *page;
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	struct page *lastPage;
+	struct Page *lastPage;
 # endif
 
 	if (allowPreallocated) {
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 		uintptr_t numPreallocatedPages =
@@ -111,11 +111,11 @@
 		    (uintptr_t)OFTLSKeyGet(numPreallocatedPagesKey);
 # endif
 
 		if (numPreallocatedPages > 0) {
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-			struct page **preallocatedPages =
+			struct Page **preallocatedPages =
 			    OFTLSKeyGet(preallocatedPagesKey);
 # endif
 
 			numPreallocatedPages--;
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
@@ -178,11 +178,11 @@
 
 	return page;
 }
 
 static void
-removePageIfEmpty(struct page *page)
+removePageIfEmpty(struct Page *page)
 {
 	unsigned char *map = page->map;
 	size_t pageSize = [OFSystemInfo pageSize];
 	size_t mapSize = OFRoundUpToPowerOf2(CHAR_BIT, pageSize / chunkSize) /
 	    CHAR_BIT;
@@ -213,11 +213,11 @@
 
 	OFFreeMemory(page);
 }
 
 static void *
-allocateMemory(struct page *page, size_t bytes)
+allocateMemory(struct Page *page, size_t bytes)
 {
 	size_t chunks, chunksLeft, pageSize, i, firstChunk;
 
 	bytes = OFRoundUpToPowerOf2(chunkSize, bytes);
 	chunks = chunksLeft = bytes / chunkSize;
@@ -244,11 +244,11 @@
 
 	return NULL;
 }
 
 static void
-freeMemory(struct page *page, void *pointer, size_t bytes)
+freeMemory(struct Page *page, void *pointer, size_t bytes)
 {
 	size_t chunks, chunkIndex;
 
 	bytes = OFRoundUpToPowerOf2(chunkSize, bytes);
 	chunks = bytes / chunkSize;
@@ -283,19 +283,19 @@
 {
 #if defined(HAVE_MMAP) && defined(HAVE_MLOCK) && defined(MAP_ANON)
 	size_t pageSize = [OFSystemInfo pageSize];
 	size_t numPages = OFRoundUpToPowerOf2(pageSize, size) / pageSize;
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-	struct page **preallocatedPages = OFTLSKeyGet(preallocatedPagesKey);
+	struct Page **preallocatedPages = OFTLSKeyGet(preallocatedPagesKey);
 	size_t numPreallocatedPages;
 # endif
 	size_t i;
 
 	if (preallocatedPages != NULL)
 		@throw [OFInvalidArgumentException exception];
 
-	preallocatedPages = OFAllocZeroedMemory(numPages, sizeof(struct page));
+	preallocatedPages = OFAllocZeroedMemory(numPages, sizeof(struct Page));
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
 	OFEnsure(OFTLSKeySet(preallocatedPagesKey, preallocatedPages) == 0);
 # endif
 
 	@try {
@@ -421,14 +421,14 @@
 		} else if (count * itemSize >= pageSize)
 			_items = mapPages(OFRoundUpToPowerOf2(pageSize,
 			    count * itemSize) / pageSize);
 		else {
 # if !defined(OF_HAVE_COMPILER_TLS) && defined(OF_HAVE_THREADS)
-			struct page *lastPage = OFTLSKeyGet(lastPageKey);
+			struct Page *lastPage = OFTLSKeyGet(lastPageKey);
 # endif
 
-			for (struct page *page = lastPage; page != NULL;
+			for (struct Page *page = lastPage; page != NULL;
 			    page = page->previous) {
 				_items = allocateMemory(page, count * itemSize);
 
 				if (_items != NULL) {
 					_page = page;