diff --git a/base/dependencies/parsing.cpp b/base/dependencies/parsing.cpp
index 465e705..43ce31a 100644
--- a/base/dependencies/parsing.cpp
+++ b/base/dependencies/parsing.cpp
@@ -1111,4 +1111,6 @@ String csv_write_string_delimiter( AllocatorInfo a, CSV_Object* obj, char delimi
 	return output;
 }
 
+#undef _adt_fprintf
+
 #pragma endregion CSV
diff --git a/base/dependencies/platform.hpp b/base/dependencies/platform.hpp
index ab6c0d6..80a7cb9 100644
--- a/base/dependencies/platform.hpp
+++ b/base/dependencies/platform.hpp
@@ -29,12 +29,6 @@
 #	ifndef GEN_SYSTEM_MACOS
 #		define GEN_SYSTEM_MACOS 1
 #	endif
-#	include <TargetConditionals.h>
-#	if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
-#		ifndef GEN_SYSTEM_IOS
-#			define GEN_SYSTEM_IOS 1
-#		endif
-#	endif
 #elif defined( __unix__ )
 #	ifndef GEN_SYSTEM_UNIX
 #		define GEN_SYSTEM_UNIX 1
diff --git a/base/helpers/undef.macros.h b/base/helpers/undef.macros.h
index 25694e4..4e12938 100644
--- a/base/helpers/undef.macros.h
+++ b/base/helpers/undef.macros.h
@@ -1,5 +1,5 @@
-#if GEN_TIME
-// This undefines the macros used by the gen library but are not necessary for the user.
+// This undefines the macros used by the gen library
+#undef GEN_TIME
 
 #undef GEN_ARCH_64_BIT
 #undef GEN_ARCH_32_BIT
@@ -18,21 +18,116 @@
 
 #undef GEN_COMPILER_CLANG
 #undef GEN_COMPILER_GCC
-#undef GEN_COMPILER_MINGW
 #undef GEN_COMPILER_MSVC
 
-#undef forceinline
-#undef neverinline
+#undef GEN_HAS_ATTRIBUTE
+
+#undef GEN_COMPILER_C
+#undef GEN_COMPILER_CPP
+
+#undef GEN_DONT_USE_NAMESPACE
+#undef GEN_NS_PARSER_BEGIN
+#undef GEN_NS_PARSER_END
+#undef GEN_USING_NS_PARSER
+#undef GEN_NS_PARSER
+#undef GEN_NS
+#undef GEN_NS_BEGIN
+#undef GEN_NS_END
+
+#undef GEN_C_LIKE_CPP
 
 #undef global
 #undef internal
 #undef local_persist
 
+#undef bit
+#undef bitfield_is_equal
+
+#undef cast
+
+#undef ccast
+#undef scast
+#undef rcast
+#undef pcast
+
+#undef stringize
+#undef do_once
+#undef do_once_start
+#undef do_once_end
+#undef labeled_scope_start
+#undef labeled_scope_end
+#undef compiler_decorated_func_name
+#undef num_args_impl
+#undef num_args
+#undef clamp
+#undef count_of
+#undef is_between
+#undef size_of
+#undef max
+#undef min
+#undef offset_of
+#undef forceinline
+#undef neverinline
+#undef static_assert
+#undef thread_local
+#undef typeof
+
+#undef GEN_API_C_BEGIN
+#undef GEN_API_C_END
+
+#undef enum_underlying
+#undef nullptr
+#undef GEN_PARAM_DEFAULT
+#undef struct_init
+
+#undef GEN_OPTIMIZE_MAPPINGS_BEGIN
+#undef GEN_OPITMIZE_MAPPINGS_END
+
+#undef GEN_U8_MIN
+#undef GEN_U8_MAX
+#undef GEN_I8_MIN
+#undef GEN_I8_MAX
+#undef GEN_U16_MIN
+#undef GEN_U16_MAX
+#undef GEN_I16_MIN
+#undef GEN_I16_MAX
+#undef GEN_U32_MIN
+#undef GEN_U32_MAX
+#undef GEN_I32_MIN
+#undef GEN_I32_MAX
+#undef GEN_U64_MIN
+#undef GEN_U64_MAX
+#undef GEN_I64_MIN
+#undef GEN_I64_MAX
+#undef GEN_USIZE_MIN
+#undef GEN_USIZE_MAX
+#undef GEN_ISIZE_MIN
+#undef GEN_ISIZE_MAX
+#undef GEN_USIZE_MIN
+#undef GEN_USIZE_MAX
+#undef GEN_ISIZE_MIN
+#undef GEN_ISIZE_MAX
+#undef GEN_F32_MIN
+#undef GEN_F32_MAX
+#undef GEN_F64_MIN
+#undef GEN_F64_MAX
+
+#undef to_uptr
+#undef to_sptr
+#undef to_mem_ptr
+#undef to_mem_ptr_const
+
 #undef kilobytes
 #undef megabytes
 #undef gigabytes
 #undef terabytes
 
+#undef GEN__ONES
+#undef GEN__HIGHS
+#undef GEN__HAS_ZERO
+#undef GEN_DEFAULT_MEMORY_ALIGNMENT
+#undef GEN_DEFAULT_ALLOCATOR_FLAGS
+
 #undef zero_item
 #undef zero_array
 
@@ -42,37 +137,67 @@
 #undef malloc
 #undef mfree
 
-#undef count_of
-#undef is_between
-#undef min
-#undef size_of
-#undef swap
+#undef GEN_DEBUG_TRAP
+#undef GEN_ASSERT
+#undef GEN_ASSERT_MSG
+#undef GEN_ASSERT_NOT_NULL
+#undef GEN_PANIC
+#undef GEN_FATAL
+
+#undef GEN_FILE_OPEN_PROC
+#undef GEN_FILE_READ_AT_PROC
+#undef GEN_FILE_WRITE_AT_PROC
+#undef GEN_FILE_SEEK_PROC
+#undef GEN_FILE_CLOSE_PROC
+
+#undef GEN_PRINTF_MAXLEN
+
+#undef _strlen
+#undef _printf_err
+#undef _printf_err_va
+#undef _strlen
+#undef _printf_err
+#undef _printf_err_va
+
+#undef Array
+#undef get_array_underlying_type
+#undef HashTable
+#undef get_hashtable_underlying_type
 
-#undef bit
-#undef bitfield_is_equal
-#undef ccast
-#undef scast
-#undef rcast
-#undef pcast
-#undef do_once
-#undef do_once_start
-#undef do_once_end
-#undef num_args
-#undef num_args_impl
-#undef stringize
-#undef stringize
-#undef stringize_va
 #undef txt
 
-#undef GEN_TIME
+#undef NOMINMAX
+#undef VC_EXTRALEAN
+#undef WIN32_LEAN_AND_MEAN
+#undef WIN32_MEAN_AND_LEAN
+
+#undef GEN_DEFINE_ATTRIBUTE_TOKENS
+
+#undef GEN_AST_BODY_CLASS_UNALLOWED_TYPES
+#undef GEN_AST_BODY_FUNCTION_UNALLOWED_TYPES
+#undef GEN_AST_BODY_GLOBAL_UNALLOWED_TYPES
+#undef GEN_AST_BODY_EXPORT_UNALLOWED_TYPES
+#undef GEN_AST_BODY_EXTERN_LINKAGE_UNALLOWED_TYPES
+#undef GEN_AST_BODY_NAMESPACE_UNALLOWED_TYPES
+
+#undef GEN_GLOBAL_BUCKET_SIZE
+#undef GEN_CODEPOOL_NUM_BLOCKS
+#undef GEN_SIZE_PER_STRING_ARENA
+#undef GEN_MAX_COMMENT_LINE_LENGTH
+#undef GEN_MAX_NAME_LENGTH
+#undef GEN_MAX_UNTYPED_STR_LENGTH
+#undef TokenMap_FixedArena
+#undef GEN_LEX_ALLOCATOR_SIZE
+#undef GEN_BUILDER_STR_BUFFER_RESERVE
+
+#undef log_failure
+
 #undef gen_main
-#undef __
 #undef name
 #undef code
 #undef args
 #undef code_str
 #undef code_fmt
 #undef token_fmt
-
-// GEN_TIME
-#endif
+#undef parse_fmt
+#undef token_fmt
diff --git a/gen_singleheader/Readme.md b/gen_singleheader/Readme.md
index 305d164..3effbf2 100644
--- a/gen_singleheader/Readme.md
+++ b/gen_singleheader/Readme.md
@@ -15,4 +15,4 @@ If using the library's provided build scripts:
 
 ```ps1
 .\build.ps1 <compiler> <debug or omit> singleheader
-```
\ No newline at end of file
+```