Index: src/OFGZIPStream.h
==================================================================
--- src/OFGZIPStream.h
+++ src/OFGZIPStream.h
@@ -23,11 +23,11 @@
 
 @interface OFGZIPStream: OFStream
 {
 	OFStream *_stream;
 	OFDeflateStream *_inflateStream;
-	enum {
+	enum of_gzip_stream_state {
 		OF_GZIP_STREAM_ID1,
 		OF_GZIP_STREAM_ID2,
 		OF_GZIP_STREAM_COMPRESSION_METHOD,
 		OF_GZIP_STREAM_FLAGS,
 		OF_GZIP_STREAM_MODIFICATION_TIME,
@@ -40,19 +40,19 @@
 		OF_GZIP_STREAM_HEADER_CRC16,
 		OF_GZIP_STREAM_DATA,
 		OF_GZIP_STREAM_CRC32,
 		OF_GZIP_STREAM_UNCOMPRESSED_SIZE
 	} _state;
-	enum {
+	enum of_gzip_stream_flags {
 		OF_GZIP_STREAM_FLAG_TEXT	 = 0x01,
 		OF_GZIP_STREAM_FLAG_HEADER_CRC16 = 0x02,
 		OF_GZIP_STREAM_FLAG_EXTRA	 = 0x04,
 		OF_GZIP_STREAM_FLAG_NAME	 = 0x08,
 		OF_GZIP_STREAM_FLAG_COMMENT	 = 0x10
 	} _flags;
 	uint8_t _extraFlags;
-	enum {
+	enum of_gzip_stream_os {
 		OF_GZIP_STREAM_OS_FAT	       =   0,
 		OF_GZIP_STREAM_OS_AMIGA	       =   1,
 		OF_GZIP_STREAM_OS_VMS	       =   2,
 		OF_GZIP_STREAM_OS_UNIX	       =   3,
 		OF_GZIP_STREAM_OS_VM_CMS       =   4,

Index: src/OFMD5Hash.h
==================================================================
--- src/OFMD5Hash.h
+++ src/OFMD5Hash.h
@@ -25,11 +25,11 @@
  */
 @interface OFMD5Hash: OFObject <OFCryptoHash>
 {
 	uint32_t _state[4];
 	uint64_t _bits;
-	union {
+	union of_md5_hash_buffer {
 		uint8_t bytes[64];
 		uint32_t words[16];
 	} _buffer;
 	size_t _bufferLength;
 	bool _calculated;

Index: src/OFRIPEMD160Hash.h
==================================================================
--- src/OFRIPEMD160Hash.h
+++ src/OFRIPEMD160Hash.h
@@ -25,11 +25,11 @@
  */
 @interface OFRIPEMD160Hash: OFObject <OFCryptoHash>
 {
 	uint32_t _state[5];
 	uint64_t _bits;
-	union {
+	union of_ripemd_160_hash_buffer {
 		uint8_t bytes[64];
 		uint32_t words[16];
 	} _buffer;
 	size_t _bufferLength;
 	bool _calculated;

Index: src/OFSHA1Hash.h
==================================================================
--- src/OFSHA1Hash.h
+++ src/OFSHA1Hash.h
@@ -25,11 +25,11 @@
  */
 @interface OFSHA1Hash: OFObject <OFCryptoHash>
 {
 	uint32_t _state[5];
 	uint64_t _bits;
-	union {
+	union of_sha_1_hash_buffer {
 		uint8_t bytes[64];
 		uint32_t words[80];
 	} _buffer;
 	size_t _bufferLength;
 	bool _calculated;

Index: src/OFSHA224Or256Hash.h
==================================================================
--- src/OFSHA224Or256Hash.h
+++ src/OFSHA224Or256Hash.h
@@ -25,11 +25,11 @@
  */
 @interface OFSHA224Or256Hash: OFObject <OFCryptoHash>
 {
 	uint32_t _state[8];
 	uint64_t _bits;
-	union {
+	union of_sha_224_or_256_hash_buffer {
 		uint8_t bytes[64];
 		uint32_t words[64];
 	} _buffer;
 	size_t _bufferLength;
 	bool _calculated;

Index: src/OFSHA384Or512Hash.h
==================================================================
--- src/OFSHA384Or512Hash.h
+++ src/OFSHA384Or512Hash.h
@@ -25,11 +25,11 @@
  */
 @interface OFSHA384Or512Hash: OFObject <OFCryptoHash>
 {
 	uint64_t _state[8];
 	uint64_t _bits[2];
-	union {
+	union of_sha_384_or_512_hash_buffer {
 		uint8_t bytes[128];
 		uint64_t words[80];
 	} _buffer;
 	size_t _bufferLength;
 	bool _calculated;

Index: src/OFThread.h
==================================================================
--- src/OFThread.h
+++ src/OFThread.h
@@ -59,11 +59,11 @@
 # else
 @private
 # endif
 	of_thread_t _thread;
 	of_thread_attr_t _attr;
-	enum {
+	enum of_thread_running {
 		OF_THREAD_NOT_RUNNING,
 		OF_THREAD_RUNNING,
 		OF_THREAD_WAITING_FOR_JOIN
 	} _running;
 	void *_pool;

Index: src/OFXMLParser.h
==================================================================
--- src/OFXMLParser.h
+++ src/OFXMLParser.h
@@ -131,11 +131,11 @@
  * as soon as it finds something, thus suitable for streams as well.
  */
 @interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
 {
 	id <OFXMLParserDelegate> _delegate;
-	enum {
+	enum of_xml_parser_state {
 		OF_XMLPARSER_IN_BYTE_ORDER_MARK,
 		OF_XMLPARSER_OUTSIDE_TAG,
 		OF_XMLPARSER_TAG_OPENED,
 		OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS,
 		OF_XMLPARSER_IN_TAG_NAME,