Update .gitignore

Implement very basic Str8 type
Switch to using snprintf instead of sprintf
2024-10-07 08:04:47 +01:00 · 2024-10-07 08:03:56 +01:00 · 2024-10-07 08:01:33 +01:00 · 2024-10-06 22:41:43 +01:00 · 2024-10-06 22:06:57 +01:00
102 changed files with 1043 additions and 6304 deletions
--- a/.clangd
+++ b/.clangd
@@ -1,2 +0,0 @@
-CompileFlags:
-  Add: -ferror-limit=0
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .cache
 .vscode
-.venv
 test
 test.*
 *.dSYM
@@ -9,6 +8,4 @@ test.*
 *.obj
 compile_commands.json
 libwapp-build
-dist
-*.vs
-__pycache__
+libwapp.so
--- a/177
+++ b/177
@@ -1,177 +0,0 @@
-.PHONY: help full base os prng testing uuid all clean builddir build-test run-test install build-lib
-
-# External variables
-CC             = clang
-CXX            = clang++
-AR             = ar
-BUILD_TYPE     = Debug
-BUILD_DIR      = libwapp-build/$(PLATFORM)-$(BUILD_TYPE)
-INSTALL_PREFIX = dist
-RUNTIME_ASSERT = true
-
-# Internal variables
-override CFLAGS              = -Wall -Wextra -Werror -pedantic -Isrc
-override LIBFLAGS            = -fPIC
-override CSTD               := -std=gnu11
-override CXXSTD             := -std=gnu++11
-override KERNEL             := $(shell uname -s)
-override MACHINE            := $(shell uname -m)
-override PLATFORM           := $(KERNEL)_$(MACHINE)
-override TEST_INCLUDE       := -Isrc $(shell find tests -type d | xargs -I{} echo -n "-I{} ")
-override TEST_SRC           := $(shell find tests -type f -name "*.c" | xargs -I{} echo -n "{} ")
-override TEST_C_SRC         := src/wapp.c $(TEST_SRC)
-override TEST_CXX_SRC       := $(shell find tests -type f -name "*.cc" | xargs -I{} echo -n "{} ")
-override LIB_NAME           := wapp
-override OBJ_OUT            := $(BUILD_DIR)/$(LIB_NAME).o
-override LIB_OUT            := $(BUILD_DIR)/lib$(LIB_NAME).a
-override TEST_C_OUT         := $(BUILD_DIR)/wapptest
-override TEST_CXX_OUT       := $(BUILD_DIR)/wapptestcc
-override ABS_INSTALL_PREFIX := $(shell mkdir -p $(INSTALL_PREFIX) && realpath $(INSTALL_PREFIX))
-override INCLUDE_INSTALL    := $(ABS_INSTALL_PREFIX)/include/$(LIB_NAME)
-override LIB_INSTALL        := $(ABS_INSTALL_PREFIX)/lib
-override HEADER_INSTALL_CMD := scripts/header_install.sh
-
-ifeq ($(origin BUILD_FLAGS), undefined)
-ifeq ($(BUILD_TYPE),Debug)
-	BUILD_FLAGS += -g -fsanitize=address,undefined -DWAPP_DEBUG_ASSERT
-else ifeq ($(BUILD_TYPE),RelWithDebInfo)
-	BUILD_FLAGS += -g -O2 -fsanitize=address,undefined -DWAPP_DEBUG_ASSERT
-else ifeq ($(BUILD_TYPE),Release)
-	BUILD_FLAGS += -O3
-else
-	$(error Invalid BUILD type '$(BUILD_TYPE)'. Use 'Debug', 'RelWithDebInfo' or 'Release')
-endif
-endif
-
-# Disable runtime asserts
-ifeq ($(RUNTIME_ASSERT), false)
-	override BUILD_FLAGS += WAPP_NO_RUNTIME_ASSERT
-endif
-
-ifeq ($(CC),gcc)
-  # Used to disable the "ASan runtime does not come first in initial library list" error when compiling with gcc
-  export ASAN_OPTIONS=verify_asan_link_order=0
-endif
-
-# Escape sequences
-BOLD              = \033[1m
-BLACK             = \033[30m
-BG_BLACK          = \033[40m
-RED               = \033[31m
-BG_RED            = \033[41m
-GREEN             = \033[32m
-BG_GREEN          = \033[42m
-YELLOW            = \033[33m
-BG_YELLOW         = \033[43m
-BLUE              = \033[34m
-BG_BLUE           = \033[44m
-MAGENTA           = \033[35m
-BG_MAGENTA        = \033[45m
-CYAN              = \033[36m
-BG_CYAN           = \033[46m
-WHITE             = \033[37m
-BG_WHITE          = \033[47m
-GRAY              = \033[90m
-BG_GRAY           = \033[100m
-BRIGHT_RED        = \033[91m
-BG_BRIGHT_RED     = \033[101m
-BRIGHT_GREEN      = \033[92m
-BG_BRIGHT_GREEN   = \033[102m
-BRIGHT_YELLOW     = \033[93m
-BG_BRIGHT_YELLOW  = \033[103m
-BRIGHT_BLUE       = \033[94m
-BG_BRIGHT_BLUE    = \033[104m
-BRIGHT_MAGENTA    = \033[95m
-BG_BRIGHT_MAGENTA = \033[105m
-BRIGHT_CYAN       = \033[96m
-BG_BRIGHT_CYAN    = \033[106m
-BRIGHT_WHITE      = \033[97m
-BG_BRIGHT_WHITE   = \033[107m
-RESET             = \033[0m
-
-ECHO_E = echo -e
-ifeq ($(KERNEL), Darwin)
-	ECHO_E = echo
-endif
-
-all: clean builddir run-c-test full run-cc-test
-
-help:
-	@$(ECHO_E) "$(BOLD)$(BLUE)Available build variables:$(RESET)"
-	@$(ECHO_E) "  $(GREEN)CC$(RESET)                C compiler to use $(YELLOW)(Default: clang)$(RESET)."
-	@$(ECHO_E) "  $(GREEN)CXX$(RESET)               C++ compiler to use $(YELLOW)(Default: clang++)$(RESET)."
-	@$(ECHO_E) "  $(GREEN)AR$(RESET)                Archiving utility to use for building static libraries $(YELLOW)(Default: ar)$(RESET)."
-	@$(ECHO_E) "  $(GREEN)BUILD_TYPE$(RESET)        Build type $(MAGENTA)[Debug | RelWithDebInfo | Release] $(YELLOW)(Default: Debug)$(RESET)."
-	@$(ECHO_E) "  $(GREEN)BUILD_DIR$(RESET)         Directory where build files will be written."
-	@$(ECHO_E) "  $(GREEN)INSTALL_PREFIX$(RESET)    Prefix where library and include files will be installed."
-	@$(ECHO_E) "  $(GREEN)RUNTIME_ASSERT$(RESET)    Whether runtime asserts are enabled $(MAGENTA)[true | false] $(YELLOW)(Default: true)$(RESET)."
-	@$(ECHO_E) "  $(GREEN)$(RESET)                  $(BOLD)$(BG_RED)DISCLAIMER:$(RESET) Using this flag is not recommended as it disables safety checks"
-	@$(ECHO_E) "  $(GREEN)$(RESET)                  potentially leading to Undefined Behaviour."
-	@$(ECHO_E)
-	@$(ECHO_E) "$(BOLD)$(BLUE)Available targets:$(RESET)"
-	@$(ECHO_E) "  $(GREEN)make$(RESET)              Build, install and test the full wapp library."
-	@$(ECHO_E) "  $(GREEN)make full$(RESET)         Build and install the full wapp library."
-	@$(ECHO_E) "  $(GREEN)make base$(RESET)         Build and install only the $(CYAN)base$(RESET) component of the wapp library with all its dependencies."
-	@$(ECHO_E) "  $(GREEN)make os$(RESET)           Build and install only the $(CYAN)os$(RESET) component of the wapp library with all its dependencies."
-	@$(ECHO_E) "  $(GREEN)make prng$(RESET)         Build and install only the $(CYAN)prng$(RESET) component of the wapp library with all its dependencies."
-	@$(ECHO_E) "  $(GREEN)make uuid$(RESET)         Build and install only the $(CYAN)uuid$(RESET) component of the wapp library with all its dependencies."
-	@$(ECHO_E) "  $(GREEN)make testing$(RESET)      Build and install only the $(CYAN)testing$(RESET) component of the wapp library with all its dependencies."
-	@$(ECHO_E) "  $(GREEN)make clean$(RESET)        Clean the build directory."
-	@$(ECHO_E) "  $(GREEN)make help$(RESET)         Print this help message and exit."
-
-full: LIB_SRC = src/wapp.c
-full: INCLUDES = common os base prng testing uuid
-full: install
-
-base: LIB_SRC = src/base/wapp_base.c
-base: INCLUDES = common base
-base: install
-
-os: LIB_SRC = src/os/wapp_os.c
-os: INCLUDES = common os base
-os: install
-
-prng: LIB_SRC = src/prng/wapp_prng.c
-prng: INCLUDES = common prng
-prng: install
-
-testing: LIB_SRC = src/testing/wapp_testing.c
-testing: INCLUDES = common os testing
-testing: install
-
-uuid: LIB_SRC = src/uuid/wapp_uuid.c
-uuid: INCLUDES = common base prng
-uuid: install
-
-clean:
-	@rm -rf "$(BUILD_DIR)"
-
-builddir:
-	@mkdir -p "$(BUILD_DIR)"
-
-build-c-test:
-	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o "$(TEST_C_OUT)"
-
-run-c-test: build-c-test
-	@echo -e "\n\033[34;1mRUNNING C TESTS\033[0m"
-	@"$(TEST_C_OUT)"
-	@rm "$(TEST_C_OUT)"
-
-build-cc-test:
-	$(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) "$(LIB_OUT)" -o "$(TEST_CXX_OUT)"
-
-run-cc-test: build-cc-test
-	@echo -e "\n\033[34;1mRUNNING C++ TESTS\033[0m"
-	@export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:"$(BUILD_DIR)" && "$(TEST_CXX_OUT)"
-	@rm "$(TEST_CXX_OUT)"
-
-install: build-lib
-	@mkdir -p "$(LIB_INSTALL)"
-	@cp -v "$(LIB_OUT)" "$(LIB_INSTALL)"
-	@mkdir -p "$(INCLUDE_INSTALL)"
-	@bash $(HEADER_INSTALL_CMD) $(LIB_SRC) "$(INCLUDE_INSTALL)" $(INCLUDES)
-
-build-lib: builddir
-	$(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
-	$(AR) r "$(LIB_OUT)" "$(OBJ_OUT)"
-	@rm "$(OBJ_OUT)"
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # Wizard Apprentice Standard Library

-A group of utilities for C/C++ projects
+A collection of useful C/C++ utilities for my projects
--- a/57
+++ b/57
@@ -1,58 +1,3 @@
 #!/bin/bash

-# Colors
-RED="\033[0;31m"
-BOLD="\033[1m"
-NC="\033[0m" # No Color
-
-BUILD_TYPE="Debug"
-ACCEPTED_BUILD_TYPES=("Debug" "RelWithDebInfo" "Release")
-KERNEL="$(uname -s)"
-ARGS=""
-
-join_array_elements() {
-  local IFS=","
-  echo "$*"
-}
-
-contains() {
-  local item="$1"; shift
-  local e
-  for e; do
-    [[ "$e" == "$item" ]] && return 0
-  done
-  return 1
-}
-
-print_usage() {
-  echo -e "Usage: build [-b build_type] ..."
-  echo -e "  Options:"
-  echo -e "    -b, --build-type    Choose from $(join_array_elements ${ACCEPTED_BUILD_TYPES[*]}) (Default: Debug)."
-  echo -e "    -h, --help          Print this message and exit"
-}
-
-while [[ $# > 0 ]];do
-  case $1 in
-    -b|--build-type)
-      BUILD_TYPE="$2"
-      shift 2
-      ;;
-    -h|--help)
-      print_usage
-      exit 0
-      ;;
-    *|-*|--*)
-      rest=("$@")
-      ARGS+=" ${rest[0]}"
-      shift
-      ;;
-  esac
-done
-
-if ! contains ${BUILD_TYPE} "${ACCEPTED_BUILD_TYPES[@]}"; then
-  echo -e "${RED}${BOLD}Unknown build type: ${BUILD_TYPE}${NC}\n"
-  print_usage
-  exit 1
-fi
-
-bear -- make BUILD_TYPE=$BUILD_TYPE $ARGS
+bear -- ./compile $@
--- a/build.ps1
+++ b/build.ps1
@@ -1,77 +1,58 @@
 Param(
-  [switch]$Release
+	[switch]$Release
 )

 $Compiler = "cl.exe"
-$Linker = "lib.exe"

-$GeneralFlags = "/Wall /WX /wd4996 /wd4464 /wd5105 /EHs"
-$CStd = "/std:c11"
-$CppStd = "/std:c++14"
-$LibraryFlags = "/c"
+$GeneralFlags = "/Wall /WX /wd4996"
+$LibraryFlags = "/LD"

-$Kernel = (Get-ChildItem Env:OS).Value
-$Machine = (Get-ChildItem Env:PROCESSOR_ARCHITECTURE).Value
-$Platform = "${Kernel}_${Machine}"
-
-$IncludeDirs = "/I src"
-$SrcFiles = "src/wapp.c"
+$IncludeDirs = Get-ChildItem -Path src -Recurse -Directory -ErrorAction SilentlyContinue -Force | %{$("/I " + '"' + $_.FullName + '"')}
+$SrcFiles = Get-ChildItem -Path src -Recurse -Filter *.c -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}

 $TestIncludeDirs = Get-ChildItem -Path tests -Recurse -Directory -ErrorAction SilentlyContinue -Force | %{$("/I " + '"' + $_.FullName + '"')}
-$TestCSrcFiles = Get-ChildItem -Path tests -Recurse -Filter *.c -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}
-$TestCppSrcFiles = Get-ChildItem -Path tests -Recurse -Filter *.cc -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}
+$TestSrcFiles = Get-ChildItem -Path tests -Recurse -Filter *.c -ErrorAction SilentlyContinue -Force | %{$('"' + $_.FullName + '"')}

 If ($Release -eq $True) {
-  $GeneralFlags += " /O2 /Og"
-  $BuildType = "Release"
+	$GeneralFlags += " /O2 /Og"
+	$BuildType = "release"
 } Else {
-  $GeneralFlags += " /Zi /Od /fsanitize=address"
-  $BuildType = "Debug"
+	$GeneralFlags += " /Zi /Od /fsanitize=address"
+	$BuildType = "debug"
 }

-$BuildDir = "./libwapp-build/${Platform}-${BuildType}"
+$BuildDir = "./libwapp-build/windows-$BuildType"
 $ObjDir = "$BuildDir/objects"
 $OutDir = "$BuildDir/output"
 $TestsDir = "$BuildDir/tests"

-$LibOutput = "$OutDir/libwapp.lib"
+$OutBasename = "libwapp"
 $Objects = "/Fo:$ObjDir/"
-$LibOutputFlags = "/OUT:$LibOutput"
+$Outputs = "/Fd:$OutDir/$OutBasename /Fe:$OutDir/$OutBasename"

-$TestCOutputBasename = "wapptest"
-$TestCOutputFlags = "/Fo:$TestsDir/ /Fe:$TestsDir/$TestCOutputBasename"
-
-$TestCppOutputBasename = "wapptestcc"
-$TestCppOutputFlags = "/Fo:$TestsDir/ /Fe:$TestsDir/$TestCppOutputBasename"
+$TestOutBasename = "wapptest"
+$TestOutputs = "/Fo:$TestsDir/ /Fe:$TestsDir/$TestOutBasename"

 If (Test-Path $BuildDir) {
-  Remove-Item $BuildDir -Recurse -Force
+	Remove-Item $BuildDir -Recurse -Force
 }

 mkdir -p $ObjDir > $null
 mkdir -p $OutDir > $null
 mkdir -p $TestsDir > $null

-# Run code generation
-Invoke-Expression "python -m codegen"
-
-# Build and run C tests
-Invoke-Expression "$Compiler $GeneralFlags $CStd $IncludeDirs $TestIncludeDirs $SrcFiles $TestCSrcFiles $TestCOutputFlags" -ErrorAction Stop
-Invoke-Expression "$TestsDir/$TestCOutputBasename.exe"
+# Build and run tests
+Invoke-Expression "$Compiler $GeneralFlags $IncludeDirs $TestIncludeDirs $SrcFiles $TestSrcFiles $TestOutputs" -ErrorAction Stop

+Invoke-Expression "$TestsDir/$TestOutBasename.exe"
 $Status = $LASTEXITCODE
+
+Remove-Item $TestsDir -Recurse -Force
+
 If ($Status -ne 0) {
-  Remove-Item $TestsDir -Recurse -Force
-  Write-Error "Tests failed"
-  Exit 1
+	Write-Error "Tests failed"
+	Exit 1
 }

 # Build library
-Invoke-Expression "$Compiler $GeneralFlags $CStd $LibraryFlags $SrcFiles $Objects"
-Invoke-Expression "$Linker $ObjDir/*.obj $LibOutputFlags"
-
-# Build and run C++ tests
-Invoke-Expression "$Compiler $GeneralFlags $CppStd $IncludeDirs $TestIncludeDirs $LibOutput $TestCppSrcFiles $TestCppOutputFlags" -ErrorAction Stop
-Invoke-Expression "$TestsDir/$TestCppOutputBasename.exe"
-
-Remove-Item $TestsDir -Recurse -Force
+Invoke-Expression "$Compiler $GeneralFlags $LibraryFlags $IncludeDirs $SrcFiles $Objects $Outputs"
--- a/61
+++ b/61
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+BUILD_TYPE="debug"
+
+while [[ $# > 0 ]];do
+  case $1 in
+    --release)
+      BUILD_TYPE="release"
+      shift
+      ;;
+    *|-*|--*)
+      echo "Unknown option $1"
+      exit 1
+      ;;
+  esac
+done
+
+CC=clang
+CFLAGS="-Wall -Werror -pedantic"
+LIBFLAGS="-fPIC -shared"
+
+INCLUDE="$(find src -type d | xargs -I{} echo -n "-I{} ")"
+SRC="$(find src -type f -name "*.c" | xargs -I{} echo -n "{} ")"
+
+TEST_INCLUDE="$(find tests -type d | xargs -I{} echo -n "-I{} ")"
+TEST_SRC="$(find tests -type f -name "*.c" | xargs -I{} echo -n "{} ")"
+
+BUILD_DIR="libwapp-build/posix-$BUILD_TYPE"
+if [[ -d $BUILD_DIR ]]; then
+  rm -rf $BUILD_DIR
+fi
+mkdir -p $BUILD_DIR
+
+if [[ $BUILD_TYPE == "release" ]]; then
+  CFLAGS+=" -O3"
+else
+  CFLAGS+=" -g -fsanitize=address -fsanitize=undefined"
+fi
+
+OUT="$BUILD_DIR/libwapp.so"
+TEST_OUT="$BUILD_DIR/wapptest"
+
+# Compile tests
+if [[ $(echo $TEST_SRC | xargs) != "" ]]; then
+  (set -x ; $CC $CFLAGS $INCLUDE $TEST_INCLUDE $SRC $TEST_SRC -o $TEST_OUT)
+fi
+
+# Run tests and exit on failure
+if [[ -f $TEST_OUT ]]; then
+  $TEST_OUT
+  STATUS="$?"
+
+  rm $TEST_OUT
+
+  if [[ $STATUS != "0" ]]; then
+    exit 1
+  fi
+fi
+
+# Compile library
+(set -x ; $CC $CFLAGS $LIBFLAGS $INCLUDE $SRC -o $OUT)
--- a/scripts/header_install.sh
+++ b/scripts/header_install.sh
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-SCRIPT_DIR="$(dirname $0)"
-LIB_SRC="$1"
-INSTALL_PREFIX="$2"
-shift 2
-INCLUDES="$@"
-
-mkdir -p "$INSTALL_PREFIX"
-
-BASE_INCLUDE_DIR="$(dirname "$LIB_SRC")"
-find $BASE_INCLUDE_DIR -maxdepth 1 -type f -name "*.h" -exec cp -v {} "$INSTALL_PREFIX" \;
-
-cd "$SCRIPT_DIR/../src"
-for INCLUDE in $INCLUDES; do
-  for f in $(find "$INCLUDE" -type f -name "*.h"); do
-    DST="$INSTALL_PREFIX/$(dirname $f)"
-    mkdir -p "$DST"
-    cp -v "$f" "$DST"
-  done
-done
--- a/src/base/array/array.c
+++ b/src/base/array/array.c
@@ -1,173 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "./array.h"
-#include "../../common/assert/assert.h"
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../common/aliases/aliases.h"
-#include <stddef.h>
-
-#define _offset_pointer(PTR, OFFSET) ((void *)((uptr)(PTR) + (OFFSET)))
-
-wapp_persist inline void _array_validate(const GenericArray *array, u64 item_size);
-
-void *_array_get(GenericArray *array, u64 index, u64 item_size) {
-  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-  _array_validate(array, item_size);
-  wapp_runtime_assert(index < array->count, "`index` is out of bounds");
-
-  return _offset_pointer(array->items, array->item_size * index);
-}
-
-void _array_set(GenericArray *array, u64 index, void *value, u64 item_size) {
-  void *item = _array_get(array, index, item_size);
-  memcpy(item, value, array->item_size);
-}
-
-void _array_append_capped(GenericArray *array, void *value, u64 item_size) {
-  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-  _array_validate(array, item_size);
-
-  if (array->count >= array->capacity) { return; }
-
-  u64 index = (array->count)++;
-  _array_set(array, index, value, item_size);
-}
-
-void _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
-  wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-  _array_validate(dst, item_size);
-  _array_validate(src, item_size);
-
-  u64 remaining_capacity = dst->capacity - dst->count;
-
-  u64 copy_count = src->count < remaining_capacity ? src->count : remaining_capacity;
-  void *dst_ptr = _offset_pointer(dst->items, dst->count * dst->item_size);
-  memcpy(dst_ptr, src->items, copy_count * src->item_size);
-  dst->count += copy_count;
-}
-
-void _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size) {
-  wapp_runtime_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-  _array_validate(dst, item_size);
-  _array_validate(src, item_size);
-
-  _array_clear(dst, item_size);
-  u64 copy_count = src->count < dst->capacity ? src->count : dst->capacity;
-  memcpy(dst->items, src->items, copy_count * src->item_size);
-  dst->count = copy_count;
-}
-
-GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size) {
-  wapp_runtime_assert(allocator != NULL && array != NULL, "`allocator` and `array` should not be NULL");
-  _array_validate(array, item_size);
-
-  GenericArray *output = array;
-
-  if (array->count >= array->capacity) {
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(array->capacity * 2);
-    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, array->item_size);
-    if (!output) {
-      output = array;
-      goto RETURN_ARRAY_APPEND_ALLOC;
-    }
-    _array_copy_capped(output, array, item_size);
-  }
-
-  _array_append_capped(output, value, item_size);
-
-RETURN_ARRAY_APPEND_ALLOC:
-  return output;
-}
-
-GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
-  wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-  _array_validate(dst, item_size);
-  _array_validate(src, item_size);
-
-  GenericArray *output = dst;
-
-  u64 remaining_capacity = dst->capacity - dst->count;
-  if (src->count >= remaining_capacity) {
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
-    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, dst->item_size);
-    if (!output) {
-      output = dst;
-      goto RETURN_ARRAY_EXTEND_ALLOC;
-    }
-    _array_copy_capped(output, dst, item_size);
-  }
-
-  _array_extend_capped(output, src, item_size);
-
-RETURN_ARRAY_EXTEND_ALLOC:
-  return output;
-}
-
-GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size) {
-  wapp_runtime_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-  _array_validate(dst, item_size);
-  _array_validate(src, item_size);
-
-  GenericArray *output = dst;
-
-  if (src->count >= dst->capacity) {
-    u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(dst->capacity * 2);
-    output           = (GenericArray *)_array_alloc_capacity(allocator, new_capacity, src->item_size);
-    if (!output) {
-      output = dst;
-      goto RETURN_ARRAY_COPY_ALLOC;
-    }
-  }
-
-  _array_copy_capped(output, src, item_size);
-
-RETURN_ARRAY_COPY_ALLOC:
-  return output;
-}
-
-void *_array_pop(GenericArray *array, u64 item_size) {
-  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-  _array_validate(array, item_size);
-
-  if (array->count == 0) { return NULL; }
-
-  u64 index = array->count - 1;
-  void *out = _array_get(array, index, item_size);
-  --(array->count);
-  return out;
-}
-
-void _array_clear(GenericArray *array, u64 item_size) {
-  wapp_runtime_assert(array != NULL, "`array` should not be NULL");
-  _array_validate(array, item_size);
-
-  array->count = 0;
-}
-
-GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size) {
-  wapp_runtime_assert(allocator != NULL, "`allocator` should not be NULL");
-
-  GenericArray *output = NULL;
-
-  u64 allocation_size = sizeof(GenericArray) + item_size * capacity;
-
-  output = wapp_mem_allocator_alloc(allocator, allocation_size);
-  if (!output) {
-    goto RETURN_ARRAY_ALLOC;
-  }
-
-  output->magic     = WAPP_ARRAY_MAGIC;
-  output->count     = 0;
-  output->capacity  = capacity;
-  output->item_size = item_size;
-  output->items     = (void *)(output + 1);
-
-RETURN_ARRAY_ALLOC:
-  return output;
-}
-
-wapp_persist inline void _array_validate(const GenericArray *array, u64 item_size) {
-  wapp_runtime_assert(WAPP_ARRAY_MAGIC == array->magic, "`array` is not a valid wapp array");
-  wapp_runtime_assert(item_size == array->item_size, "Invalid item type provided");
-}
--- a/src/base/array/array.h
+++ b/src/base/array/array.h
@@ -1,163 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef ARRAY_H
-#define ARRAY_H
-
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#define WAPP_ARRAY_MAGIC (u64)0x57415f415252
-
-#define _calc_array_count(TYPE, ...) wapp_misc_utils_va_args_count(TYPE, __VA_ARGS__)
-#define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)
-
-#define wapp_array_alloc_capacity(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, CAPACITY)   \
-  ((ARRAY_TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(ELEM_TYPE)))
-
-#define WAPP_DEF_ARRAY_TYPE(T, NAME) \
-  typedef struct {                   \
-    u64 magic;                       \
-    u64 count;                       \
-    u64 capacity;                    \
-    u64 item_size;                   \
-    T *items;                        \
-  } NAME
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...) ([&]() {                                  \
-  wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?    \
-    _calc_array_capacity(ELEM_TYPE, __VA_ARGS__) : -1                                    \
-  ] = {__VA_ARGS__};                                                                     \
-                                                                                         \
-  return ARRAY_TYPE{                                                                     \
-    WAPP_ARRAY_MAGIC,                                                                    \
-    _calc_array_count(ELEM_TYPE, __VA_ARGS__),                                           \
-    _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),                                        \
-    sizeof(ELEM_TYPE),                                                                   \
-    items,                                                                               \
-  };                                                                                     \
-}())
-#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY) ([&]() {               \
-  wapp_persist ELEM_TYPE items[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE{}).items)) ?    \
-    CAPACITY : -1] = {};                                                                 \
-                                                                                         \
-  return ARRAY_TYPE{                                                                     \
-    WAPP_ARRAY_MAGIC,                                                                    \
-    0,                                                                                   \
-    CAPACITY,                                                                            \
-    sizeof(ELEM_TYPE),                                                                   \
-    items,                                                                               \
-  };                                                                                     \
-}())
-#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR) ([&]() {                                    \
-  if (ARRAY_PTR == NULL || (ARRAY_PTR)->count == 0) {                                    \
-    ELEM_TYPE result{};                                                                  \
-    return result;                                                                       \
-  }                                                                                      \
-                                                                                         \
-  return *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE)));              \
-}())
-#else
-#define wapp_array(ELEM_TYPE, ARRAY_TYPE, ...)                                      \
-  ((ARRAY_TYPE){                                                                    \
-    .magic     = WAPP_ARRAY_MAGIC,                                                  \
-    .count     = _calc_array_count(ELEM_TYPE, __VA_ARGS__),                         \
-    .capacity  = _calc_array_capacity(ELEM_TYPE, __VA_ARGS__),                      \
-    .item_size = sizeof(ELEM_TYPE),                                                 \
-    .items     = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ? \
-                            _calc_array_capacity(ELEM_TYPE, __VA_ARGS__) :          \
-                            -1]){__VA_ARGS__}                                       \
-  })
-#define wapp_array_with_capacity(ELEM_TYPE, ARRAY_TYPE, CAPACITY)                   \
-  ((ARRAY_TYPE){                                                                    \
-    .magic     = WAPP_ARRAY_MAGIC,                                                  \
-    .count     = 0,                                                                 \
-    .capacity  = CAPACITY,                                                          \
-    .item_size = sizeof(ELEM_TYPE),                                                 \
-    .items     = (ELEM_TYPE[sizeof(ELEM_TYPE) == sizeof(*((ARRAY_TYPE){0}.items)) ? \
-                            CAPACITY : -1]){0}                                      \
-  })
-#define wapp_array_pop(ELEM_TYPE, ARRAY_PTR)                                        \
-  (ARRAY_PTR != NULL && (ARRAY_PTR)->count > 0 ?                                    \
-    *((ELEM_TYPE *)_array_pop((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))) :             \
-    (ELEM_TYPE){0}                                                                  \
-  )
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_array_get(ELEM_TYPE, ARRAY_PTR, INDEX)                                                 \
-  ((ELEM_TYPE *)_array_get((GenericArray *)ARRAY_PTR, INDEX, sizeof(ELEM_TYPE)))
-#define wapp_array_set(ELEM_TYPE, ARRAY_PTR, INDEX, VALUE_PTR)                                      \
-  _array_set((GenericArray *)ARRAY_PTR, INDEX, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
-#define wapp_array_append_capped(ELEM_TYPE, ARRAY_PTR, VALUE_PTR)                                   \
-  _array_append_capped((GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE))
-#define wapp_array_extend_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                           \
-  _array_extend_capped(                                                                             \
-    (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)                 \
-  )
-#define wapp_array_copy_capped(ELEM_TYPE, DST_ARRAY_PTR, SRC_ARRAY_PTR)                             \
-  _array_copy_capped(                                                                               \
-    (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)                 \
-  )
-#define wapp_array_append_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, ARRAY_PTR, VALUE_PTR)         \
-  (ARRAY_TYPE *)_array_append_alloc(                                                                \
-    ALLOCATOR_PTR, (GenericArray *)ARRAY_PTR, (void *)VALUE_PTR, sizeof(ELEM_TYPE)                  \
-  )
-#define wapp_array_extend_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR) \
-  (ARRAY_TYPE *)_array_extend_alloc(                                                                \
-    ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)  \
-  )
-#define wapp_array_copy_alloc(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, DST_ARRAY_PTR, SRC_ARRAY_PTR)   \
-  (ARRAY_TYPE *)_array_copy_alloc(                                                                  \
-    ALLOCATOR_PTR, (GenericArray *)DST_ARRAY_PTR, (GenericArray *)SRC_ARRAY_PTR, sizeof(ELEM_TYPE)  \
-  )
-#define wapp_array_clear(ELEM_TYPE, ARRAY_PTR)                                                      \
-  _array_clear((GenericArray *)ARRAY_PTR, sizeof(ELEM_TYPE))
-
-WAPP_DEF_ARRAY_TYPE(void, GenericArray);
-
-void         *_array_get(GenericArray *array, u64 index, u64 item_size);
-void          _array_set(GenericArray *array, u64 index, void *value, u64 item_size);
-void          _array_append_capped(GenericArray *array, void *value, u64 item_size);
-void          _array_extend_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
-void          _array_copy_capped(GenericArray *dst, const GenericArray *src, u64 item_size);
-GenericArray *_array_append_alloc(const Allocator *allocator, GenericArray *array, void *value, u64 item_size);
-GenericArray *_array_extend_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
-GenericArray *_array_copy_alloc(const Allocator *allocator, GenericArray *dst, const GenericArray *src, u64 item_size);
-void         *_array_pop(GenericArray *array, u64 item_size);
-void          _array_clear(GenericArray *array, u64 item_size);
-GenericArray *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
-
-// Base array types
-typedef struct str8 Str8;
-
-WAPP_DEF_ARRAY_TYPE(void *, VoidPtrArray);
-WAPP_DEF_ARRAY_TYPE(c8    , C8Array);
-WAPP_DEF_ARRAY_TYPE(c16   , C16Array);
-WAPP_DEF_ARRAY_TYPE(c32   , C32Array);
-WAPP_DEF_ARRAY_TYPE(u8    , U8Array);
-WAPP_DEF_ARRAY_TYPE(u16   , U16Array);
-WAPP_DEF_ARRAY_TYPE(u32   , U32Array);
-WAPP_DEF_ARRAY_TYPE(u64   , U64Array);
-WAPP_DEF_ARRAY_TYPE(b8    , B8Array);
-WAPP_DEF_ARRAY_TYPE(i8    , I8Array);
-WAPP_DEF_ARRAY_TYPE(i16   , I16Array);
-WAPP_DEF_ARRAY_TYPE(i32   , I32Array);
-WAPP_DEF_ARRAY_TYPE(i64   , I64Array);
-WAPP_DEF_ARRAY_TYPE(f32   , F32Array);
-WAPP_DEF_ARRAY_TYPE(f64   , F64Array);
-WAPP_DEF_ARRAY_TYPE(f128  , F128Array);
-WAPP_DEF_ARRAY_TYPE(uptr  , UptrArray);
-WAPP_DEF_ARRAY_TYPE(iptr  , IptrArray);
-WAPP_DEF_ARRAY_TYPE(Str8  , Str8Array);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !ARRAY_H
--- a/src/base/dbl_list/dbl_list.c
+++ b/src/base/dbl_list/dbl_list.c
@@ -1,258 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "./dbl_list.h"
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/assert/assert.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-#include <stddef.h>
-
-wapp_intern inline GenericList _node_to_list(GenericNode *node, u64 item_size);
-wapp_intern inline void _dbl_list_validate(const GenericList *list, u64 item_size);
-wapp_intern inline void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size);
-
-GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size) {
-  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-
-  GenericList *list = wapp_mem_allocator_alloc(allocator, sizeof(GenericList));
-  if (!list) { goto DBL_LIST_ALLOC_RETURN; }
-
-  memset((void *)list, 0, sizeof(GenericList));
-  list->magic     = WAPP_DBL_LIST_MAGIC;
-  list->item_size = item_size;
-
-DBL_LIST_ALLOC_RETURN:
-  return list;
-}
-
-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size) {
-  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-
-  GenericNode *node = wapp_mem_allocator_alloc(allocator, sizeof(GenericNode));
-  if (!node) { goto DBL_LIST_NODE_ALLOC_RETURN; }
-
-  memset((void *)node, 0, sizeof(GenericNode));
-  node->magic     = WAPP_DBL_NODE_MAGIC;
-  node->item_size = item_size;
-
-DBL_LIST_NODE_ALLOC_RETURN:
-  return node;
-}
-
-GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size) {
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-  _dbl_list_validate(list, item_size);
-  wapp_runtime_assert(index < list->node_count, "`index` is out of bounds");
-
-  GenericNode *output  = NULL;
-  GenericNode *current = list->first;
-  for (u64 i = 1; i <= index; ++i) {
-    current = current->next;
-  }
-
-  output = current;
-
-  return output;
-}
-
-void _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size) {
-  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-  _dbl_list_validate(list, item_size);
-  _dbl_list_node_validate(list, node, item_size);
-
-  GenericList node_list = _node_to_list(node, item_size);
-
-  if (list->node_count == 0) {
-    *list = node_list;
-    return;
-  }
-
-  list->node_count += node_list.node_count;
-
-  GenericNode *first = list->first;
-  if (first) {
-    first->prev = node_list.last;
-  }
-
-  list->first          = node_list.first;
-  node_list.last->next = first;
-}
-
-void _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size) {
-  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-  _dbl_list_validate(list, item_size);
-  _dbl_list_node_validate(list, node, item_size);
-
-  GenericList node_list = _node_to_list(node, item_size);
-
-  if (list->node_count == 0) {
-    *list = node_list;
-    return;
-  }
-
-  list->node_count += node_list.node_count;
-
-  GenericNode *last = list->last;
-  if (last) {
-    last->next = node_list.first;
-  }
-
-  list->last            = node_list.last;
-  node_list.first->prev = last;
-}
-
-void _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size) {
-  wapp_debug_assert(list != NULL && node != NULL && (node->item) != NULL, "`list`, `node` and `node->item` should not be NULL");
-  _dbl_list_validate(list, item_size);
-  _dbl_list_node_validate(list, node, item_size);
-
-  if (index == 0) {
-    _dbl_list_push_front(list, node, item_size);
-    return;
-  } else if (index == list->node_count) {
-    _dbl_list_push_back(list, node, item_size);
-    return;
-  }
-
-  GenericNode *dst_node = _dbl_list_get(list, index, item_size);
-  if (!dst_node) {
-    return;
-  }
-
-  GenericList node_list = _node_to_list(node, item_size);
-
-  list->node_count += node_list.node_count;
-
-  GenericNode *prev = dst_node->prev;
-
-  dst_node->prev = node_list.last;
-  prev->next     = node_list.first;
-
-  node_list.first->prev = prev;
-  node_list.last->next  = dst_node;
-}
-
-GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size) {
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-  _dbl_list_validate(list, item_size);
-
-  GenericNode *output = NULL;
-
-  if (list->node_count == 0) {
-    goto RETURN_I32_LIST_POP_FRONT;
-  }
-
-  output = list->first;
-
-  if (list->node_count == 1) {
-    *list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
-    goto RETURN_I32_LIST_POP_FRONT;
-  }
-
-  --(list->node_count);
-  list->first = output->next;
-
-  output->prev = output->next = NULL;
-
-RETURN_I32_LIST_POP_FRONT:
-  return output;
-}
-
-GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size) {
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-  _dbl_list_validate(list, item_size);
-
-  GenericNode *output = NULL;
-
-  if (list->node_count == 0) {
-    goto RETURN_I32_LIST_POP_BACK;
-  }
-
-  output = list->last;
-
-  if (list->node_count == 1) {
-    *list = (GenericList){.magic = WAPP_DBL_LIST_MAGIC, .item_size = item_size};
-    goto RETURN_I32_LIST_POP_BACK;
-  }
-
-  --(list->node_count);
-  list->last = output->prev;
-
-  output->prev = output->next = NULL;
-
-RETURN_I32_LIST_POP_BACK:
-  return output;
-}
-
-GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size) {
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-  _dbl_list_validate(list, item_size);
-
-  GenericNode *output = NULL;
-
-  if (index == 0) {
-    output = _dbl_list_pop_front(list, item_size);
-    goto RETURN_I32_LIST_REMOVE;
-  } else if (index == list->node_count) {
-    output = _dbl_list_pop_back(list, item_size);
-    goto RETURN_I32_LIST_REMOVE;
-  }
-
-  output = _dbl_list_get(list, index, item_size);
-  if (!output) {
-    goto RETURN_I32_LIST_REMOVE;
-  }
-
-  output->prev->next = output->next;
-  output->next->prev = output->prev;
-
-  --(list->node_count);
-
-  output->prev = output->next = NULL;
-
-RETURN_I32_LIST_REMOVE:
-  return output;
-}
-
-void _dbl_list_empty(GenericList *list, u64 item_size) {
-  wapp_debug_assert(list != NULL, "`list` should not be NULL");
-  _dbl_list_validate(list, item_size);
-
-  u64 count = list->node_count;
-  for (u64 i = 0; i < count; ++i) {
-    _dbl_list_pop_back(list, item_size);
-  }
-}
-
-wapp_intern GenericList _node_to_list(GenericNode *node, u64 item_size) {
-  GenericList output = {
-    .magic      = WAPP_DBL_LIST_MAGIC,
-    .first      = node,
-    .last       = node,
-    .node_count = 1,
-    .item_size  = item_size,
-  };
-
-  while (output.first->prev != NULL) {
-    output.first = output.first->prev;
-    ++(output.node_count);
-  }
-
-  while (output.last->next != NULL) {
-    output.last = output.last->next;
-    ++(output.node_count);
-  }
-
-  return output;
-}
-
-wapp_intern void _dbl_list_validate(const GenericList *list, u64 item_size) {
-  wapp_runtime_assert(list->magic == WAPP_DBL_LIST_MAGIC, "`list` isn't a valid wapp list type");
-  wapp_runtime_assert(list->item_size == item_size, "Invalid item provided");
-}
-
-wapp_intern void _dbl_list_node_validate(const GenericList *list, const GenericNode *node, u64 item_size) {
-  wapp_runtime_assert(node->magic == WAPP_DBL_NODE_MAGIC, "`node` isn't a valid wapp node type");
-  wapp_runtime_assert(list->item_size == node->item_size, "Mismatched `list` and `node` types");
-  wapp_runtime_assert(node->item_size == item_size, "Invalid item provided");
-}
--- a/src/base/dbl_list/dbl_list.h
+++ b/src/base/dbl_list/dbl_list.h
@@ -1,110 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef DBL_LIST_H
-#define DBL_LIST_H
-
-#include "../mem/allocator/mem_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#define WAPP_DBL_LIST_MAGIC (u64)0x57415f444c5354
-#define WAPP_DBL_NODE_MAGIC (u64)0x57415f444e44
-
-#define WAPP_DEF_DBL_LIST_TYPE(T, NODE_NAME, LIST_NAME) \
-  typedef struct NODE_NAME NODE_NAME;                   \
-  struct NODE_NAME {                                    \
-    u64 magic;                                          \
-    T *item;                                            \
-    NODE_NAME *prev;                                    \
-    NODE_NAME *next;                                    \
-    u64 item_size;                                      \
-  };                                                    \
-                                                        \
-  typedef struct {                                      \
-    u64 magic;                                          \
-    NODE_NAME *first;                                   \
-    NODE_NAME *last;                                    \
-    u64 node_count;                                     \
-    u64 item_size;                                      \
-  } LIST_NAME
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE)                                     \
-  LIST_TYPE{WAPP_DBL_LIST_MAGIC, nullptr, nullptr, 0, sizeof(ELEM_TYPE)}
-#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR)                      \
-  NODE_TYPE{WAPP_DBL_NODE_MAGIC, ELEM_PTR, nullptr, nullptr, sizeof(ELEM_TYPE)}
-#else
-#define wapp_dbl_list(ELEM_TYPE, LIST_TYPE) (                                                 \
-  (LIST_TYPE){.magic = WAPP_DBL_LIST_MAGIC, .item_size = sizeof(ELEM_TYPE)}                   \
-)
-#define wapp_dbl_list_node(ELEM_TYPE, NODE_TYPE, ELEM_PTR) (                                  \
-  (NODE_TYPE){.magic = WAPP_DBL_NODE_MAGIC, .item = ELEM_PTR, .item_size = sizeof(ELEM_TYPE)} \
-)
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_dbl_list_alloc(ELEM_TYPE, LIST_TYPE, ALLOCATOR)                                        \
-  (LIST_TYPE *)_dbl_list_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_node_alloc(ELEM_TYPE, NODE_TYPE, ALLOCATOR)                                   \
-  (NODE_TYPE *)_dbl_list_node_alloc(ALLOCATOR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_get(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)                               \
-  (NODE_TYPE *)_dbl_list_get((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_push_front(ELEM_TYPE, LIST_PTR, NODE_PTR)                                     \
-  _dbl_list_push_front((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_push_back(ELEM_TYPE, LIST_PTR, NODE_PTR)                                      \
-  _dbl_list_push_back((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_insert(ELEM_TYPE, LIST_PTR, NODE_PTR, ELEM_INDEX)                             \
-  _dbl_list_insert((GenericList *)LIST_PTR, (GenericNode *)NODE_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_pop_front(ELEM_TYPE, NODE_TYPE, LIST_PTR)                                     \
-  (NODE_TYPE *)_dbl_list_pop_front((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_pop_back(ELEM_TYPE, NODE_TYPE, LIST_PTR)                                      \
-  (NODE_TYPE *)_dbl_list_pop_back((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_remove(ELEM_TYPE, NODE_TYPE, LIST_PTR, ELEM_INDEX)                            \
-  (NODE_TYPE *)_dbl_list_remove((GenericList *)LIST_PTR, ELEM_INDEX, sizeof(ELEM_TYPE))
-#define wapp_dbl_list_empty(ELEM_TYPE, LIST_PTR)                                                    \
-  _dbl_list_empty((GenericList *)LIST_PTR, sizeof(ELEM_TYPE))
-
-WAPP_DEF_DBL_LIST_TYPE(void, GenericNode, GenericList);
-
-GenericList *_dbl_list_alloc(const Allocator *allocator, u64 item_size);
-GenericNode *_dbl_list_node_alloc(const Allocator *allocator, u64 item_size);
-GenericNode *_dbl_list_get(const GenericList *list, u64 index, u64 item_size);
-void         _dbl_list_push_front(GenericList *list, GenericNode *node, u64 item_size);
-void         _dbl_list_push_back(GenericList *list, GenericNode *node, u64 item_size);
-void         _dbl_list_insert(GenericList *list, GenericNode *node, u64 index, u64 item_size);
-GenericNode *_dbl_list_pop_front(GenericList *list, u64 item_size);
-GenericNode *_dbl_list_pop_back(GenericList *list, u64 item_size);
-GenericNode *_dbl_list_remove(GenericList *list, u64 index, u64 item_size);
-void         _dbl_list_empty(GenericList *list, u64 item_size);
-
-// Base list types
-typedef struct str8 Str8;
-
-WAPP_DEF_DBL_LIST_TYPE(void *, VoidPtrNode, VoidPtrList);
-WAPP_DEF_DBL_LIST_TYPE(c8    , C8Node     , C8List);
-WAPP_DEF_DBL_LIST_TYPE(c16   , C16Node    , C16List);
-WAPP_DEF_DBL_LIST_TYPE(c32   , C32Node    , C32List);
-WAPP_DEF_DBL_LIST_TYPE(u8    , U8Node     , U8List);
-WAPP_DEF_DBL_LIST_TYPE(u16   , U16Node    , U16List);
-WAPP_DEF_DBL_LIST_TYPE(u32   , U32Node    , U32List);
-WAPP_DEF_DBL_LIST_TYPE(u64   , U64Node    , U64List);
-WAPP_DEF_DBL_LIST_TYPE(b8    , B8Node     , B8List);
-WAPP_DEF_DBL_LIST_TYPE(i8    , I8Node     , I8List);
-WAPP_DEF_DBL_LIST_TYPE(i16   , I16Node    , I16List);
-WAPP_DEF_DBL_LIST_TYPE(i32   , I32Node    , I32List);
-WAPP_DEF_DBL_LIST_TYPE(i64   , I64Node    , I64List);
-WAPP_DEF_DBL_LIST_TYPE(f32   , F32Node    , F32List);
-WAPP_DEF_DBL_LIST_TYPE(f64   , F64Node    , F64List);
-WAPP_DEF_DBL_LIST_TYPE(f128  , F128Node   , F128List);
-WAPP_DEF_DBL_LIST_TYPE(uptr  , UptrNode   , UptrList);
-WAPP_DEF_DBL_LIST_TYPE(iptr  , IptrNode   , IptrList);
-WAPP_DEF_DBL_LIST_TYPE(Str8  , Str8Node   , Str8List);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !DBL_LIST_H
--- a/src/base/mem/allocator/mem_allocator.h
+++ b/src/base/mem/allocator/mem_allocator.h
@@ -1,50 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef MEM_ALLOCATOR_H
-#define MEM_ALLOCATOR_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-#include <string.h>
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef void *(MemAllocFunc)(u64 size, void *alloc_obj);
-typedef void *(MemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
-typedef void *(MemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-typedef void *(MemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
-typedef void  (MemFreeFunc)(void **ptr, u64 size, void *alloc_obj);
-
-typedef struct allocator Allocator;
-struct allocator {
-  void *obj;
-  MemAllocFunc *alloc;
-  MemAllocAlignedFunc *alloc_aligned;
-  MemReallocFunc *realloc;
-  MemReallocAlignedFunc *realloc_aligned;
-  MemFreeFunc *free;
-};
-
-#ifdef WAPP_PLATFORM_CPP
-#define wapp_mem_allocator_invalid(ALLOCATOR) ([&]() {      \
-  Allocator alloc{};                                        \
-  return memcmp(ALLOCATOR, &alloc, sizeof(Allocator)) == 0; \
-}())
-#else
-#define wapp_mem_allocator_invalid(ALLOCATOR) (memcmp(ALLOCATOR, &((Allocator){0}), sizeof(Allocator)) == 0)
-#endif // !WAPP_PLATFORM_CPP
-
-void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size);
-void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment);
-void *wapp_mem_allocator_realloc(const Allocator *allocator, void *ptr, u64 old_size, u64 new_size);
-void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr, u64 old_size,
-                                         u64 new_size, u64 alignment);
-void wapp_mem_allocator_free(const Allocator *allocator, void **ptr, u64 size);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !MEM_ALLOCATOR_H
--- a/src/base/mem/utils/mem_utils.c
+++ b/src/base/mem/utils/mem_utils.c
@@ -1,26 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_utils.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include <stddef.h>
-
-wapp_intern b8 is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
-
-void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
-  wapp_debug_assert(ptr != NULL, "`ptr` should not be NULL");
-  wapp_runtime_assert(is_power_of_two(alignment), "`alignment` value is not a power of two");
-
-  uptr p = (uptr)ptr;
-  uptr align = (uptr)alignment;
-
-  // Similar to p % align, but it's a faster implementation that works fine
-  // because align is guaranteed to be a power of 2
-  uptr modulo = p & (align - 1);
-
-  if (modulo != 0) {
-    p += align - modulo;
-  }
-
-  return (void *)p;
-}
--- a/src/base/mem/utils/mem_utils.h
+++ b/src/base/mem/utils/mem_utils.h
@@ -1,19 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef MEM_UTILS_H
-#define MEM_UTILS_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-void *wapp_mem_util_align_forward(void *ptr, u64 alignment);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !MEM_UTILS_H
--- a/src/base/strings/str8/str8.c
+++ b/src/base/strings/str8/str8.c
@@ -1,492 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "str8.h"
-#include "../../array/array.h"
-#include "../../mem/allocator/mem_allocator.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include <ctype.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-
-#define STR8_BUF_ALLOC_SIZE(CAPACITY) (sizeof(Str8) + sizeof(c8) * CAPACITY)
-
-Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity) {
-  wapp_debug_assert(allocator != NULL, "`allocator` should not be NULL");
-
-  Str8 *str = wapp_mem_allocator_alloc(allocator, STR8_BUF_ALLOC_SIZE(capacity));
-  if (!str) {
-    goto RETURN_STR8;
-  }
-
-  str->buf      = (u8 *)str + sizeof(Str8);
-  str->size     = 0;
-  str->capacity = capacity;
-
-RETURN_STR8:
-  return str;
-}
-
-Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity) {
-  Str8 *out = wapp_str8_alloc_buf(allocator, capacity);
-  if (out) {
-    memset(out->buf, 0, capacity);
-    out->size = capacity;
-  }
-  return out;
-}
-
-Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str) {
-  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
-
-  u64 length = strlen(str);
-  Str8 *output     = wapp_str8_alloc_buf(allocator, length * 2);
-  if (!output) {
-    goto RETURN_ALLOC_CSTR;
-  }
-
-  output->size = length;
-  memcpy(output->buf, str, length);
-
-RETURN_ALLOC_CSTR:
-  return output;
-}
-
-Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str) {
-  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
-
-  Str8 *output = wapp_str8_alloc_buf(allocator, str->capacity);
-  if (!output) {
-    goto RETURN_ALLOC_STR8;
-  }
-
-  output->size = str->size;
-  memcpy(output->buf, str->buf, str->size);
-
-RETURN_ALLOC_STR8:
-  return output;
-}
-
-Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end) {
-  wapp_debug_assert(allocator != NULL && str != NULL, "`allocator` and `str` should not be NULL");
-
-  Str8 *output = NULL;
-
-  if (start >= str->size || start >= end) {
-    goto RETURN_ALLOC_SUBSTR;
-  }
-
-  if (end > str->size) {
-    end = str->size;
-  }
-
-  output = wapp_str8_alloc_buf(allocator, str->capacity);
-  if (!output) {
-    goto RETURN_ALLOC_SUBSTR;
-  }
-
-  output->size = end - start;
-  memcpy(output->buf, str->buf + start, output->size);
-
-RETURN_ALLOC_SUBSTR:
-  return output;
-}
-
-void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str) {
-  wapp_debug_assert(allocator != NULL && str != NULL && (*str) != NULL, "Either `allocator` is NULL or `str` is an invalid double pointer");
-  wapp_mem_allocator_free(allocator, (void **)str, STR8_BUF_ALLOC_SIZE((*str)->capacity));
-}
-
-c8 wapp_str8_get(const Str8 *str, u64 index) {
-  if (index >= str->size) {
-    return '\0';
-  }
-
-  return str->buf[index];
-}
-
-void wapp_str8_set(Str8 *str, u64 index, c8 c) {
-  if (index >= str->size) {
-    return;
-  }
-
-  str->buf[index] = c;
-}
-
-void wapp_str8_push_back(Str8 *str, c8 c) {
-  if (!(str->size < str->capacity)) {
-    return;
-  }
-
-  u64 index = (str->size)++;
-  wapp_str8_set(str, index, c);
-}
-
-b8 wapp_str8_equal(Str8RO *s1, Str8RO *s2) {
-  if (s1->size != s2->size) {
-    return false;
-  }
-
-  return wapp_str8_equal_to_count(s1, s2, s1->size);
-}
-
-b8 wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count) {
-  if (!s1 || !s2) {
-      return false;
-  }
-
-  return memcmp(s1->buf, s2->buf, count) == 0;
-}
-
-Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end) {
-  if (start >= str->size || start >= end) {
-    start = str->size;
-    end   = str->size;
-  }
-
-  if (end > str->size) {
-    end = str->size;
-  }
-
-  return (Str8RO){
-    .capacity = end - start,
-    .size     = end - start,
-    .buf      = str->buf + start,
-  };
-}
-
-Str8 *wapp_str8_alloc_concat(const Allocator *allocator, Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(allocator != NULL && dst != NULL && src != NULL, "`allocator`, `dst` and `src` should not be NULL");
-
-  Str8 *output  = NULL;
-  u64 remaining = dst->capacity - dst->size;
-  if (src->size <= remaining) {
-    output = dst;
-    goto SOURCE_STRING_STR8_CONCAT;
-  }
-
-  u64 capacity = dst->capacity + src->size;
-
-  output = wapp_str8_alloc_buf(allocator, capacity);
-  if (!output) {
-    goto RETURN_STR8_CONCAT;
-  }
-
-  wapp_str8_concat_capped(output, dst);
-
-SOURCE_STRING_STR8_CONCAT:
-  wapp_str8_concat_capped(output, src);
-
-RETURN_STR8_CONCAT:
-  return output;
-}
-
-void wapp_str8_concat_capped(Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-
-  u64 remaining = dst->capacity - dst->size;
-  u64 to_copy   = remaining < src->size ? remaining : src->size;
-
-  memcpy(dst->buf + dst->size, src->buf, to_copy);
-  dst->size += to_copy;
-}
-
-void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-
-  u64 length  = strlen(src);
-  u64 to_copy = length <= dst->capacity ? length : dst->capacity;
-
-  memset(dst->buf, 0, dst->size);
-  memcpy(dst->buf, src, to_copy);
-  dst->size = to_copy;
-}
-
-void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-
-  u64 to_copy = src->size <= dst->capacity ? src->size : dst->capacity;
-
-  memset(dst->buf, 0, dst->size);
-  memcpy(dst->buf, src->buf, to_copy);
-  dst->size = to_copy;
-}
-
-void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity) {
-  wapp_debug_assert(dst != NULL && src != NULL, "`dst` and `src` should not be NULL");
-
-  u64 to_copy = src->size < dst_capacity ? src->size : dst_capacity - 1;
-
-  memset(dst, 0, dst_capacity);
-  memcpy(dst, src->buf, to_copy);
-}
-
-void wapp_str8_format(Str8 *dst, const char *format, ...) {
-  wapp_debug_assert(dst != NULL && format != NULL, "`dst` and `format` should not be NULL");
-
-  va_list args1;
-  va_list args2;
-
-  va_start(args1, format);
-  va_copy(args2, args1);
-
-  u64 total_size = vsnprintf(NULL, 0, format, args1);
-  dst->size      = total_size <= dst->capacity ? total_size : dst->capacity;
-
-  vsnprintf((char *)(dst->buf), dst->capacity, format, args2);
-
-  va_end(args1);
-  va_end(args2);
-}
-
-void wapp_str8_to_lower(Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-  wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
-
-  dst->size = src->size;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  u64 index  = 0;
-  b8 running = true;
-  while (running) {
-    wapp_str8_set(dst, index, (u8)tolower(wapp_str8_get(src, index)));
-    ++index;
-    running = index < src->size;
-  }
-}
-
-void wapp_str8_to_upper(Str8 *dst, Str8RO *src) {
-  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-  wapp_debug_assert(dst->capacity >= src->capacity, "`dst` does not have enough capacity");
-
-  dst->size = src->size;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  u64 index  = 0;
-  b8 running = true;
-  while (running) {
-    wapp_str8_set(dst, index, (u8)toupper(wapp_str8_get(src, index)));
-    ++index;
-    running = index < src->size;
-  }
-}
-
-void wapp_str8_from_bytes(Str8 *dst, const U8Array *src) {
-  wapp_debug_assert(src != NULL && dst != NULL, "`dst` and `src` should not be NULL");
-
-  u64 size = src->count * src->item_size;
-
-  wapp_debug_assert(dst->capacity >= size, "`dst` does not have enough capacity");
-
-  dst->size = size;
-  memcpy(dst->buf, src->items, size);
-}
-
-i64 wapp_str8_find(Str8RO *str, Str8RO substr) {
-  if (!str || substr.size > str->size) {
-    return -1;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  u64 char_index = 0;
-  b8 running    = char_index < str->size;
-  while (running) {
-    const c8 *sub = str->buf + char_index;
-    if (memcmp(sub, substr.buf, substr.size) == 0) {
-      return char_index;
-    }
-
-    ++char_index;
-    running = char_index < str->size;
-  }
-
-  return -1;
-}
-
-i64 wapp_str8_rfind(Str8RO *str, Str8RO substr) {
-  if (!str || substr.size > str->size) {
-    return -1;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  i64 char_index = str->size - substr.size;
-  b8 running    = char_index >= 0;
-  while (running) {
-    const c8 *sub = str->buf + char_index;
-    if (memcmp(sub, substr.buf, substr.size) == 0) {
-      return char_index;
-    }
-
-    --char_index;
-    running = char_index >= 0;
-  }
-
-  return -1;
-}
-
-Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-  wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
-
-  Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);
-
-  if (delimiter->size > str->size) {
-    Str8 *full     = wapp_str8_alloc_str8(allocator, str);
-    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-    if (node) {
-      node->item = full;
-      wapp_dbl_list_push_back(Str8, output, node);
-    }
-
-    goto RETURN_STR8_SPLIT;
-  }
-
-  i64 start   = 0;
-  i64 end     = 0;
-  i64 splits  = 0;
-  Str8 *rest = wapp_str8_alloc_str8(allocator, str);
-  Str8 *before_str;
-
-  while ((end = wapp_str8_find(rest, *delimiter)) != -1) {
-    if (max_splits > 0 && splits >= max_splits) {
-      break;
-    }
-
-    before_str     = wapp_str8_alloc_substr(allocator, str, start, start + end);
-    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-    if (node && before_str) {
-      node->item = before_str;
-      wapp_dbl_list_push_back(Str8, output, node);
-    }
-
-    wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
-    rest   = wapp_str8_alloc_substr(allocator, str, start + end + delimiter->size, str->size);
-    start += end + delimiter->size;
-
-    ++splits;
-  }
-
-  // Ensure the last part of the string after the delimiter is added to the list
-  rest           = wapp_str8_alloc_substr(allocator, str, start, str->size);
-  Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-  if (node && rest) {
-    node->item = rest;
-    wapp_dbl_list_push_back(Str8, output, node);
-  }
-
-RETURN_STR8_SPLIT:
-  return output;
-}
-
-Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits) {
-  wapp_debug_assert(allocator != NULL && str != NULL && delimiter != NULL, "`allocator`, `str` and `delimiter` should not be NULL");
-
-  Str8List *output = wapp_dbl_list_alloc(Str8, Str8List, allocator);
-
-  if (delimiter->size > str->size) {
-    Str8 *full     = wapp_str8_alloc_str8(allocator, str);
-    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-    if (node && full) {
-      node->item = full;
-      wapp_dbl_list_push_back(Str8, output, node);
-    }
-
-    goto RETURN_STR8_SPLIT;
-  }
-
-  i64 end     = 0;
-  i64 splits  = 0;
-  Str8 *rest = wapp_str8_alloc_str8(allocator, str);
-  Str8 *after_str;
-
-  while ((end = wapp_str8_rfind(rest, *delimiter)) != -1) {
-    if (max_splits > 0 && splits >= max_splits) {
-      break;
-    }
-
-    after_str     = wapp_str8_alloc_substr(allocator, rest, end + delimiter->size, str->size);
-    Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-    if (node) {
-      node->item = after_str;
-      wapp_dbl_list_push_front(Str8, output, node);
-    }
-
-    wapp_mem_allocator_free(allocator, (void **)&rest, sizeof(Str8));
-    rest   = wapp_str8_alloc_substr(allocator, rest, 0, end);
-
-    ++splits;
-  }
-
-  rest           = wapp_str8_alloc_substr(allocator, str, 0, rest->size);
-  Str8Node *node = wapp_dbl_list_node_alloc(Str8, Str8Node, allocator);
-  if (node && rest) {
-    node->item = rest;
-    wapp_dbl_list_push_front(Str8, output, node);
-  }
-
-RETURN_STR8_SPLIT:
-  return output;
-}
-
-Str8 *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter) {
-  wapp_debug_assert(allocator != NULL && list != NULL && delimiter != NULL, "`allocator`, `list` and `delimiter` should not be NULL");
-
-  u64 capacity = wapp_str8_list_total_size(list) + (delimiter->size * (list->node_count - 1));
-  Str8 *output = wapp_str8_alloc_buf(allocator, capacity * 2);
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  Str8Node *node;
-  u64 node_index = 0;
-  b8 running    = node_index < list->node_count;
-  while (running) {
-    node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
-    if (!node) {
-        break;
-    }
-
-    wapp_str8_concat_capped(output, node->item);
-
-    // NOTE (Abdelrahman): Comparison extracted to variable to silence
-    // MSVC Spectre mitigation warnings
-    b8 not_last = node_index + 1 < list->node_count;
-    if (not_last) {
-      wapp_str8_concat_capped(output, delimiter);
-    }
-
-    ++node_index;
-    running = node_index < list->node_count;
-  }
-
-  return output;
-}
-
-u64 wapp_str8_list_total_size(const Str8List *list) {
-  if (!list) {
-    return 0;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  Str8Node* node;
-  u64 node_index = 0;
-  u64 output     = 0;
-  b8 running    = node_index < list->node_count;
-  while (running) {
-      node = wapp_dbl_list_get(Str8, Str8Node, list, node_index);
-      if (!node) {
-          break;
-      }
-
-      output += node->item->size;
-      ++node_index;
-      running = node_index < list->node_count;
-  }
-
-  return output;
-}
--- a/src/base/strings/str8/str8.h
+++ b/src/base/strings/str8/str8.h
@@ -1,149 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef STR8_H
-#define STR8_H
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include "../../../common/platform/platform.h"
-#include "../../array/array.h"
-#include "../../dbl_list/dbl_list.h"
-#include "../../mem/allocator/mem_allocator.h"
-#include <string.h>
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct str8 Str8;
-struct str8 {
-  u64 capacity;
-  u64 size;
-  c8 *buf;
-};
-
-typedef const Str8 Str8RO;
-
-/**
- * Utilities to be used with printf functions
- */
-#define WAPP_STR8_SPEC "%.*s"
-#define wapp_str8_varg(STRING) (int)((STRING).size), (STRING).buf
-
-/**
- * Str8 stack buffers
- */
-
-#ifdef WAPP_PLATFORM_CPP
-// Uses a lambda to achieve the same behaviour achieved by the C macro
-#define wapp_str8_buf(CAPACITY) ([&](){ \
-  wapp_persist c8 buf[CAPACITY] = {};   \
-  memset(buf, 0, CAPACITY);             \
-  return Str8{CAPACITY, 0, buf};        \
-}())
-
-// Uses a lambda to achieve the same behaviour achieved by the C macro
-#define wapp_str8_lit(STRING) ([&]() {                            \
-  wapp_persist c8 buf[sizeof(STRING) * 2] = {};                   \
-  memcpy(buf, STRING, sizeof(STRING));                            \
-  return Str8{(sizeof(STRING) - 1) * 2, sizeof(STRING) - 1, buf}; \
-}())
-
-#define wapp_str8_lit_ro(STRING) Str8RO{sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
-#define wapp_str8_lit_ro_initialiser_list(STRING) {sizeof(STRING) - 1, sizeof(STRING) - 1, (c8 *)STRING}
-#else
-#define wapp_str8_buf(CAPACITY) ((Str8){.capacity = CAPACITY, .size = 0, .buf = (c8[CAPACITY]){0}})
-
-// Utilises the fact that memcpy returns pointer to dest buffer and that getting
-// address of compound literals is valid in C to create a string on the stack
-#define wapp_str8_lit(STRING) ((Str8){.capacity = (sizeof(STRING) - 1) * 2, \
-                                      .size     = sizeof(STRING) - 1,       \
-                                      .buf      = memcpy(&((c8 [sizeof(STRING) * 2]){0}), STRING, sizeof(STRING))})
-#define wapp_str8_lit_ro(STRING) ((Str8RO){.capacity = sizeof(STRING) - 1, \
-                                           .size     = sizeof(STRING) - 1, \
-                                           .buf      = (c8 *)STRING})
-// To be used only when initialising a static storage variable in compilers that don't support
-// initialisers with the syntax of wapp_str8_lit_ro (e.g. gcc). Should only be used when necessary
-// and only be assigned to a Str8RO variable to avoid any attempt at modifying the string
-#define wapp_str8_lit_ro_initialiser_list(STRING) {.capacity = sizeof(STRING) - 1, \
-                                                   .size     = sizeof(STRING) - 1, \
-                                                   .buf      = (c8 *)STRING}
-#endif // !WAPP_PLATFORM_CPP
-
-/**
- * Str8 allocated buffers
- */
-Str8 *wapp_str8_alloc_buf(const Allocator *allocator, u64 capacity);
-Str8 *wapp_str8_alloc_and_fill_buf(const Allocator *allocator, u64 capacity);
-Str8 *wapp_str8_alloc_cstr(const Allocator *allocator, const char *str);
-Str8 *wapp_str8_alloc_str8(const Allocator *allocator, Str8RO *str);
-Str8 *wapp_str8_alloc_substr(const Allocator *allocator, Str8RO *str, u64 start, u64 end);
-Str8 *wapp_str8_alloc_concat(const Allocator *allocator, Str8 *dst, Str8RO *src);
-// Only needed for allocators like malloc where each allocation has to be freed on its own.
-// No need to use it for allocators like Arena.
-void wapp_str8_dealloc_buf(const Allocator *allocator, Str8 **str);
-
-/**
- * Str8 utilities
- */
-c8   wapp_str8_get(Str8RO *str, u64 index);
-void wapp_str8_set(Str8 *str, u64 index, c8 c);
-void wapp_str8_push_back(Str8 *str, c8 c);
-b8  wapp_str8_equal(Str8RO *s1, Str8RO *s2);
-b8  wapp_str8_equal_to_count(Str8RO* s1, Str8RO* s2, u64 count);
-Str8 wapp_str8_slice(Str8RO *str, u64 start, u64 end);
-void wapp_str8_concat_capped(Str8 *dst, Str8RO *src);
-void wapp_str8_copy_cstr_capped(Str8 *dst, const char *src);
-void wapp_str8_copy_str8_capped(Str8 *dst, Str8RO *src);
-void wapp_str8_copy_to_cstr(char *dst, Str8RO *src, u64 dst_capacity);
-void wapp_str8_format(Str8 *dst, const char *format, ...);
-void wapp_str8_to_lower(Str8 *dst, Str8RO *src);
-void wapp_str8_to_upper(Str8 *dst, Str8RO *src);
-void wapp_str8_from_bytes(Str8 *dst, const U8Array *src);
-
-/**
- * Str8 find functions
- */
-i64 wapp_str8_find(Str8RO *str, Str8RO substr);
-i64 wapp_str8_rfind(Str8RO *str, Str8RO substr);
-
-/**
- * Str8 split and join
- */
-#define wapp_str8_split(ALLOCATOR, STR, DELIMITER) wapp_str8_split_with_max(ALLOCATOR, STR, DELIMITER, -1)
-#define wapp_str8_rsplit(ALLOCATOR, STR, DELIMITER) wapp_str8_rsplit_with_max(ALLOCATOR, STR, DELIMITER, -1)
-Str8List *wapp_str8_split_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits);
-Str8List *wapp_str8_rsplit_with_max(const Allocator *allocator, Str8RO *str, Str8RO *delimiter, i64 max_splits);
-Str8     *wapp_str8_join(const Allocator *allocator, const Str8List *list, Str8RO *delimiter);
-
-/**
- * Str8 list utilities
- */
-u64 wapp_str8_list_total_size(const Str8List *list);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-
-#include <type_traits>
-
-template <typename T>
-constexpr bool is_lvalue(T&&) {
-  return std::is_lvalue_reference<T>{};
-}
-
-#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() { \
-  wapp_persist Str8 str = wapp_str8_lit(STRING);                                    \
-  return &str;                                                                      \
-}())
-#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, [&]() { \
-  if (is_lvalue(STRING)) { return &STRING; }                                        \
-                                                                                    \
-  wapp_persist Str8 str = STRING;                                                   \
-  return &str;                                                                      \
-}())
-#else
-#define wapp_str8_node_from_cstr(STRING) wapp_dbl_list_node(Str8, Str8Node, &wapp_str8_lit(STRING))
-#define wapp_str8_node_from_str8(STRING) wapp_dbl_list_node(Str8, Str8Node, &(STRING))
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !STR8_H
--- a/src/base/wapp_base.c
+++ b/src/base/wapp_base.c
@@ -1,13 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_BASE_C
-#define WAPP_BASE_C
-
-#include "wapp_base.h"
-#include "array/array.c"
-#include "dbl_list/dbl_list.c"
-#include "mem/allocator/mem_allocator.c"
-#include "mem/utils/mem_utils.c"
-#include "strings/str8/str8.c"
-
-#endif // !WAPP_BASE_C
--- a/src/base/wapp_base.h
+++ b/src/base/wapp_base.h
@@ -1,13 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_BASE_H
-#define WAPP_BASE_H
-
-#include "dbl_list/dbl_list.h"
-#include "array/array.h"
-#include "mem/allocator/mem_allocator.h"
-#include "mem/utils/mem_utils.h"
-#include "strings/str8/str8.h"
-#include "../common/wapp_common.h"
-
-#endif // !WAPP_BASE_H
--- a/src/common/aliases/aliases.h
+++ b/src/common/aliases/aliases.h
@@ -1,67 +1,33 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef ALIASES_H
 #define ALIASES_H

-#include "../platform/platform.h"
 #include <stdint.h>

-#if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION && !defined(WAPP_PLATFORM_APPLE)
-  #include <uchar.h>
-
-  #if WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C23_VERSION
-    #define c8 char8_t
-  #else
-    #define c8 uint8_t
-  #endif // !WAPP_PLATFORM_C23_VERSION
-
-  #define c16 char16_t
-  #define c32 char32_t
-#else
-  #define c8 uint8_t
-  #define c16 uint16_t
-  #define c32 uint32_t
-#endif // !WAPP_PLATFORM_C
-
-#define u8 uint8_t
+#define u8  uint8_t
 #define u16 uint16_t
 #define u32 uint32_t
 #define u64 uint64_t

-#define b8 uint8_t
-
-#ifndef WAPP_PLATFORM_CPP
-
-#ifndef false
-#define false (b8)0
-#endif // !false
-
-#ifndef true
-#define true (b8)1
-#endif // !true
-
-#endif // !WAPP_PLATFORM_CPP
-
-#define i8 int8_t
+#define i8  int8_t
 #define i16 int16_t
 #define i32 int32_t
 #define i64 int64_t

-#define f32 float
-#define f64 double
+#define f32  float
+#define f64  double
 #define f128 long double

 #define uptr uintptr_t
 #define iptr intptr_t

-#define wapp_extern extern
-#define wapp_intern static
-#define wapp_persist static
+#define external   extern
+#define internal   static
+#define persistent static

-#ifdef WAPP_PLATFORM_CPP
-#define wapp_class_mem static
+#ifdef __cplusplus
+#define class_mem static
 #define BEGIN_C_LINKAGE extern "C" {
 #define END_C_LINKAGE }
-#endif // WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !ALIASES_H
--- a/src/common/assert/assert.h
+++ b/src/common/assert/assert.h
@@ -1,61 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_ASSERT_H
-#define WAPP_ASSERT_H
-
-#include "../aliases/aliases.h"
-#include "../platform/platform.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_static_assert(EXPR, MSG) extern char ASSERTION_FAILED[EXPR ? 1 : -1]
-
-#ifndef WAPP_NO_RUNTIME_ASSERT
-  #define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)
-#else
-  #define wapp_runtime_assert(EXPR, MSG)
-#endif
-
-#ifdef WAPP_DEBUG_ASSERT
-  #define wapp_debug_assert(EXPR, MSG) wapp_runtime_assert(EXPR, MSG)
-#else
-  #define wapp_debug_assert(EXPR, MSG)
-#endif
-
-#ifdef WAPP_PLATFORM_WINDOWS
-#define __wapp_runtime_assert(EXPR, MSG) do {                                       \
-  __pragma(warning(push))                                                           \
-  __pragma(warning(disable:4127))                                                   \
-  if (!(EXPR)) {                                                                    \
-  __pragma(warning(pop))                                                            \
-    __runtime_assert_failed(EXPR, MSG);                                             \
-  }                                                                                 \
-} while(false)
-#else
-#define __wapp_runtime_assert(EXPR, MSG) do {                                       \
-  if (!(EXPR)) {                                                                    \
-    __runtime_assert_failed(EXPR, MSG);                                             \
-  }                                                                                 \
-} while(false)
-#endif // !WAPP_PLATFORM_WINDOWS
-
-#define __runtime_assert_failed(EXPR, MSG) do {                                     \
-  fprintf(                                                                          \
-    stderr,                                                                         \
-    "%s:%d (In function `%s`): Assertion failed (%" PRIu32 ")\nDiagnostic: %s\n\n", \
-    __FILE__, __LINE__, __func__,                                                   \
-    EXPR, MSG                                                                       \
-  );                                                                                \
-  abort();                                                                          \
-} while(false)
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !WAPP_ASSERT_H
--- a/src/common/misc/misc_utils.h
+++ b/src/common/misc/misc_utils.h
@@ -1,13 +1,7 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MISC_UTILS_H
 #define MISC_UTILS_H

-#include "../aliases/aliases.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#include "aliases.h"

 #define KB(SIZE) (SIZE * 1024ull)
 #define MB(SIZE) (KB(SIZE) * 1024)
@@ -16,36 +10,4 @@ BEGIN_C_LINKAGE

 #define wapp_misc_utils_padding_size(SIZE) u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]

-#define U64_RSHIFT_OR_1(X)  (((u64)X) | (((u64)X) >> 1))
-#define U64_RSHIFT_OR_2(X)  (((u64)X) | (((u64)X) >> 2))
-#define U64_RSHIFT_OR_4(X)  (((u64)X) | (((u64)X) >> 4))
-#define U64_RSHIFT_OR_8(X)  (((u64)X) | (((u64)X) >> 8))
-#define U64_RSHIFT_OR_16(X) (((u64)X) | (((u64)X) >> 16))
-#define U64_RSHIFT_OR_32(X) (((u64)X) | (((u64)X) >> 32))
-#define wapp_misc_utils_u64_round_up_pow2(X) ( \
-  ( \
-    U64_RSHIFT_OR_32( \
-      U64_RSHIFT_OR_16( \
-        U64_RSHIFT_OR_8( \
-          U64_RSHIFT_OR_4( \
-            U64_RSHIFT_OR_2( \
-              U64_RSHIFT_OR_1(X - 1) \
-            ) \
-          ) \
-        ) \
-      ) \
-    ) \
-  ) + 1 \
-)
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-
-#include <tuple>
-
-#define wapp_misc_utils_va_args_count(T, ...) (std::tuple_size<decltype(std::make_tuple(__VA_ARGS__))>::value)
-#else
-#define wapp_misc_utils_va_args_count(T, ...) (sizeof((T[]){__VA_ARGS__})/sizeof(T))
-#endif // !WAPP_PLATFORM_CPP
-
 #endif // !MISC_UTILS_H
--- a/src/common/platform/platform.h
+++ b/src/common/platform/platform.h
@@ -1,5 +1,3 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef PLATFORM_H
 #define PLATFORM_H

@@ -60,55 +58,4 @@
  #error "Unrecognised platform"
 #endif

-#ifdef __cplusplus
-  #define WAPP_PLATFORM_CPP
-  #define WAPP_PLATFORM_CPP_VERSION __cplusplus
-  #define WAPP_PLATFORM_CPP98_VERSION 199711L
-  #define WAPP_PLATFORM_CPP11_VERSION 201103L
-  #define WAPP_PLATFORM_CPP14_VERSION 201402L
-  #define WAPP_PLATFORM_CPP17_VERSION 201703L
-  #define WAPP_PLATFORM_CPP20_VERSION 202002L
-  #define WAPP_PLATFORM_CPP23_VERSION 202302L
-
-  #if WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP98_VERSION
-    #define WAPP_PLATFORM_CPP98
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP11_VERSION
-    #define WAPP_PLATFORM_CPP11
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP14_VERSION
-    #define WAPP_PLATFORM_CPP14
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP17_VERSION
-    #define WAPP_PLATFORM_CPP17
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP20_VERSION
-    #define WAPP_PLATFORM_CPP20
-  #elif WAPP_PLATFORM_CPP_VERSION == WAPP_PLATFORM_CPP23_VERSION
-    #define WAPP_PLATFORM_CPP23
-  #else
-    #error "Unrecognised C++ version"
-  #endif
-#else
-  #define WAPP_PLATFORM_C
-
-  #if defined(__STDC_VERSION__)
-    #define WAPP_PLATFORM_C_VERSION __STDC_VERSION__
-    #define WAPP_PLATFORM_C99_VERSION 199901L
-    #define WAPP_PLATFORM_C11_VERSION 201112L
-    #define WAPP_PLATFORM_C17_VERSION 201710L
-    #define WAPP_PLATFORM_C23_VERSION 202311L
-
-    #if WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C99_VERSION
-      #define WAPP_PLATFORM_C99
-    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C11_VERSION
-      #define WAPP_PLATFORM_C11
-    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C17_VERSION
-      #define WAPP_PLATFORM_C17
-    #elif WAPP_PLATFORM_C_VERSION == WAPP_PLATFORM_C23_VERSION
-      #define WAPP_PLATFORM_C23
-    #else
-      #error "Unrecognised C version"
-    #endif
-  #else
-    #define WAPP_PLATFORM_C89
-  #endif
-#endif // !__cplusplus
-
 #endif // !PLATFORM_H
--- a/src/common/wapp_common.h
+++ b/src/common/wapp_common.h
@@ -1,11 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_COMMON_H
-#define WAPP_COMMON_H
-
-#include "aliases/aliases.h"
-#include "assert/assert.h"
-#include "misc/misc_utils.h"
-#include "platform/platform.h"
-
-#endif // !WAPP_COMMON_H
--- a/src/core/mem/allocator/mem_allocator.c
+++ b/src/core/mem/allocator/mem_allocator.c
@@ -1,35 +1,49 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "mem_allocator.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
 #include <stdlib.h>

+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Allocator API definitions
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size) {
-  wapp_debug_assert(allocator != NULL && (allocator->alloc) != NULL, "`allocator` and `allocator->alloc` should not be NULL");
+  if (!allocator || !(allocator->alloc)) {
+    return NULL;
+  }
+
  return allocator->alloc(size, allocator->obj);
 }

 void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment) {
-  wapp_debug_assert(allocator != NULL && (allocator->alloc_aligned) != NULL, "`allocator` and `allocator->alloc_aligned` should not be NULL");
+  if (!allocator || !(allocator->alloc_aligned)) {
+    return NULL;
+  }
+
  return allocator->alloc_aligned(size, alignment, allocator->obj);
 }

 void *wapp_mem_allocator_realloc(const Allocator *allocator, void *ptr, u64 old_size, u64 new_size) {
-  wapp_debug_assert(allocator != NULL && (allocator->realloc) != NULL, "`allocator` and `allocator->realloc` should not be NULL");
+  if (!allocator || !(allocator->realloc)) {
+    return NULL;
+  }
+
  return allocator->realloc(ptr, old_size, new_size, allocator->obj);
 }

 void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr, u64 old_size,
                                         u64 new_size, u64 alignment) {
-  wapp_debug_assert(allocator != NULL && (allocator->realloc_aligned) != NULL, "`allocator` and `allocator->realloc_aligned` should not be NULL");
+  if (!allocator || !(allocator->realloc_aligned)) {
+    return NULL;
+  }
+
  return allocator->realloc_aligned(ptr, old_size, new_size, alignment, allocator->obj);
 }

-void wapp_mem_allocator_free(const Allocator *allocator, void **ptr, u64 size) {
+void wapp_mem_allocator_free(const Allocator *allocator, void **ptr) {
  if (!allocator || !(allocator->free)) {
    return;
  }

-  allocator->free(ptr, size, allocator->obj);
+  allocator->free(ptr, allocator->obj);
 }
--- a/src/core/mem/allocator/mem_allocator.h
+++ b/src/core/mem/allocator/mem_allocator.h
@@ -0,0 +1,55 @@
+#ifndef MEM_ALLOCATOR_H
+#define MEM_ALLOCATOR_H
+
+#include "aliases.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Allocator function pointer types
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
+typedef void *(MemAllocFunc)(u64 size, void *alloc_obj);
+typedef void *(MemAllocAlignedFunc)(u64 size, u64 alignment, void *alloc_obj);
+typedef void *(MemReallocFunc)(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+typedef void *(MemReallocAlignedFunc)(void *ptr, u64 old_size, u64 new_size, u64 alignment, void *alloc_obj);
+typedef void(MemFreeFunc)(void **ptr, void *alloc_obj);
+
+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Allocator type
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
+typedef struct allocator Allocator;
+struct allocator {
+  void *obj;
+  MemAllocFunc *alloc;
+  MemAllocAlignedFunc *alloc_aligned;
+  MemReallocFunc *realloc;
+  MemReallocAlignedFunc *realloc_aligned;
+  MemFreeFunc *free;
+};
+
+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Allocator API declarations
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
+void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size);
+void *wapp_mem_allocator_alloc_aligned(const Allocator *allocator, u64 size, u64 alignment);
+void *wapp_mem_allocator_realloc(const Allocator *allocator, void *ptr, u64 old_size, u64 new_size);
+void *wapp_mem_allocator_realloc_aligned(const Allocator *allocator, void *ptr, u64 old_size,
+                                         u64 new_size, u64 alignment);
+void wapp_mem_allocator_free(const Allocator *allocator, void **ptr);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
+#endif // !MEM_ALLOCATOR_H
--- a/src/os/allocators/arena/mem_arena.c
+++ b/src/os/allocators/arena/mem_arena.c
@@ -1,11 +1,8 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "mem_arena.h"
-#include "../../mem/mem_os.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/assert/assert.h"
-#include "../../../common/misc/misc_utils.h"
-#include "../../../base/mem/utils/mem_utils.h"
+#include "aliases.h"
+#include "misc_utils.h"
+#include "mem_utils.h"
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>

@@ -21,14 +18,14 @@ struct arena {
  u8 *buf;
  u8 *offset;
  u64 capacity;
-  b8 committed;
+  bool committed;

 #ifdef WAPP_PLATFORM_WINDOWS
-  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(b8));
+  wapp_misc_utils_padding_size(sizeof(u8 *) * 2 + sizeof(u64) + sizeof(bool));
 #endif // ifdef WAPP_PLATFORM_WINDOWS
 };

-b8 wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
+bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, bool zero_buffer) {
  if (!arena || *arena || base_capacity == 0) {
    return false;
  }
@@ -39,11 +36,7 @@ b8 wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags fl
    return false;
  }

-  u64 arena_capacity = wapp_misc_utils_u64_round_up_pow2(
-      base_capacity >= ARENA_MINIMUM_CAPACITY ?
-      base_capacity :
-      ARENA_MINIMUM_CAPACITY
-  );
+  u64 arena_capacity = base_capacity >= ARENA_MINIMUM_CAPACITY ? base_capacity : ARENA_MINIMUM_CAPACITY;

  arena_ptr->buf = (u8 *)wapp_mem_util_alloc(NULL, arena_capacity, WAPP_MEM_ACCESS_READ_WRITE, flags,
                                             zero_buffer ? WAPP_MEM_INIT_INITIALISED : WAPP_MEM_INIT_UNINITIALISED);
@@ -65,7 +58,9 @@ void *wapp_mem_arena_alloc(Arena *arena, u64 size) {
 }

 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {
-  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  if (!arena) {
+    return NULL;
+  }

  u8 *alloc_start = arena->offset;

@@ -78,13 +73,13 @@ void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment) {

 #ifdef WAPP_PLATFORM_WINDOWS
  if (!(arena->committed)) {
-    wapp_mem_util_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
-                        WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
-                        WAPP_MEM_INIT_UNINITIALISED);
+    output = (u8 *)wapp_mem_util_alloc(alloc_start, (uptr)(arena->offset) - (uptr)(alloc_start),
+                                       WAPP_MEM_ACCESS_READ_WRITE, WAPP_MEM_ALLOC_COMMIT,
+                                       WAPP_MEM_INIT_INITIALISED);
  }
-#endif // ifdef WAPP_PLATFORM_WINDOWS
-
+#else
  memset(output, 0, size);
+#endif // ifdef WAPP_PLATFORM_WINDOWS

  return (void *)output;
 }
@@ -124,14 +119,18 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 }

 void wapp_mem_arena_clear(Arena *arena) {
-  wapp_debug_assert(arena != NULL, "`arena` should not be NULL");
+  if (!arena) {
+    return;
+  }

  memset(arena->buf, 0, arena->offset - arena->buf);
  arena->offset = arena->buf;
 }

 void wapp_mem_arena_destroy(Arena **arena) {
-  wapp_debug_assert(arena != NULL && (*arena) != NULL, "`arena` double pointer is not valid");
+  if (!arena) {
+    return;
+  }

  Arena *arena_ptr = *arena;
  if (arena_ptr->buf) {
--- a/src/os/allocators/arena/mem_arena.h
+++ b/src/os/allocators/arena/mem_arena.h
@@ -1,15 +1,13 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MEM_ARENA_H
 #define MEM_ARENA_H

-#include "../../mem/mem_os.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "aliases.h"
+#include "mem_utils.h"
+#include <stdbool.h>

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 typedef struct arena Arena;

@@ -27,7 +25,7 @@ typedef struct arena Arena;
 * control over how the Arena is initialised. Wrapper macros are provided for
 * easier use.
 */
-b8  wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
+bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, MemAllocFlags flags, bool zero_buffer);
 void *wapp_mem_arena_alloc(Arena *arena, u64 size);
 void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment);
 void *wapp_mem_arena_realloc(Arena *arena, void *ptr, u64 old_size, u64 new_size);
@@ -35,8 +33,8 @@ void *wapp_mem_arena_realloc_aligned(Arena *arena, void *ptr, u64 old_size, u64
 void wapp_mem_arena_clear(Arena *arena);
 void wapp_mem_arena_destroy(Arena **arena);

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !MEM_ARENA_H
--- a/src/core/mem/arena/mem_arena_allocator.c
+++ b/src/core/mem/arena/mem_arena_allocator.c
@@ -0,0 +1,71 @@
+#include "mem_arena_allocator.h"
+#include "mem_arena.h"
+
+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Arena Allocator wrappers declarations
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
+internal inline void *mem_arena_alloc(u64 size, void *alloc_obj);
+internal inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
+internal inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+internal inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+                                                void *alloc_obj);
+
+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Arena Allocator API definitions
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
+Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, bool zero_buffer) {
+  Allocator allocator = {0};
+  bool initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
+  if (!initialised) {
+    return allocator;
+  }
+
+  allocator.alloc           = mem_arena_alloc;
+  allocator.alloc_aligned   = mem_arena_alloc_aligned;
+  allocator.realloc         = mem_arena_realloc;
+  allocator.realloc_aligned = mem_arena_realloc_aligned;
+
+  return allocator;
+}
+
+void wapp_mem_arena_allocator_clear(Allocator *allocator) {
+  wapp_mem_arena_clear((Arena *)(allocator->obj));
+}
+
+void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
+  wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
+  *allocator = (Allocator){0};
+}
+
+/***************************************************************************/ //
+////////////////////////////////////////////////////////////////////////////////
+////// Arena Allocator wrappers definitions
+////////////////////////////////////////////////////////////////////////////////
+/***************************************************************************/ //
+
+internal inline void *mem_arena_alloc(u64 size, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_alloc(arena, size);
+}
+
+internal inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_alloc_aligned(arena, size, alignment);
+}
+
+internal inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
+}
+
+internal inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
+                                                void *alloc_obj) {
+  Arena *arena = (Arena *)alloc_obj;
+  return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);
+}
--- a/src/os/allocators/arena/mem_arena_allocator.h
+++ b/src/os/allocators/arena/mem_arena_allocator.h
@@ -1,16 +1,14 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef MEM_ARENA_ALLOCATOR_H
 #define MEM_ARENA_ALLOCATOR_H

-#include "../../mem/mem_os.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-#include "../../../base/mem/allocator/mem_allocator.h"
+#include "aliases.h"
+#include "mem_utils.h"
+#include "mem_allocator.h"
+#include <stdbool.h>

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #define wapp_mem_arena_allocator_init(base_capacity)                           \
  (wapp_mem_arena_allocator_init_custom(base_capacity, WAPP_MEM_ALLOC_RESERVE, false))
@@ -32,12 +30,12 @@ BEGIN_C_LINKAGE
 * The `wapp_mem_arena_allocator_init_custom` provides the most control over how
 * the Arena is initialised. Wrapper macros are provided for easier use.
 */
-Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer);
+Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, bool zero_buffer);
 void wapp_mem_arena_allocator_clear(Allocator *allocator);
 void wapp_mem_arena_allocator_destroy(Allocator *allocator);

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !MEM_ARENA_ALLOCATOR_H
--- a/src/core/mem/libc/mem_libc_allocator.c
+++ b/src/core/mem/libc/mem_libc_allocator.c
@@ -0,0 +1,62 @@
+#include "mem_libc_allocator.h"
+#include "aliases.h"
+#include "mem_allocator.h"
+#include <stdlib.h>
+#include <string.h>
+
+internal inline void *mem_libc_alloc(u64 size, void *alloc_obj);
+// TODO (Abdelrahman): aligned_alloc isn't implemented on Windows. Revisit later
+#if 0
+internal inline void *mem_libc_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
+#endif
+internal inline void *mem_libc_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
+internal inline void mem_libc_free(void **ptr, void *alloc_obj);
+
+Allocator wapp_mem_libc_allocator(void) {
+  return (Allocator){
+      .obj             = NULL,
+      .alloc           = mem_libc_alloc,
+      .alloc_aligned   = NULL,
+      .realloc         = mem_libc_realloc,
+      .realloc_aligned = NULL,
+      .free            = mem_libc_free,
+  };
+}
+
+internal inline void *mem_libc_alloc(u64 size, void *alloc_obj) {
+  (void)alloc_obj; // Silence unused warnings
+  return calloc(1, size);
+}
+
+#if 0
+internal inline void *mem_libc_alloc_aligned(u64 size, u64 alignment,
+                                             void *alloc_obj) {
+  (void)alloc_obj; // Silence unused warnings
+
+  void *output = aligned_alloc(alignment, size);
+  if (output) {
+    memset(output, 0, size);
+  }
+
+  return output;
+}
+#endif
+
+internal inline void *mem_libc_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
+  // Silence unused warnings
+  (void)alloc_obj;
+  (void)new_size;
+
+  return realloc(ptr, old_size);
+}
+
+internal inline void mem_libc_free(void **ptr, void *alloc_obj) {
+  (void)alloc_obj; // Silence unused warnings
+
+  if (!ptr || !(*ptr)) {
+    return;
+  }
+
+  free(*ptr);
+  *ptr = NULL;
+}
--- a/src/core/mem/libc/mem_libc_allocator.h
+++ b/src/core/mem/libc/mem_libc_allocator.h
@@ -0,0 +1,16 @@
+#ifndef MEM_LIBC_H
+#define MEM_LIBC_H
+
+#include "mem_allocator.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+Allocator wapp_mem_libc_allocator(void);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
+#endif // !MEM_LIBC_H
--- a/src/core/strings/str8/str8.c
+++ b/src/core/strings/str8/str8.c
@@ -0,0 +1,27 @@
+#include "str8.h"
+#include <string.h>
+
+Str8 wapp_str8_lit(char *str) {
+  if (!str) {
+    return (Str8){.capacity = 0, .size = 0, .buf = (u8 *)""};
+  }
+
+  u64 size = strlen(str);
+  return (Str8){.capacity = size, .size = size, .buf = (u8 *)str};
+}
+
+char wapp_str8_get(const Str8 *str, u64 index) {
+  if (index >= str->size) {
+    return '\0';
+  }
+
+  return (char)(str->buf[index]);
+}
+
+void wapp_str8_set(Str8 *str, u64 index, char c) {
+  if (index >= str->size) {
+    return;
+  }
+
+  str->buf[index] = (u8)c;
+}
--- a/src/core/strings/str8/str8.h
+++ b/src/core/strings/str8/str8.h
@@ -0,0 +1,25 @@
+#ifndef STR8_H
+#define STR8_H
+
+#include "aliases.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // !__cplusplus
+
+typedef struct str8 Str8;
+struct str8 {
+  u64 capacity;
+  u64 size;
+  u8 *buf;
+};
+
+Str8 wapp_str8_lit(char *str);
+char wapp_str8_get(const Str8 *str, u64 index);
+void wapp_str8_set(Str8 *str, u64 index, char c);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // !__cplusplus
+
+#endif // !STR8_H
--- a/src/os/allocators/arena/mem_arena_allocator.c
+++ b/src/os/allocators/arena/mem_arena_allocator.c
@@ -1,59 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_arena_allocator.h"
-#include "mem_arena.h"
-#include "../../mem/mem_os.h"
-#include "../../../common/aliases/aliases.h"
-
-wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj);
-wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
-wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj);
-wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
-                                                void *alloc_obj);
-
-
-Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity, MemAllocFlags flags, b8 zero_buffer) {
-  Allocator allocator = {0};
-  b8 initialised = wapp_mem_arena_init_custom((Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
-  if (!initialised) {
-    return allocator;
-  }
-
-  allocator.alloc           = mem_arena_alloc;
-  allocator.alloc_aligned   = mem_arena_alloc_aligned;
-  allocator.realloc         = mem_arena_realloc;
-  allocator.realloc_aligned = mem_arena_realloc_aligned;
-
-  return allocator;
-}
-
-void wapp_mem_arena_allocator_clear(Allocator *allocator) {
-  wapp_mem_arena_clear((Arena *)(allocator->obj));
-}
-
-void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
-  wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
-  *allocator = (Allocator){0};
-}
-
-
-wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj) {
-  Arena *arena = (Arena *)alloc_obj;
-  return wapp_mem_arena_alloc(arena, size);
-}
-
-wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj) {
-  Arena *arena = (Arena *)alloc_obj;
-  return wapp_mem_arena_alloc_aligned(arena, size, alignment);
-}
-
-wapp_intern inline void *mem_arena_realloc(void *ptr, u64 old_size, u64 new_size, void *alloc_obj) {
-  Arena *arena = (Arena *)alloc_obj;
-  return wapp_mem_arena_realloc(arena, ptr, old_size, new_size);
-}
-
-wapp_intern inline void *mem_arena_realloc_aligned(void *ptr, u64 old_size, u64 new_size, u64 alignment,
-                                                void *alloc_obj) {
-  Arena *arena = (Arena *)alloc_obj;
-  return wapp_mem_arena_realloc_aligned(arena, ptr, old_size, new_size, alignment);
-}
--- a/src/os/cpath/cpath.c
+++ b/src/os/cpath/cpath.c
@@ -1,135 +1,92 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "cpath.h"
-#include "../allocators/arena/mem_arena_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/misc/misc_utils.h"
-#include "../../base/dbl_list/dbl_list.h"
-#include "../../base/mem/allocator/mem_allocator.h"
-#include "../../base/strings/str8/str8.h"
+#include "aliases.h"
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>

-u32 wapp_cpath_join_path(Str8 *dst, const Str8List *parts) {
-  if (!dst || !parts) {
-    return CPATH_JOIN_INVALID_ARGS;
+void join_root_and_leaf(const char *root, const char *leaf, char *dst);
+
+void join_path(char *dst, u64 count, ...) {
+  va_list args;
+
+  va_start(args, count);
+
+  for (u64 i = 0; i < count; ++i) {
+    join_root_and_leaf(dst, va_arg(args, const char *), dst);
  }

-  if (parts->node_count == 0) {
-    return CPATH_JOIN_EMPTY_PARTS;
-  }
-
-  Str8 separator = wapp_str8_buf(4);
-  wapp_str8_push_back(&separator, WAPP_PATH_SEP);
-
-  u64 required_capacity = parts->node_count * separator.size + wapp_str8_list_total_size(parts);
-  if (dst->capacity < required_capacity) {
-    return CPATH_JOIN_INSUFFICIENT_DST_CAPACITY;
-  }
-
-  // Handle first node
-  const Str8Node *first_node = wapp_dbl_list_get(Str8, Str8Node, parts, 0);
-  wapp_str8_copy_str8_capped(dst, first_node->item);
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  const Str8Node *node = first_node;
-  u64 node_index       = 1;
-  b8 running          = node_index < parts->node_count;
-  while (running && node->next) {
-    node = node->next;
-    if (node->item->size == 0) {
-      continue;
-    }
-
-    if (dst->size > 0) {
-      char dst_last    = wapp_str8_get(dst, dst->size - 1);
-      char node_start  = wapp_str8_get(node->item, 0);
-      b8 add_path_sep = dst_last != WAPP_PATH_SEP && node_start != WAPP_PATH_SEP;
-
-      if (add_path_sep) {
-        wapp_str8_concat_capped(dst, &separator);
-      }
-    }
-
-    wapp_str8_concat_capped(dst, node->item);
-
-    ++node_index;
-    running = node_index < parts->node_count;
-  }
-
-  return CPATH_JOIN_SUCCESS;
+  va_end(args);
 }

-Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels) {
-  Str8 *output = NULL;
-  if (!allocator || !path) {
-    goto RETURN_DIRUP;
-  }
-
-  b8 absolute   = wapp_str8_get(path, 0) == WAPP_PATH_SEP;
-  Str8 separator = wapp_str8_buf(4);
-  wapp_str8_push_back(&separator, WAPP_PATH_SEP);
-
-  if (path->size == 0) {
-    output = wapp_str8_alloc_buf(allocator, 16);
-    if (!output) {
-      goto RETURN_DIRUP;
-    }
-
-    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
-    goto RETURN_DIRUP;
-  }
-
+void dirup(char *dst, u64 levels, const char *path) {
  if (levels < 1) {
-    output = wapp_str8_alloc_str8(allocator, path);
-    goto RETURN_DIRUP;
+    return;
  }

-  Allocator tmp_arena = wapp_mem_arena_allocator_init(MB(8));
-  if (wapp_mem_allocator_invalid(&tmp_arena)) {
-    goto RETURN_DIRUP;
+  u64 copy_count = 0;
+  u64 sep_count = 0;
+
+  u64 full_length;
+  u64 length;
+  length = full_length = strlen(path);
+
+  if (length > 1 && path[length - 1] == PATH_SEP) {
+    --length;
  }

-  Str8List *parts = wapp_str8_split(&tmp_arena, path, &separator);
-  if (!parts) {
-    goto RETURN_DIRUP;
-  }
+  for (i64 i = length - 1; i >= 0; --i) {
+    if (path[i] == PATH_SEP) {
+      ++sep_count;
+      copy_count = i + 1;

-  if (levels >= parts->node_count) {
-    output = wapp_str8_alloc_buf(allocator, 16);
-    if (!output) {
-      goto LIST_CLEANUP_DIRUP;
+      if (sep_count == levels) {
+        break;
+      }
    }
+  }

-    wapp_str8_push_back(output, absolute ? WAPP_PATH_SEP : '.');
+  char tmp[256];
+  snprintf(tmp, 2, "%c", PATH_SEP);
+  // NOTE (Abdelrahman): Conditions stored in variables to silence MSVC warning C5045
+  bool insufficient_levels = sep_count < levels;
+  bool path_to_copy_is_separator = strncmp(path, tmp, copy_count) != 0;
+  if (insufficient_levels && path_to_copy_is_separator) {
+    copy_count = 0;
+  }
+
+  if (dst == path) {
+    memset(&dst[copy_count], 0, full_length - copy_count);
  } else {
-    for (u64 i = 0; i < levels; ++i) {
-      wapp_dbl_list_pop_back(Str8, Str8Node, parts);
-    }
-    
-    u64 alignment  = sizeof(void *) * 2;
-    u64 alloc_size = wapp_str8_list_total_size(parts) + parts->node_count * separator.size;
-    u64 modulo     = alloc_size & (alignment - 1);
-    alloc_size    += alignment - modulo;
-
-    output = wapp_str8_alloc_buf(allocator, alloc_size);
-    if (output) {
-      if (absolute) {
-        wapp_str8_push_back(output, WAPP_PATH_SEP);
-      }
-
-      Str8 *joined = wapp_str8_join(&tmp_arena, parts, &separator);
-      if (joined) {
-        wapp_str8_concat_capped(output, joined);
-      }
-    }
+    u64 dst_length = strlen(dst);
+    memset(dst, 0, dst_length);
+    strncpy(dst, path, copy_count);
  }

-LIST_CLEANUP_DIRUP:
-  wapp_mem_arena_allocator_destroy(&tmp_arena);
-
-RETURN_DIRUP:
-  return output;
+  u64 final_length = strlen(dst);
+  if (final_length > 1) {
+    dst[final_length - 1] = '\0';
+  } else if (final_length == 0) {
+    dst[0] = '.';
+  }
+}
+
+void join_root_and_leaf(const char *root, const char *leaf, char *dst) {
+  u64 root_length = strlen(root);
+  u64 leaf_length = strlen(leaf);
+
+  memcpy(dst, root, root_length);
+
+  if (leaf_length == 0) {
+    return;
+  }
+
+  u64 copy_start = root_length;
+
+  if (root_length > 0 && root[root_length - 1] != PATH_SEP && leaf[0] != PATH_SEP) {
+    dst[root_length] = PATH_SEP;
+    ++copy_start;
+  }
+
+  memcpy(&(dst[copy_start]), leaf, leaf_length);
 }
--- a/src/os/cpath/cpath.h
+++ b/src/os/cpath/cpath.h
@@ -1,45 +1,32 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef CPATH_H
 #define CPATH_H

-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-#include "../../base/mem/allocator/mem_allocator.h"
-#include "../../base/strings/str8/str8.h"
+#include "aliases.h"
+#include "platform.h"

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #ifdef WAPP_PLATFORM_POSIX
-#include <limits.h>
-#define WAPP_PATH_SEP '/'
-#define WAPP_PATH_MAX PATH_MAX
+#define PATH_SEP '/'
 #elif defined(WAPP_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#define WAPP_PATH_SEP '\\'
-#define WAPP_PATH_MAX MAX_PATH
+#define PATH_SEP '\\'
 #else
 #error "Unrecognised platform"
 #endif

-#define wapp_cpath_dirname(ALLOCATOR, PATH) dirup(ALLOCATOR, PATH, 1)
-#define wapp_cpath_dirup(ALLOCATOR, PATH, COUNT) dirup(ALLOCATOR, PATH, COUNT)
+#define NUMPARTS(...) (sizeof((const char *[]){"", __VA_ARGS__}) / sizeof(const char *) - 1)

-enum {
-  CPATH_JOIN_SUCCESS = 0,
-  CPATH_JOIN_INVALID_ARGS,
-  CPATH_JOIN_EMPTY_PARTS,
-  CPATH_JOIN_INSUFFICIENT_DST_CAPACITY,
-};
+#define wapp_cpath_join_path(DST, ...) join_path(DST, NUMPARTS(__VA_ARGS__), __VA_ARGS__)
+#define wapp_cpath_dirname(DST, PATH) dirup(DST, 1, PATH)
+#define wapp_cpath_dirup(DST, COUNT, PATH) dirup(DST, COUNT, PATH)

-u32  wapp_cpath_join_path(Str8 *dst, const Str8List *parts);
-Str8 *dirup(const Allocator *allocator, Str8RO *path, u64 levels);
+void join_path(char *dst, u64 count, ...);
+void dirup(char *dst, u64 levels, const char *path);

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !CPATH_H
--- a/src/os/file/file.c
+++ b/src/os/file/file.c
@@ -1,109 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "file.h"
-#include "../cpath/cpath.h"
-#include "../../common/assert/assert.h"
-#include "../../common/aliases/aliases.h"
-#include "../../base/array/array.h"
-#include "../../base/strings/str8/str8.h"
-#include <stdio.h>
-
-File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
-  wapp_persist const char *modes[FILE_ACCESS_MODE_COUNT] = {
-    [WAPP_FA_MODE_R]      = "r",
-    [WAPP_FA_MODE_W]      = "w",
-    [WAPP_FA_MODE_A]      = "a",
-    [WAPP_FA_MODE_R_EX]   = "r+",
-    [WAPP_FA_MODE_W_EX]   = "w+",
-    [WAPP_FA_MODE_A_EX]   = "a+",
-    [WAPP_FA_MODE_RB]     = "rb",
-    [WAPP_FA_MODE_WB]     = "wb",
-    [WAPP_FA_MODE_AB]     = "ab",
-    [WAPP_FA_MODE_RB_EX]  = "rb+",
-    [WAPP_FA_MODE_WB_EX]  = "wb+",
-    [WAPP_FA_MODE_AB_EX]  = "ab+",
-    [WAPP_FA_MODE_WX]     = "wx",
-    [WAPP_FA_MODE_WX_EX]  = "wx+",
-    [WAPP_FA_MODE_WBX]    = "wbx",
-    [WAPP_FA_MODE_WBX_EX] = "wbx+",
-  };
-  wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
-  wapp_debug_assert(filepath->size < WAPP_PATH_MAX, "`filepath` exceeds max path limit.");
-
-  memset(tmp, 0, WAPP_PATH_MAX);
-  memcpy(tmp, filepath->buf, filepath->size);
-
-  return fopen((const char *)tmp, modes[mode]);
-}
-
-u64 wapp_file_get_current_position(File *file) {
-  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-  return (u64)ftell(file);
-}
-
-i32 wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin) {
-  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-  // TODO (Abdelrahman): Revisit conversion to long
-  return fseek(file, (long)offset, origin);
-}
-
-u64 wapp_file_get_length(File *file) {
-  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-
-  u64 current = wapp_file_get_current_position(file);
-
-  wapp_file_seek(file, 0, WAPP_SEEK_END);
-
-  u64 output = ftell(file);
-
-  // Restore position
-  wapp_file_seek(file, current, WAPP_SEEK_START);
-
-  return output;
-}
-
-u64 wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count) {
-  wapp_debug_assert(dst_buf != NULL && file != NULL,
-                    "`dst_buf` and `file` should not be NULL.");
-
-  u64 file_length       = wapp_file_get_length(file);
-  u64 item_size         = dst_buf->item_size;
-  u64 dst_byte_capacity = dst_buf->capacity * item_size;
-  u64 req_byte_count    = item_count * item_size;
-  u64 copy_byte_count   = 0;
-
-  if (req_byte_count <= file_length && req_byte_count <= dst_byte_capacity) {
-    copy_byte_count = req_byte_count;
-  } else {
-    copy_byte_count = file_length <= dst_byte_capacity ? file_length : dst_byte_capacity;
-  }
-
-  u64 count = fread(dst_buf->items, sizeof(u8), copy_byte_count, file);
-  if (ferror(file)) { return 0; }
-
-  dst_buf->count = count / item_size;
-
-  return dst_buf->count;
-}
-
-u64 wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count) {
-  wapp_debug_assert(src_buf != NULL && file != NULL,
-                    "`src_buf` and `file` should not be NULL.");
-
-  u64 item_size      = src_buf->item_size;
-  u64 src_byte_count = src_buf->count * item_size;
-  u64 req_byte_count = item_count * item_size;
-  u64 to_copy        = req_byte_count <= src_byte_count ? req_byte_count : src_byte_count;
-
-  return fwrite(src_buf->items, sizeof(u8), to_copy, file);
-}
-
-i32 wapp_file_flush(File *file) {
-  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-  return fflush(file);
-}
-
-i32 wapp_file_close(File *file) {
-  wapp_debug_assert(file != NULL, "`file` should not be NULL.");
-  return fclose(file);
-}
--- a/src/os/file/file.h
+++ b/src/os/file/file.h
@@ -1,56 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef FILE_H
-#define FILE_H
-
-#include "../../common/aliases/aliases.h"
-#include "../../base/strings/str8/str8.h"
-#include <stdio.h>
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef FILE File;
-
-typedef enum {
-  WAPP_FA_MODE_R,      // Equivalent to r
-  WAPP_FA_MODE_W,      // Equivalent to w
-  WAPP_FA_MODE_A,      // Equivalent to a
-  WAPP_FA_MODE_R_EX,   // Equivalent to r+
-  WAPP_FA_MODE_W_EX,   // Equivalent to w+
-  WAPP_FA_MODE_A_EX,   // Equivalent to a+
-  WAPP_FA_MODE_RB,     // Equivalent to rb
-  WAPP_FA_MODE_WB,     // Equivalent to wb
-  WAPP_FA_MODE_AB,     // Equivalent to ab
-  WAPP_FA_MODE_RB_EX,  // Equivalent to rb+
-  WAPP_FA_MODE_WB_EX,  // Equivalent to wb+
-  WAPP_FA_MODE_AB_EX,  // Equivalent to ab+
-  WAPP_FA_MODE_WX,     // Equivalent to wx
-  WAPP_FA_MODE_WX_EX,  // Equivalent to wx+
-  WAPP_FA_MODE_WBX,    // Equivalent to wbx
-  WAPP_FA_MODE_WBX_EX, // Equivalent to wbx+
-
-  FILE_ACCESS_MODE_COUNT,
-} FileAccessMode;
-
-typedef enum {
-  WAPP_SEEK_START   = SEEK_SET,
-  WAPP_SEEK_CURRENT = SEEK_CUR,
-  WAPP_SEEK_END     = SEEK_END,
-} FileSeekOrigin;
-
-File *wapp_file_open(Str8RO *filename, FileAccessMode mode);
-u64   wapp_file_get_current_position(File *file);
-i32   wapp_file_seek(File *file, u64 offset, FileSeekOrigin origin);
-u64   wapp_file_get_length(File *file);
-u64   wapp_file_read(GenericArray *dst_buf, File *file, u64 item_count);
-u64   wapp_file_write(const GenericArray *src_buf, File *file, u64 item_count);
-i32   wapp_file_flush(File *file);
-i32   wapp_file_close(File *file);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !FILE_H
--- a/src/os/mem/mem_os.c
+++ b/src/os/mem/mem_os.c
@@ -1,30 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "mem_os.h"
-#include "mem_os_ops.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-#include <assert.h>
-#include <string.h>
-
-#if defined(WAPP_PLATFORM_WINDOWS)
-#include "win/mem_os_win.h"
-#elif defined(WAPP_PLATFORM_POSIX)
-#include "posix/mem_os_posix.h"
-#else
-#error "Unrecognised platform"
-#endif
-
-void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-  void *output = mem_util_allocate(addr, size, access, flags, type);
-
-  if (type == WAPP_MEM_INIT_INITIALISED) {
-    memset(output, 0, size);
-  }
-
-  return output;
-}
-
-void wapp_mem_util_free(void *ptr, u64 size) {
-  mem_util_free(ptr, size);
-}
--- a/src/os/mem/mem_os.h
+++ b/src/os/mem/mem_os.h
@@ -1,33 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef MEM_OS_H
-#define MEM_OS_H
-
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#include "mem_os_ops.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#if defined(WAPP_PLATFORM_WINDOWS)
-#include "win/mem_os_win.h"
-#elif defined(WAPP_PLATFORM_POSIX)
-#include "posix/mem_os_posix.h"
-#else
-#error "Unrecognised platform"
-#endif
-
-void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-void wapp_mem_util_free(void *ptr, u64 size);
-
-wapp_extern void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
-wapp_extern void mem_util_free(void *ptr, u64 size);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !MEM_OS_H
--- a/src/os/mem/mem_utils.c
+++ b/src/os/mem/mem_utils.c
@@ -0,0 +1,53 @@
+#include "mem_utils.h"
+#include "mem_utils_ops.h"
+#include "aliases.h"
+#include "platform.h"
+#include <assert.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(WAPP_PLATFORM_WINDOWS)
+#include "mem_utils_win.h"
+#elif defined(WAPP_PLATFORM_POSIX)
+#include "mem_utils_posix.h"
+#else
+#error "Unrecognised platform"
+#endif
+
+internal bool is_power_of_two(u64 num) { return (num & (num - 1)) == 0; }
+
+void *wapp_mem_util_align_forward(void *ptr, u64 alignment) {
+  if (!ptr) {
+    return NULL;
+  }
+
+  assert(is_power_of_two(alignment));
+
+  uptr p = (uptr)ptr;
+  uptr align = (uptr)alignment;
+
+  // Similar to p % align, but it's a faster implementation that works fine
+  // because align is guaranteed to be a power of 2
+  uptr modulo = p & (align - 1);
+
+  if (modulo != 0) {
+    p += align - modulo;
+  }
+
+  return (void *)p;
+}
+
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
+  void *output = mem_util_allocate(addr, size, access, flags, type);
+
+  if (type == WAPP_MEM_INIT_INITIALISED) {
+    memset(output, 0, size);
+  }
+
+  return output;
+}
+
+void wapp_mem_util_free(void *ptr, u64 size) {
+  mem_util_free(ptr, size);
+}
--- a/src/os/mem/mem_utils.h
+++ b/src/os/mem/mem_utils.h
@@ -0,0 +1,32 @@
+#ifndef MEM_UTILS_H
+#define MEM_UTILS_H
+
+#include "aliases.h"
+#include "platform.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+#include "mem_utils_ops.h"
+
+#if defined(WAPP_PLATFORM_WINDOWS)
+#include "mem_utils_win.h"
+#elif defined(WAPP_PLATFORM_POSIX)
+#include "mem_utils_posix.h"
+#else
+#error "Unrecognised platform"
+#endif
+
+void *wapp_mem_util_align_forward(void *ptr, u64 alignment);
+void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+void wapp_mem_util_free(void *ptr, u64 size);
+
+external void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type);
+external void mem_util_free(void *ptr, u64 size);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
+#endif // !MEM_UTILS_H
--- a/src/os/mem/mem_utils_ops.h
+++ b/src/os/mem/mem_utils_ops.h
@@ -1,13 +1,9 @@
-// vim:fileencoding=utf-8:foldmethod=marker
+#ifndef MEM_UTILS_OPS_H
+#define MEM_UTILS_OPS_H

-#ifndef MEM_OS_OPS_H
-#define MEM_OS_OPS_H
-
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 typedef enum mem_access {
  WAPP_MEM_ACCESS_NONE,
@@ -23,8 +19,8 @@ typedef enum mem_init_type {
  WAPP_MEM_INIT_INITIALISED,
 } MemInitType;

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

-#endif // !MEM_OS_OPS_H
+#endif // !MEM_UTILS_OPS_H
--- a/src/os/mem/posix/mem_utils_posix.c
+++ b/src/os/mem/posix/mem_utils_posix.c
@@ -1,15 +1,13 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "aliases.h"
+#include "platform.h"

 #ifdef WAPP_PLATFORM_POSIX

-#include "mem_os_posix.h"
-#include "../mem_os_ops.h"
+#include "mem_utils_ops.h"
+#include "mem_utils_posix.h"
 #include <sys/mman.h>

-wapp_intern const i32 access_types[] = {
+internal const i32 access_types[] = {
    [WAPP_MEM_ACCESS_NONE]            = PROT_NONE,
    [WAPP_MEM_ACCESS_READ_ONLY]       = PROT_READ,
    [WAPP_MEM_ACCESS_EXEC_ONLY]       = PROT_EXEC,
@@ -19,7 +17,6 @@ wapp_intern const i32 access_types[] = {
 };

 void *mem_util_allocate(void *addr, u64 size, MemAccess access, MemAllocFlags flags, MemInitType type) {
-  (void)type;
  i32 alloc_flags = flags | MAP_ANON | MAP_PRIVATE;

 #if defined(WAPP_PLATFORM_LINUX) || defined(WAPP_PLATFORM_GNU) || defined(WAPP_PLATFORM_NET_BSD)
--- a/src/os/mem/posix/mem_utils_posix.h
+++ b/src/os/mem/posix/mem_utils_posix.h
@@ -1,13 +1,11 @@
-// vim:fileencoding=utf-8:foldmethod=marker
+#ifndef MEM_UTILS_POSIX_H
+#define MEM_UTILS_POSIX_H

-#ifndef MEM_OS_POSIX_H
-#define MEM_OS_POSIX_H
+#include "platform.h"

-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus

 #ifdef WAPP_PLATFORM_POSIX

@@ -28,8 +26,8 @@ typedef enum mem_alloc_flags {

 #endif // !WAPP_PLATFORM_POSIX

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus

-#endif // !MEM_OS_POSIX_H
+#endif // !MEM_UTILS_POSIX_H
--- a/src/os/mem/win/mem_utils_win.c
+++ b/src/os/mem/win/mem_utils_win.c
@@ -1,18 +1,16 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "aliases.h"
+#include "platform.h"

 #ifdef WAPP_PLATFORM_WINDOWS

-#include "mem_os_win.h"
-#include "../mem_os_ops.h"
+#include "mem_utils_ops.h"
+#include "mem_utils_win.h"

 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <memoryapi.h>

-wapp_intern const i32 access_types[] = {
+internal const i32 access_types[] = {
    [WAPP_MEM_ACCESS_NONE]            = PAGE_NOACCESS,
    [WAPP_MEM_ACCESS_READ_ONLY]       = PAGE_READONLY,
    [WAPP_MEM_ACCESS_EXEC_ONLY]       = PAGE_EXECUTE,
--- a/src/os/mem/win/mem_utils_win.h
+++ b/src/os/mem/win/mem_utils_win.h
@@ -1,13 +1,11 @@
-// vim:fileencoding=utf-8:foldmethod=marker
+#ifndef MEM_UTILS_WIN_H
+#define MEM_UTILS_WIN_H

-#ifndef MEM_OS_WIN_H
-#define MEM_OS_WIN_H
+#include "platform.h"

-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus

 #ifdef WAPP_PLATFORM_WINDOWS

@@ -22,8 +20,8 @@ typedef enum mem_alloc_flags {

 #endif // !WAPP_PLATFORM_WINDOWS

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // !__cplusplus

-#endif // !MEM_OS_WIN_H
+#endif // !MEM_UTILS_WIN_H
--- a/src/os/shell/commander/commander.c
+++ b/src/os/shell/commander/commander.c
@@ -1,15 +1,8 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "commander.h"
-#include "commander_output.h"
-#include "../utils/shell_utils.h"
-#include "../../allocators/arena/mem_arena_allocator.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/misc/misc_utils.h"
-#include "../../../base/dbl_list/dbl_list.h"
-#include "../../../base/mem/allocator/mem_allocator.h"
-#include "../../../base/strings/str8/str8.h"
+#include "aliases.h"
+#include "shell_utils.h"
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,44 +10,62 @@
 #define CMD_BUF_LEN 8192
 #define OUT_BUF_LEN 4096

-wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf);
-wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf);
+internal inline CMDError build_command_from_args(char *cmd, u64 buf_len, va_list args);
+internal inline CMDResult execute_command(const char *cmd, CMDOutHandling out_handling, char *out_buf,
+                                          u64 buf_size);
+internal inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, char *out_buf,
+                                            u64 buf_size);

-CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd) {
-  if (!cmd) {
-    return CMD_NO_EXIT(SHELL_ERR_INVALID_ARGS);
+CMDResult run_command(CMDOutHandling out_handling, char *out_buf, u64 buf_size, ...) {
+  va_list args;
+  va_start(args, buf_size);
+
+  char cmd[CMD_BUF_LEN] = {0};
+  CMDError err = build_command_from_args(cmd, CMD_BUF_LEN, args);
+  if (err > SHELL_ERR_NO_ERROR) {
+    va_end(args);
+    return CMD_NO_EXIT(err);
  }

-  Allocator arena = wapp_mem_arena_allocator_init(KB(500));
+  va_end(args);

-  Str8 *cmd_str = wapp_str8_join(&arena, cmd, &wapp_str8_lit_ro(" "));
-  if (!cmd_str) {
-    wapp_mem_arena_allocator_destroy(&arena);
-    return CMD_NO_EXIT(SHELL_ERR_ALLOCATION_FAIL);
-  }
-
-  // Redirect output
-  cmd_str = wapp_str8_alloc_concat(&arena, cmd_str, &wapp_str8_lit_ro(" 2>&1"));
-
-  CMDResult output = execute_command(cmd_str, out_handling, out_buf);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return output;
+  return execute_command(cmd, out_handling, out_buf, buf_size);
 }

-wapp_intern inline CMDResult execute_command(Str8RO *cmd, CMDOutHandling out_handling, Str8 *out_buf) {
-  char cmd_buf[CMD_BUF_LEN] = {0};
-  wapp_str8_copy_to_cstr(cmd_buf, cmd, CMD_BUF_LEN);
+internal inline CMDError build_command_from_args(char *cmd, u64 buf_len,
+                                                 va_list args) {
+  u64 size = 0;
+  u64 arg_len = 0;

-  FILE *fp = wapp_shell_utils_popen(cmd_buf, "r");
+  const char *arg = va_arg(args, const char *);
+  while (arg) {
+    arg_len = strlen(arg);
+    if (arg_len >= buf_len - size) {
+      return SHELL_ERR_CMD_BUF_FULL;
+    }
+
+    strcat(cmd, arg);
+    cmd[size + arg_len] = ' ';
+
+    size += arg_len + 1;
+
+    arg = va_arg(args, const char *);
+  }
+
+  return SHELL_ERR_NO_ERROR;
+}
+
+internal inline CMDResult execute_command(const char *cmd,
+                                          CMDOutHandling out_handling,
+                                          char *out_buf, u64 buf_size) {
+  FILE *fp = wapp_shell_utils_popen(cmd, "r");
  if (!fp) {
    return CMD_NO_EXIT(SHELL_ERR_PROC_START_FAIL);
  }

  CMDResult output;

-  CMDError err = get_command_output(fp, out_handling, out_buf);
+  CMDError err = get_command_output(fp, out_handling, out_buf, buf_size);
  if (err > SHELL_ERR_NO_ERROR) {
    output = CMD_NO_EXIT(err);
    goto EXECUTE_COMMAND_CLOSE;
@@ -83,18 +94,24 @@ EXECUTE_COMMAND_CLOSE:
  return output;
 }

-wapp_intern inline CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
-  Str8 out = wapp_str8_buf(OUT_BUF_LEN);
+internal inline CMDError get_command_output(FILE *fp,
+                                            CMDOutHandling out_handling,
+                                            char *out_buf, u64 buf_size) {
+  char out[OUT_BUF_LEN] = {0};
+  u64 max_out_length = OUT_BUF_LEN - 1;

-  out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
-  if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
-    if (out.size >= out_buf->capacity) {
-      return SHELL_ERR_OUT_BUF_FULL;
+  u64 buf_filled = 0;
+  while (fgets(out, (i32)max_out_length, fp)) {
+    if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
+      buf_filled += strlen(out);
+      if (buf_filled >= buf_size) {
+        return SHELL_ERR_OUT_BUF_FULL;
+      }
+
+      strcat(out_buf, out);
+    } else if (out_handling == SHELL_OUTPUT_PRINT) {
+      printf("%s", out);
    }
-
-    wapp_str8_concat_capped(out_buf, &out);
-  } else if (out_handling == SHELL_OUTPUT_PRINT) {
-    printf(WAPP_STR8_SPEC, wapp_str8_varg(out));
  }

  return SHELL_ERR_NO_ERROR;
--- a/src/os/shell/commander/commander.h
+++ b/src/os/shell/commander/commander.h
@@ -1,27 +1,26 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef COMMANDER_H
 #define COMMANDER_H

+#include "aliases.h"
 #include "commander_output.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-#include "../../../base/strings/str8/str8.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #define CMD_NO_EXIT(ERR) ((CMDResult){.exited = false, .exit_code = EXIT_FAILURE, .error = ERR})
+#define wapp_shell_commander_execute(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, ...)    \
+  run_command(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, __VA_ARGS__, "2>&1", NULL)

-CMDResult wapp_shell_commander_execute(CMDOutHandling out_handling, Str8 *out_buf, const Str8List *cmd);
+CMDResult run_command(CMDOutHandling out_handling, char *out_buf, u64 buf_size, ...);

-wapp_extern CMDError get_output_status(FILE *fp, i32 *status_out);
+external CMDError get_output_status(FILE *fp, i32 *status_out);

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !COMMANDER_H
--- a/src/os/shell/commander/commander_output.h
+++ b/src/os/shell/commander/commander_output.h
@@ -1,14 +1,13 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef COMMANDER_OUTPUT_H
 #define COMMANDER_OUTPUT_H

-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "aliases.h"
+#include "platform.h"
+#include <stdbool.h>

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 typedef enum {
  SHELL_OUTPUT_DISCARD,
@@ -18,8 +17,7 @@ typedef enum {

 typedef enum {
  SHELL_ERR_NO_ERROR,
-  SHELL_ERR_INVALID_ARGS,
-  SHELL_ERR_ALLOCATION_FAIL,
+  SHELL_ERR_CMD_BUF_FULL,
  SHELL_ERR_PROC_START_FAIL,
  SHELL_ERR_OUT_BUF_FULL,
  SHELL_ERR_PROC_EXIT_FAIL,
@@ -29,16 +27,16 @@ typedef struct commander_result CMDResult;
 struct commander_result {
  i32 exit_code;
  CMDError error;
-  b8 exited;
+  bool exited;

 #ifdef WAPP_PLATFORM_WINDOWS
-  #include "../../../../common/misc/misc_utils.h"
-  wapp_misc_utils_padding_size(sizeof(b8) + sizeof(i32) + sizeof(CMDError));
+  #include "misc_utils.h"
+  wapp_misc_utils_padding_size(sizeof(bool) + sizeof(i32) + sizeof(CMDError));
 #endif // !WAPP_PLATFORM_WINDOWS
 };

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !COMMANDER_OUTPUT_H
--- a/src/os/shell/commander/posix/commander_posix.c
+++ b/src/os/shell/commander/posix/commander_posix.c
@@ -1,12 +1,10 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "aliases.h"
+#include "platform.h"

 #ifdef WAPP_PLATFORM_POSIX

-#include "../commander_output.h"
-#include "../../utils/shell_utils.h"
+#include "commander_output.h"
+#include "shell_utils.h"
 #include <stdio.h>
 #include <stdlib.h>

--- a/src/os/shell/commander/win/commander_win.c
+++ b/src/os/shell/commander/win/commander_win.c
@@ -1,12 +1,10 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "aliases.h"
+#include "platform.h"

 #ifdef WAPP_PLATFORM_WINDOWS

-#include "../commander_output.h"
-#include "../../utils/shell_utils.h"
+#include "commander_output.h"
+#include "shell_utils.h"
 #include <stdio.h>

 CMDError get_output_status(FILE *fp, i32 *status_out) {
--- a/src/os/shell/termcolour/posix/termcolour_posix.c
+++ b/src/os/shell/termcolour/posix/termcolour_posix.c
@@ -1,36 +1,33 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-#include "../../../../base/strings/str8/str8.h"
+#include "aliases.h"
+#include "platform.h"

 #ifdef WAPP_PLATFORM_POSIX

-#include "../terminal_colours.h"
+#include "terminal_colours.h"
 #include <stdio.h>

-wapp_intern Str8RO colours[COUNT_TERM_COLOUR] = {
-    [WAPP_TERM_COLOUR_FG_BLACK]      = wapp_str8_lit_ro_initialiser_list("\033[30m"),
-    [WAPP_TERM_COLOUR_FG_RED]        = wapp_str8_lit_ro_initialiser_list("\033[31m"),
-    [WAPP_TERM_COLOUR_FG_GREEN]      = wapp_str8_lit_ro_initialiser_list("\033[32m"),
-    [WAPP_TERM_COLOUR_FG_BLUE]       = wapp_str8_lit_ro_initialiser_list("\033[34m"),
-    [WAPP_TERM_COLOUR_FG_CYAN]       = wapp_str8_lit_ro_initialiser_list("\033[36m"),
-    [WAPP_TERM_COLOUR_FG_MAGENTA]    = wapp_str8_lit_ro_initialiser_list("\033[35m"),
-    [WAPP_TERM_COLOUR_FG_YELLOW]     = wapp_str8_lit_ro_initialiser_list("\033[33m"),
-    [WAPP_TERM_COLOUR_FG_WHITE]      = wapp_str8_lit_ro_initialiser_list("\033[37m"),
-    [WAPP_TERM_COLOUR_FG_BR_BLACK]   = wapp_str8_lit_ro_initialiser_list("\033[90m"),
-    [WAPP_TERM_COLOUR_FG_BR_RED]     = wapp_str8_lit_ro_initialiser_list("\033[91m"),
-    [WAPP_TERM_COLOUR_FG_BR_GREEN]   = wapp_str8_lit_ro_initialiser_list("\033[92m"),
-    [WAPP_TERM_COLOUR_FG_BR_BLUE]    = wapp_str8_lit_ro_initialiser_list("\033[94m"),
-    [WAPP_TERM_COLOUR_FG_BR_CYAN]    = wapp_str8_lit_ro_initialiser_list("\033[96m"),
-    [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = wapp_str8_lit_ro_initialiser_list("\033[95m"),
-    [WAPP_TERM_COLOUR_FG_BR_YELLOW]  = wapp_str8_lit_ro_initialiser_list("\033[93m"),
-    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = wapp_str8_lit_ro_initialiser_list("\033[97m"),
-    [WAPP_TERM_COLOUR_CLEAR]         = wapp_str8_lit_ro_initialiser_list("\033[0m"),
+internal const char *colours[COUNT_TERM_COLOUR] = {
+    [WAPP_TERM_COLOUR_FG_BLACK]      = "\033[30m",
+    [WAPP_TERM_COLOUR_FG_RED]        = "\033[31m",
+    [WAPP_TERM_COLOUR_FG_GREEN]      = "\033[32m",
+    [WAPP_TERM_COLOUR_FG_BLUE]       = "\033[34m",
+    [WAPP_TERM_COLOUR_FG_CYAN]       = "\033[36m",
+    [WAPP_TERM_COLOUR_FG_MAGENTA]    = "\033[35m",
+    [WAPP_TERM_COLOUR_FG_YELLOW]     = "\033[33m",
+    [WAPP_TERM_COLOUR_FG_WHITE]      = "\033[37m",
+    [WAPP_TERM_COLOUR_FG_BR_BLACK]   = "\033[90m",
+    [WAPP_TERM_COLOUR_FG_BR_RED]     = "\033[91m",
+    [WAPP_TERM_COLOUR_FG_BR_GREEN]   = "\033[92m",
+    [WAPP_TERM_COLOUR_FG_BR_BLUE]    = "\033[94m",
+    [WAPP_TERM_COLOUR_FG_BR_CYAN]    = "\033[96m",
+    [WAPP_TERM_COLOUR_FG_BR_MAGENTA] = "\033[95m",
+    [WAPP_TERM_COLOUR_FG_BR_YELLOW]  = "\033[93m",
+    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = "\033[97m",
+    [WAPP_TERM_COLOUR_CLEAR]         = "\033[0m",
 };

-void print_coloured_text(Str8RO *text, TerminalColour colour) {
-  printf(WAPP_STR8_SPEC WAPP_STR8_SPEC, wapp_str8_varg(colours[colour]), wapp_str8_varg((*text)));
+void print_coloured_text(const char *text, TerminalColour colour) {
+  printf("%s%s", colours[colour], text);
 }

 #endif // !WAPP_PLATFORM_POSIX
--- a/src/os/shell/termcolour/termcolour.c
+++ b/src/os/shell/termcolour/termcolour.c
@@ -1,10 +1,7 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "termcolour.h"
 #include "terminal_colours.h"
-#include "../../../base/strings/str8/str8.h"

-void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
+void wapp_shell_termcolour_print_text(const char *text, TerminalColour colour) {
  if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
    return;
  }
@@ -13,6 +10,5 @@ void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
 }

 void wapp_shell_termcolour_clear_colour(void) {
-  Str8RO empty = wapp_str8_lit_ro("");
-  print_coloured_text(&empty, WAPP_TERM_COLOUR_CLEAR);
+  print_coloured_text("", WAPP_TERM_COLOUR_CLEAR);
 }
--- a/src/os/shell/termcolour/termcolour.h
+++ b/src/os/shell/termcolour/termcolour.h
@@ -1,24 +1,20 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef TERM_COLOUR_H
 #define TERM_COLOUR_H

+#include "aliases.h"
 #include "terminal_colours.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-#include "../../../base/strings/str8/str8.h"

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

-void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour);
+void wapp_shell_termcolour_print_text(const char *text, TerminalColour colour);
 void wapp_shell_termcolour_clear_colour(void);

-wapp_extern void print_coloured_text(Str8RO *text, TerminalColour colour);
+external void print_coloured_text(const char *text, TerminalColour colour);

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !TERM_COLOUR_H
--- a/src/os/shell/termcolour/terminal_colours.h
+++ b/src/os/shell/termcolour/terminal_colours.h
@@ -1,14 +1,9 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef TERMINAL_COLOURS_H
 #define TERMINAL_COLOURS_H

-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 typedef enum {
  WAPP_TERM_COLOUR_FG_BLACK,
@@ -32,8 +27,8 @@ typedef enum {
  COUNT_TERM_COLOUR,
 } TerminalColour;

-#ifdef WAPP_PLATFORM_CPP
+#ifdef __cplusplus
 END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
+#endif // __cplusplus

 #endif // !TERMINAL_COLOURS_H
--- a/src/os/shell/termcolour/win/termcolour_win.c
+++ b/src/os/shell/termcolour/win/termcolour_win.c
@@ -1,13 +1,10 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-#include "../../../../base/strings/str8/str8.h"
+#include "aliases.h"
+#include "platform.h"

 #ifdef WAPP_PLATFORM_WINDOWS

-#include "../terminal_colours.h"
-#include "../../../../../common/misc/misc_utils.h"
+#include "misc_utils.h"
+#include "terminal_colours.h"
 #include <stdio.h>

 #define WIN32_LEAN_AND_MEAN
@@ -22,9 +19,9 @@ struct termcolour_data {
  wapp_misc_utils_padding_size(sizeof(HANDLE) + sizeof(WORD) + sizeof(WORD));
 };

-wapp_intern void init_data(TermcolourData *data);
+internal void init_data(TermcolourData *data);

-wapp_intern WORD colours[COUNT_TERM_COLOUR] = {
+internal WORD colours[COUNT_TERM_COLOUR] = {
    [WAPP_TERM_COLOUR_FG_BLACK]      = 0,
    [WAPP_TERM_COLOUR_FG_RED]        = FOREGROUND_RED,
    [WAPP_TERM_COLOUR_FG_GREEN]      = FOREGROUND_GREEN,
@@ -43,8 +40,8 @@ wapp_intern WORD colours[COUNT_TERM_COLOUR] = {
    [WAPP_TERM_COLOUR_FG_BR_WHITE]   = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY,
 };

-void print_coloured_text(Str8RO *text, TerminalColour colour) {
-  wapp_persist TermcolourData data = {0};
+void print_coloured_text(const char *text, TerminalColour colour) {
+  persistent TermcolourData data = {0};
  if (data.handle == 0) {
    init_data(&data);
  }
@@ -56,10 +53,10 @@ void print_coloured_text(Str8RO *text, TerminalColour colour) {
  }

  SetConsoleTextAttribute(data.handle, data.current_colour);
-  printf(WAPP_STR8_SPEC, wapp_str8_varg((*text)));
+  printf("%s", text);
 }

-wapp_intern void init_data(TermcolourData *data) {
+internal void init_data(TermcolourData *data) {
  // create handle
  data->handle = GetStdHandle(STD_OUTPUT_HANDLE);

--- a/src/os/shell/utils/shell_utils.h
+++ b/src/os/shell/utils/shell_utils.h
@@ -1,16 +1,9 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #ifndef SHELL_UTILS_H
 #define SHELL_UTILS_H

-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "platform.h"
 #include <stdio.h>

-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
 #ifdef WAPP_PLATFORM_WINDOWS
  #define wapp_shell_utils_popen  _popen
  #define wapp_shell_utils_pclose _pclose
@@ -19,8 +12,4 @@ BEGIN_C_LINKAGE
  #define wapp_shell_utils_pclose pclose
 #endif /* ifdef WAPP_PLATFORM_WINDOWS */

-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
 #endif // !SHELL_UTILS_H
--- a/src/os/wapp_os.c
+++ b/src/os/wapp_os.c
@@ -1,22 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_OS_C
-#define WAPP_OS_C
-
-#include "wapp_os.h"
-#include "file/file.c"
-#include "shell/termcolour/posix/termcolour_posix.c"
-#include "shell/termcolour/win/termcolour_win.c"
-#include "shell/termcolour/termcolour.c"
-#include "shell/commander/posix/commander_posix.c"
-#include "shell/commander/win/commander_win.c"
-#include "shell/commander/commander.c"
-#include "cpath/cpath.c"
-#include "allocators/arena/mem_arena.c"
-#include "allocators/arena/mem_arena_allocator.c"
-#include "mem/posix/mem_os_posix.c"
-#include "mem/win/mem_os_win.c"
-#include "mem/mem_os.c"
-#include "../base/wapp_base.c"
-
-#endif // !WAPP_OS_C
--- a/src/os/wapp_os.h
+++ b/src/os/wapp_os.h
@@ -1,22 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_CORE_H
-#define WAPP_CORE_H
-
-#include "file/file.h"
-#include "shell/termcolour/termcolour.h"
-#include "shell/termcolour/terminal_colours.h"
-#include "shell/commander/commander.h"
-#include "shell/commander/commander_output.h"
-#include "shell/utils/shell_utils.h"
-#include "cpath/cpath.h"
-#include "allocators/arena/mem_arena.h"
-#include "allocators/arena/mem_arena_allocator.h"
-#include "mem/posix/mem_os_posix.h"
-#include "mem/win/mem_os_win.h"
-#include "mem/mem_os_ops.h"
-#include "mem/mem_os.h"
-#include "../common/wapp_common.h"
-#include "../base/wapp_base.h"
-
-#endif // !WAPP_CORE_H
--- a/src/prng/wapp_prng.c
+++ b/src/prng/wapp_prng.c
@@ -1,8 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_PRNG_C
-#define WAPP_PRNG_C
-
-#include "xorshift/xorshift.c"
-
-#endif // !WAPP_PRNG_C
--- a/src/prng/wapp_prng.h
+++ b/src/prng/wapp_prng.h
@@ -1,9 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_PRNG_H
-#define WAPP_PRNG_H
-
-#include "xorshift/xorshift.h"
-#include "../common/wapp_common.h"
-
-#endif // !WAPP_PRNG_H
--- a/src/prng/xorshift/xorshift.c
+++ b/src/prng/xorshift/xorshift.c
@@ -1,135 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "xorshift.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/assert/assert.h"
-#include "../../common/platform/platform.h"
-#include <stdlib.h>
-#include <time.h>
-
-typedef struct split_mix_64_state SplitMix64State;
-struct split_mix_64_state {
-  u64 seed;
-};
-
-wapp_intern u64 rol64(u64 x, u64 bits);
-wapp_intern u64 split_mix_64(SplitMix64State *state);
-wapp_intern void seed_os_generator(void);
-wapp_intern u64 generate_random_number(void);
-
-XOR256State wapp_prng_xorshift_init_state(void) {
-  wapp_persist b8 seeded = false;
-  if (!seeded) {
-    seeded = true;
-    seed_os_generator();
-  }
-
-  SplitMix64State sm64 = {.seed = generate_random_number()};
-
-  return (XOR256State){
-      .x = split_mix_64(&sm64),
-      .y = split_mix_64(&sm64),
-      .z = split_mix_64(&sm64),
-      .w = split_mix_64(&sm64),
-  };
-}
-
-u64 wapp_prng_xorshift_256(XOR256State *state) {
-  u64 t = state->x ^ (state->x << 11);
-
-  state->x = state->y;
-  state->y = state->z;
-  state->z = state->w;
-  state->w = (state->w ^ (state->w >> 19)) ^ (t ^ (t >> 8));
-
-  return state->w;
-}
-
-u64 wapp_prng_xorshift_256ss(XOR256State *state) {
-  const u64 result = rol64(state->z * 5, 7) * 9;
-  const u64 t = state->z << 17;
-
-  state->y ^= state->w;
-  state->x ^= state->z;
-  state->z ^= state->y;
-  state->w ^= state->x;
-
-  state->y ^= t;
-  state->x = rol64(state->x, 45);
-
-  return result;
-}
-
-u64 wapp_prng_xorshift_256p(XOR256State *state) {
-  const u64 result = state->w + state->x;
-  const u64 t = state->z << 17;
-
-  state->y ^= state->w;
-  state->x ^= state->z;
-  state->z ^= state->y;
-  state->w ^= state->x;
-
-  state->y ^= t;
-  state->x = rol64(state->x, 45);
-
-  return result;
-}
-
-wapp_intern u64 rol64(u64 x, u64 bits) {
-  return (x << bits) | (x >> (64 - bits));
-}
-
-wapp_intern u64 split_mix_64(SplitMix64State *state) {
-  state->seed += 0x9E3779B97f4A7C15;
-
-  u64 result = state->seed;
-  result = (result ^ (result >> 30)) * 0xBF58476D1CE4E5B9;
-  result = (result ^ (result >> 27)) * 0x94D049BB133111EB;
-
-  return result ^ (result >> 31);
-}
-
-#if defined(WAPP_PLATFORM_C) && WAPP_PLATFORM_C_VERSION >= WAPP_PLATFORM_C11_VERSION
-#ifdef WAPP_PLATFORM_POSIX
-wapp_intern void seed_os_generator(void) {
-    struct timespec ts = {0};
-    int result = clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
-    wapp_runtime_assert(result == 0, "Invalid seed value");
-
-    srand48(ts.tv_nsec);
-}
-
-wapp_intern u64 generate_random_number(void) {
-  return lrand48();
-}
-#else
-wapp_intern void seed_os_generator(void) {
-    struct timespec ts = {0};
-    int result = timespec_get(&ts, TIME_UTC);
-    wapp_runtime_assert(result != 0, "Invalid seed value");
-
-    srand(ts.tv_nsec);
-}
-
-wapp_intern u64 generate_random_number(void) {
-  i32 n1 = rand();
-  i32 n2 = rand();
-
-  return (((u64)n1) << 32 | (u64)n2);
-}
-#endif // !WAPP_PLATFORM_POSIX
-#else
-wapp_intern void seed_os_generator(void) {
-    time_t result = time(NULL);
-    wapp_runtime_assert(result != (time_t)(-1), "Invalid seed value");
-
-    srand(result);
-}
-
-wapp_intern u64 generate_random_number(void) {
-  i32 n1 = rand();
-  i32 n2 = rand();
-
-  return (((u64)n1) << 32 | (u64)n2);
-}
-#endif // !WAPP_PLATFORM_C
--- a/src/prng/xorshift/xorshift.h
+++ b/src/prng/xorshift/xorshift.h
@@ -1,30 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef XORSHIFT_H
-#define XORSHIFT_H
-
-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-typedef struct xor_256_state XOR256State;
-struct xor_256_state {
-  u64 x;
-  u64 y;
-  u64 z;
-  u64 w;
-};
-
-XOR256State wapp_prng_xorshift_init_state(void);
-u64 wapp_prng_xorshift_256(XOR256State *state);
-u64 wapp_prng_xorshift_256ss(XOR256State *state);
-u64 wapp_prng_xorshift_256p(XOR256State *state);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !XORSHIFT_H
--- a/src/testing/tester/tester.c
+++ b/src/testing/tester/tester.c
@@ -1,14 +1,11 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
 #include "tester.h"
-#include "../../common/aliases/aliases.h"
-#include "../../os/shell/termcolour/termcolour.h"
-#include "../../base/strings/str8/str8.h"
+#include "aliases.h"
+#include "termcolour.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>

-wapp_intern void handle_test_result(TestFuncResult result);
+internal void handle_test_result(TestFuncResult result);

 void run_tests(TestFunc *func1, ...) {
  printf("\n");
@@ -32,22 +29,22 @@ void run_tests(TestFunc *func1, ...) {
  printf("\n");
 }

-wapp_intern void handle_test_result(TestFuncResult result) {
+internal void handle_test_result(TestFuncResult result) {
  TerminalColour colour;
-  Str8 result_text = wapp_str8_buf(64);
+  const char *result_text;

  if (result.passed) {
    colour = WAPP_TERM_COLOUR_FG_BR_GREEN;
-    wapp_str8_copy_cstr_capped(&result_text, "PASSED");
+    result_text = "PASSED";
  } else {
    colour = WAPP_TERM_COLOUR_FG_BR_RED;
-    wapp_str8_copy_cstr_capped(&result_text, "FAILED");
+    result_text = "FAILED";
  }

  printf("[");
-  wapp_shell_termcolour_print_text(&result_text, colour);
+  wapp_shell_termcolour_print_text(result_text, colour);
  wapp_shell_termcolour_clear_colour();
-  printf("] " WAPP_STR8_SPEC "\n", wapp_str8_varg(result.name));
+  printf("] %s\n", result.name);

  if (!result.passed) {
    exit(EXIT_FAILURE);
--- a/src/tester/tester.h
+++ b/src/tester/tester.h
@@ -0,0 +1,33 @@
+#ifndef TESTER_H
+#define TESTER_H
+
+#include "misc_utils.h"
+#include "platform.h"
+#include <stdbool.h>
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+#define wapp_tester_result(PASSED) ((TestFuncResult){.name = __func__, .passed = PASSED})
+#define wapp_tester_run_tests(...) run_tests(__VA_ARGS__, NULL)
+
+typedef struct test_func_result TestFuncResult;
+struct test_func_result {
+  const char *name;
+  bool passed;
+
+#ifdef WAPP_PLATFORM_WINDOWS
+  wapp_misc_utils_padding_size(sizeof(const char *) + sizeof(bool));
+#endif // WAPP_PLATFORM_WINDOWS
+};
+
+typedef TestFuncResult(TestFunc)(void);
+
+void run_tests(TestFunc *func1, ...);
+
+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
+#endif // !TESTER_H
--- a/src/testing/tester/tester.h
+++ b/src/testing/tester/tester.h
@@ -1,38 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TESTER_H
-#define TESTER_H
-
-#include "../../common/misc/misc_utils.h"
-#include "../../common/platform/platform.h"
-#include "../../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-
-#define wapp_tester_result(PASSED) (TestFuncResult{wapp_str8_lit_ro(__func__), PASSED})
-#else
-#define wapp_tester_result(PASSED) ((TestFuncResult){.name = wapp_str8_lit_ro(__func__), .passed = PASSED})
-#endif // !WAPP_PLATFORM_CPP
-
-#define wapp_tester_run_tests(...) run_tests(__VA_ARGS__, NULL)
-
-typedef struct test_func_result TestFuncResult;
-struct test_func_result {
-  Str8 name;
-  b8 passed;
-
-#ifdef WAPP_PLATFORM_WINDOWS
-  wapp_misc_utils_padding_size(sizeof(Str8RO) + sizeof(b8));
-#endif // WAPP_PLATFORM_WINDOWS
-};
-
-typedef TestFuncResult(TestFunc)(void);
-
-void run_tests(TestFunc *func1, ...);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !TESTER_H
--- a/src/testing/wapp_testing.c
+++ b/src/testing/wapp_testing.c
@@ -1,10 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_TESTING_C
-#define WAPP_TESTING_C
-
-#include "wapp_testing.h"
-#include "tester/tester.c"
-#include "../os/wapp_os.c"
-
-#endif // !WAPP_TESTING_C
--- a/src/testing/wapp_testing.h
+++ b/src/testing/wapp_testing.h
@@ -1,10 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_TESTING_H
-#define WAPP_TESTING_H
-
-#include "tester/tester.h"
-#include "../common/wapp_common.h"
-#include "../os/wapp_os.h"
-
-#endif // !WAPP_TESTING_H
--- a/src/uuid/uuid.c
+++ b/src/uuid/uuid.c
@@ -1,58 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "uuid.h"
-#include "../common/aliases/aliases.h"
-#include "../common/assert/assert.h"
-#include "../base/strings/str8/str8.h"
-#include "../prng/xorshift/xorshift.h"
-#include <inttypes.h>
-
-#define UUID_STR_FORMAT ("%.8" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.4" PRIx64 "-%.12" PRIx64)
-
-typedef struct uuid4 UUID4;
-struct uuid4 {
-  u64 high;
-  u64 low;
-};
-
-wapp_intern UUID4 generate_uuid4(void);
-wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid);
-
-WUUID *wapp_uuid_init_uuid4(WUUID *uuid) {
-  wapp_debug_assert(uuid != NULL, "`uuid` should not be NULL");
-
-  UUID4 uuid4 = generate_uuid4();
-  uuid4_to_uuid(&uuid4, uuid);
-
-  return uuid;
-}
-
-wapp_intern UUID4 generate_uuid4(void) {
-  wapp_persist XOR256State state = {0};
-  wapp_persist b8 initialised = false;
-
-  if (!initialised) {
-    initialised = true;
-    state       = wapp_prng_xorshift_init_state();
-  }
-
-  UUID4 uuid = (UUID4){
-    .high = wapp_prng_xorshift_256(&state),
-    .low  = wapp_prng_xorshift_256(&state),
-  };
-
-  uuid.high = (uuid.high & 0xffffffffffff0fff) | 0x0000000000004000;
-  uuid.low  = (uuid.low  & 0x3fffffffffffffff) | 0x8000000000000000;
-
-  return uuid;
-}
-
-wapp_intern void uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid) {
-  u64 group1 = uuid4->high >> 32;
-  u64 group2 = (uuid4->high << 32) >> 48;
-  u64 group3 = (uuid4->high << 48) >> 48;
-  u64 group4 = uuid4->low >> 48;
-  u64 group5 = (uuid4->low << 16) >> 16;
-
-  wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, group1, group2, group3, group4, group5);
-}
--- a/src/uuid/uuid.h
+++ b/src/uuid/uuid.h
@@ -1,37 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef UUID_H
-#define UUID_H
-
-#include "../common/aliases/aliases.h"
-#include "../common/platform/platform.h"
-#include "../base/strings/str8/str8.h"
-
-#ifdef WAPP_PLATFORM_CPP
-BEGIN_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#define UUID_BUF_LENGTH 48
-#define WAPP_UUID_SPEC WAPP_STR8_SPEC
-#define wapp_uuid_varg(WUUID) wapp_str8_varg((WUUID).uuid)
-
-typedef struct wapp_uuid WUUID;
-struct wapp_uuid {
-  Str8 uuid;
-};
-
-#define wapp_uuid_gen_uuid4() *(wapp_uuid_init_uuid4(&wapp_uuid_create()))
-
-/* Low level UUID API */
-
-#define wapp_uuid_create() ((WUUID){.uuid = wapp_str8_buf(UUID_BUF_LENGTH)})
-
-// Just returns the same pointer that was passed in with the UUID initialised.
-// Fails when passed a NULL pointer.
-WUUID *wapp_uuid_init_uuid4(WUUID *uuid);
-
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-#endif // !WAPP_PLATFORM_CPP
-
-#endif // !UUID_H
--- a/src/uuid/wapp_uuid.c
+++ b/src/uuid/wapp_uuid.c
@@ -1,10 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_UUID_C
-#define WAPP_UUID_C
-
-#include "uuid.c"
-#include "../base/wapp_base.c"
-#include "../prng/wapp_prng.c"
-
-#endif // !WAPP_UUID_C
--- a/src/uuid/wapp_uuid.h
+++ b/src/uuid/wapp_uuid.h
@@ -1,11 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_UUID_H
-#define WAPP_UUID_H
-
-#include "uuid.h"
-#include "../common/wapp_common.h"
-#include "../base/wapp_base.h"
-#include "../prng/wapp_prng.h"
-
-#endif // !WAPP_UUID_H
--- a/src/wapp.c
+++ b/src/wapp.c
@@ -1,13 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_C
-#define WAPP_C
-
-#include "wapp.h"
-#include "base/wapp_base.c"
-#include "os/wapp_os.c"
-#include "prng/wapp_prng.c"
-#include "uuid/uuid.c"
-#include "testing/wapp_testing.c"
-
-#endif // !WAPP_C
--- a/src/wapp.h
+++ b/src/wapp.h
@@ -1,13 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_H
-#define WAPP_H
-
-#include "common/wapp_common.h"
-#include "base/wapp_base.h"
-#include "os/wapp_os.h"
-#include "prng/wapp_prng.h"
-#include "uuid/wapp_uuid.h"
-#include "testing/wapp_testing.h"
-
-#endif // !WAPP_H
--- a/tests/allocator/test_allocator.c
+++ b/tests/allocator/test_allocator.c
@@ -1,10 +1,30 @@
 #include "test_allocator.h"
-#include "wapp.h"
+#include "libc/mem_libc_allocator.h"
+#include "mem_allocator.h"
+#include "mem_arena_allocator.h"
+#include "tester.h"
+#include <stdbool.h>
 #include <stdlib.h>

+TestFuncResult test_libc_allocator(void) {
+  Allocator allocator = wapp_mem_libc_allocator();
+  bool result         = allocator.obj == NULL && allocator.alloc != NULL &&
+                        allocator.alloc_aligned == NULL && allocator.realloc != NULL &&
+                        allocator.realloc_aligned == NULL && allocator.free != NULL;
+  void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
+  result              = result && (ptr != NULL);
+
+  if (ptr != NULL) {
+    wapp_mem_allocator_free(&allocator, &ptr);
+    result = result && (ptr == NULL);
+  }
+
+  return wapp_tester_result(result);
+}
+
 TestFuncResult test_arena_allocator(void) {
  Allocator allocator = wapp_mem_arena_allocator_init(4096);
-  b8 result          = allocator.obj != NULL && allocator.alloc != NULL &&
+  bool result         = allocator.obj != NULL && allocator.alloc != NULL &&
                        allocator.alloc_aligned != NULL &&
                        allocator.realloc != NULL && allocator.realloc_aligned != NULL &&
                        allocator.free == NULL;
--- a/tests/allocator/test_allocator.cc
+++ b/tests/allocator/test_allocator.cc
@@ -1,17 +0,0 @@
-#include "test_allocator.h"
-#include "wapp.h"
-#include <stdlib.h>
-
-TestFuncResult test_arena_allocator(void) {
-  Allocator allocator = wapp_mem_arena_allocator_init(4096);
-  b8 result          = allocator.obj != nullptr && allocator.alloc != nullptr &&
-                        allocator.alloc_aligned != nullptr &&
-                        allocator.realloc != nullptr && allocator.realloc_aligned != nullptr &&
-                        allocator.free == nullptr;
-  void *ptr           = wapp_mem_allocator_alloc(&allocator, 20);
-  result              = result && (ptr != nullptr);
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
--- a/tests/allocator/test_allocator.h
+++ b/tests/allocator/test_allocator.h
@@ -1,8 +1,17 @@
 #ifndef TEST_ALLOCATOR_H
 #define TEST_ALLOCATOR_H

-#include "wapp.h"
+#include "tester.h"

+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus
+
+TestFuncResult test_libc_allocator(void);
 TestFuncResult test_arena_allocator(void);

+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
 #endif // !TEST_ALLOCATOR_H
--- a/tests/arena/test_arena.c
+++ b/tests/arena/test_arena.c
@@ -1,15 +1,19 @@
 #include "test_arena.h"
-#include "wapp.h"
+#include "aliases.h"
+#include "mem_arena.h"
+#include "misc_utils.h"
+#include "tester.h"
+#include <stdbool.h>
 #include <stdlib.h>

 #define ARENA_CAPACITY KB(16)

-wapp_intern Arena *arena = NULL;
-wapp_intern i32 count    = 20;
-wapp_intern i32 *array   = NULL;
+internal Arena *arena = NULL;
+internal i32 count    = 20;
+internal i32 *array   = NULL;

 TestFuncResult test_arena_init(void) {
-  b8 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
+  bool result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);

  return wapp_tester_result(result);
 }
@@ -17,7 +21,7 @@ TestFuncResult test_arena_init(void) {
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
  Arena *large_arena = NULL;
  u64 capacity       = GB(512);
-  b8 result         = wapp_mem_arena_init(&large_arena, capacity);
+  bool result        = wapp_mem_arena_init(&large_arena, capacity);
  if (result) {
    wapp_mem_arena_destroy(&large_arena);
  }
@@ -27,7 +31,7 @@ TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {

 TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
  array       = wapp_mem_arena_alloc(arena, count * sizeof(i32));
-  b8 result  = array != NULL;
+  bool result = array != NULL;

  for (i32 i = 0; i < count; ++i) {
    array[i] = i * 10;
@@ -38,7 +42,7 @@ TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {

 TestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
  u8 *bytes   = wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
-  b8 result  = bytes == NULL;
+  bool result = bytes == NULL;

  return wapp_tester_result(result);
 }
@@ -91,7 +95,7 @@ TestFuncResult test_arena_realloc_smaller_size(void) {

 TestFuncResult test_arena_clear(void) {
  wapp_mem_arena_clear(arena);
-  b8 result = true;
+  bool result = true;

  for (i32 i = 0; i < count; ++i) {
    if (array[i] != 0) {
@@ -105,7 +109,7 @@ TestFuncResult test_arena_clear(void) {

 TestFuncResult test_arena_destroy(void) {
  wapp_mem_arena_destroy(&arena);
-  b8 result = arena == NULL;
+  bool result = arena == NULL;

  return wapp_tester_result(result);
 }
--- a/tests/arena/test_arena.cc
+++ b/tests/arena/test_arena.cc
@@ -1,111 +0,0 @@
-#include "test_arena.h"
-#include "wapp.h"
-#include <stdlib.h>
-
-#define ARENA_CAPACITY KB(16)
-
-wapp_intern Arena *arena = nullptr;
-wapp_intern i32 count    = 20;
-wapp_intern i32 *array   = nullptr;
-
-TestFuncResult test_arena_init(void) {
-  b8 result = wapp_mem_arena_init(&arena, ARENA_CAPACITY);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
-  Arena *large_arena = nullptr;
-  u64 capacity       = GB(512);
-  b8 result         = wapp_mem_arena_init(&large_arena, capacity);
-  if (result) {
-    wapp_mem_arena_destroy(&large_arena);
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_alloc_succeeds_when_within_capacity(void) {
-  array       = (i32 *)wapp_mem_arena_alloc(arena, count * sizeof(i32));
-  b8 result  = array != nullptr;
-
-  for (i32 i = 0; i < count; ++i) {
-    array[i] = i * 10;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_alloc_fails_when_over_capacity(void) {
-  u8 *bytes   = (u8 *)wapp_mem_arena_alloc(arena, ARENA_CAPACITY * 2);
-  b8 result  = bytes == nullptr;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_realloc_bigger_size(void) {
-  u64 old_count = 10;
-  u64 new_count = 20;
-  i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
-
-  for (u64 i = 0; i < old_count; ++i) {
-    bytes[i] = (i32)i;
-  }
-
-  i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
-  if (!new_bytes) {
-    return wapp_tester_result(false);
-  }
-
-  for (u64 i = 0; i < new_count; ++i) {
-    if (i < old_count && new_bytes[i] != bytes[i]) {
-      return wapp_tester_result(false);
-    }
-  }
-
-  return wapp_tester_result(true);
-}
-
-TestFuncResult test_arena_realloc_smaller_size(void) {
-  u64 old_count = 10;
-  u64 new_count = 5;
-  i32 *bytes    = (i32 *)wapp_mem_arena_alloc(arena, old_count * sizeof(i32));
-
-  for (u64 i = 0; i < old_count; ++i) {
-    bytes[i] = (i32)i;
-  }
-
-  i32 *new_bytes = (i32 *)wapp_mem_arena_realloc(arena, bytes, old_count * sizeof(i32), new_count * sizeof(i32));
-  if (!new_bytes) {
-    return wapp_tester_result(false);
-  }
-
-  for (u64 i = 0; i < new_count; ++i) {
-    if (i < new_count && new_bytes[i] != bytes[i]) {
-      return wapp_tester_result(false);
-    }
-  }
-
-  return wapp_tester_result(true);
-}
-
-TestFuncResult test_arena_clear(void) {
-  wapp_mem_arena_clear(arena);
-  b8 result = true;
-
-  for (i32 i = 0; i < count; ++i) {
-    if (array[i] != 0) {
-      result = false;
-      break;
-    }
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_arena_destroy(void) {
-  wapp_mem_arena_destroy(&arena);
-  b8 result = arena == nullptr;
-
-  return wapp_tester_result(result);
-}
--- a/tests/arena/test_arena.h
+++ b/tests/arena/test_arena.h
@@ -1,7 +1,11 @@
 #ifndef TEST_ARENA_H
 #define TEST_ARENA_H

-#include "wapp.h"
+#include "tester.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus

 TestFuncResult test_arena_init(void);
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void);
@@ -12,4 +16,8 @@ TestFuncResult test_arena_realloc_smaller_size(void);
 TestFuncResult test_arena_clear(void);
 TestFuncResult test_arena_destroy(void);

+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
 #endif // !TEST_ARENA_H
--- a/tests/array/test_i32_array.c
+++ b/tests/array/test_i32_array.c
@@ -1,270 +0,0 @@
-#include "test_i32_array.h"
-#include "wapp.h"
-
-TestFuncResult test_i32_array(void) {
-  b8 result;
-
-  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
-  result = array.count == 7 && array.capacity == 16;
-
-  i32 *item;
-  u64 count   = array.count;
-  u64 index   = 0;
-  b8 running  = true;
-  while (running) {
-      item   = wapp_array_get(i32, &array, index);
-      result = result && item && *item == (i32)(index + 1);
-
-      ++index;
-      running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_with_capacity(void) {
-  b8 result;
-
-  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
-  result = array.count == 0 && array.capacity == 64;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_get(void) {
-  b8 result = true;
-
-  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-
-  i32 *item;
-  u64 count   = array.count;
-  u64 index   = 0;
-  b8 running  = true;
-  while (running) {
-    item   = wapp_array_get(i32, &array, index);
-    result = result && item && *item == (i32)index;
-
-    ++index;
-    running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_set(void) {
-  b8 result = true;
-
-  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-
-  i32 *item;
-  u64 count   = array.count;
-  u64 index   = 0;
-  b8 running  = true;
-  while (running) {
-    i32 num = (i32)(index * 2);
-    wapp_array_set(i32, &array, index, &num);
-    item   = wapp_array_get(i32, &array, index);
-    result = result && item && *item == (i32)(index * 2);
-
-    ++index;
-    running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_append_capped(void) {
-  b8 result;
-
-  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
-  wapp_array_append_capped(i32, &array, &((i32){10}));
-
-  result    = array.count == 1;
-  i32 *item = wapp_array_get(i32, &array, 0);
-  result = result && item && *item == 10;
-
-  array = wapp_array(i32, I32Array, 1);
-  wapp_array_append_capped(i32, &array, &((i32){10}));
-
-  result = result && array.count == 2;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_extend_capped(void) {
-  b8 result;
-
-  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
-  I32Array array2 = wapp_array(i32, I32Array, 10, 20);
-
-  result = array1.count == 4 && array2.count == 2;
-
-  wapp_array_extend_capped(i32, &array1, &array2);
-
-  result = result && array1.count == 6;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_copy_capped(void) {
-  b8 result;
-
-  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);
-
-  u64 expected_count = 5;
-  wapp_array_copy_capped(i32, &dst1, &src);
-  result = dst1.count == expected_count;
-
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index);
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  expected_count = 4;
-  wapp_array_copy_capped(i32, &dst2, &src);
-  result = result && dst2.count == expected_count;
-
-  index   = 0;
-  running = true;
-  while (running) {
-    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index);
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_alloc_capacity(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  u64 capacity        = 32;
-  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity);
-
-  result = array && array->capacity == capacity;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_append_alloc(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-
-  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &((i32){10}));
-  result = arr_ptr == &array1;
-
-  u64 count    = 4;
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    i32 num = (i32)index;
-    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);
-
-    ++index;
-    running = index < count;
-  }
-  result = result && arr_ptr != &array2;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_extend_alloc(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);
-
-  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
-  result = arr_ptr == &array1;
-
-  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
-  result  = result && arr_ptr != &array2;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_copy_alloc(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
-  I32Array *array_ptr = NULL;
-
-  u64 expected_count = 5;
-  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
-  result = array_ptr->count == expected_count && array_ptr == &dst1;
-
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  expected_count = 5;
-  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
-  result = result && array_ptr->count == expected_count && array_ptr != &dst2;
-
-  index   = 0;
-  running = true;
-  while (running) {
-    result = result && *wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index);
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_pop(void) {
-  b8 result;
-
-  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32);
-
-  i32 item1 = wapp_array_pop(i32, &array1);
-  i32 item2 = wapp_array_pop(i32, &array2);
-
-  result = item1 == 8 && item2 == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_clear(void) {
-  b8 result;
-
-  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-  result = array.count == 9;
-
-  wapp_array_clear(i32, &array);
-
-  result = result && array.count == 0;
-
-  return wapp_tester_result(result);
-}
--- a/tests/array/test_i32_array.cc
+++ b/tests/array/test_i32_array.cc
@@ -1,273 +0,0 @@
-#include "test_i32_array.h"
-#include "wapp.h"
-
-TestFuncResult test_i32_array(void) {
-  b8 result;
-
-  I32Array array = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7);
-  result = array.count == 7 && array.capacity == 16;
-
-  i32 *item;
-  u64 count    = array.count;
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-      item   = wapp_array_get(i32, &array, index);
-      result = result && item && (*item == (i32)(index + 1));
-
-      ++index;
-      running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_with_capacity(void) {
-  b8 result;
-
-  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
-  result = array.count == 0 && array.capacity == 64;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_get(void) {
-  b8 result = true;
-
-  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-
-  i32 *item;
-  u64 count    = array.count;
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    item   = wapp_array_get(i32, &array, index);
-    result = result && item && (*item == (i32)index);
-
-    ++index;
-    running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_set(void) {
-  b8 result = true;
-
-  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-
-  i32 *item;
-  u64 count    = array.count;
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    i32 num = (i32)(index * 2);
-    wapp_array_set(i32, &array, index, &num);
-    item   = wapp_array_get(i32, &array, index);
-    result = result && item && (*item == (i32)(index * 2));
-
-    ++index;
-    running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_append_capped(void) {
-  b8 result;
-
-  I32Array array = wapp_array_with_capacity(i32, I32Array, 64);
-  i32 item1 = 10;
-  wapp_array_append_capped(i32, &array, &item1);
-
-  result = array.count == 1;
-  i32 *item = wapp_array_get(i32, &array, 0);
-  result = result && item && *item == 10;
-
-  array = wapp_array(i32, I32Array, 1);
-  i32 item2 = 10;
-  wapp_array_append_capped(i32, &array, &item2);
-
-  result = result && array.count == 2;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_extend_capped(void) {
-  b8 result;
-
-  I32Array array1 = wapp_array(i32, I32Array, 1, 2, 3, 4);
-  I32Array array2 = wapp_array(i32, I32Array, 10, 20);
-
-  result = array1.count == 4 && array2.count == 2;
-
-  wapp_array_extend_capped(i32, &array1, &array2);
-
-  result = result && array1.count == 6;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_copy_capped(void) {
-  b8 result;
-
-  I32Array src  = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  I32Array dst1 = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  I32Array dst2 = wapp_array(i32, I32Array, 1, 2);
-
-  u64 expected_count = 5;
-  wapp_array_copy_capped(i32, &dst1, &src);
-  result = dst1.count == expected_count;
-
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst1, index));
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  expected_count = 4;
-  wapp_array_copy_capped(i32, &dst2, &src);
-  result = result && dst2.count == expected_count;
-
-  index   = 0;
-  running = true;
-  while (running) {
-    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, &dst2, index));
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_alloc_capacity(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  u64 capacity        = 32;
-  I32Array *array     = wapp_array_alloc_capacity(i32, I32Array, &allocator, capacity);
-
-  result = array && array->capacity == capacity;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_append_alloc(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-
-  i32 num = 10;
-  I32Array *arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array1, &num);
-  result = arr_ptr == &array1;
-
-  u64 count    = 4;
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    num = (i32)index;
-    arr_ptr = wapp_array_append_alloc(i32, I32Array, &allocator, &array2, &num);
-
-    ++index;
-    running = index < count;
-  }
-  result = result && arr_ptr != &array2;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_extend_alloc(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  I32Array array1     = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2     = wapp_array(i32, I32Array, 1, 2);
-  I32Array array3     = wapp_array(i32, I32Array, 1, 2, 3, 4);
-
-  I32Array *arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array1, &array3);
-  result = arr_ptr == &array1;
-
-  arr_ptr = wapp_array_extend_alloc(i32, I32Array, &allocator, &array2, &array3);
-  result  = result && arr_ptr != &array2;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_copy_alloc(void) {
-  b8 result;
-
-  Allocator allocator = wapp_mem_arena_allocator_init(MB(4));
-  I32Array src        = wapp_array(i32, I32Array, 1, 2, 3, 4, 5);
-  I32Array dst1       = wapp_array(i32, I32Array, 1, 2, 3, 4, 5, 6);
-  I32Array dst2       = wapp_array(i32, I32Array, 1, 2);
-  I32Array *array_ptr = nullptr;
-
-  u64 expected_count = 5;
-  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst1, &src);
-  result = array_ptr->count == expected_count && array_ptr == &dst1;
-
-  u64 index    = 0;
-  b8 running  = true;
-  while (running) {
-    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  expected_count = 5;
-  array_ptr = wapp_array_copy_alloc(i32, I32Array, &allocator, &dst2, &src);
-  result = result && array_ptr->count == expected_count && array_ptr != &dst2;
-
-  index   = 0;
-  running = true;
-  while (running) {
-    result = result && (*wapp_array_get(i32, &src, index) == *wapp_array_get(i32, array_ptr, index));
-
-    ++index;
-    running = index < expected_count;
-  }
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_clear(void) {
-  b8 result;
-
-  I32Array array = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-  result = array.count == 9;
-
-  wapp_array_clear(i32, &array);
-
-  result = result && array.count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_i32_array_pop(void) {
-  b8 result;
-
-  I32Array array1 = wapp_array(i32, I32Array, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-  I32Array array2 = wapp_array_with_capacity(i32, I32Array, 32);
-
-  i32 item1 = wapp_array_pop(i32, &array1);
-  i32 item2 = wapp_array_pop(i32, &array2);
-
-  result = item1 == 8 && item2 == 0;
-
-  return wapp_tester_result(result);
-}
--- a/tests/array/test_i32_array.h
+++ b/tests/array/test_i32_array.h
@@ -1,20 +0,0 @@
-#ifndef TEST_INT_ARRAY_H
-#define TEST_INT_ARRAY_H
-
-#include "wapp.h"
-
-TestFuncResult test_i32_array(void);
-TestFuncResult test_i32_array_with_capacity(void);
-TestFuncResult test_i32_array_get(void);
-TestFuncResult test_i32_array_set(void);
-TestFuncResult test_i32_array_append_capped(void);
-TestFuncResult test_i32_array_extend_capped(void);
-TestFuncResult test_i32_array_copy_capped(void);
-TestFuncResult test_i32_array_alloc_capacity(void);
-TestFuncResult test_i32_array_append_alloc(void);
-TestFuncResult test_i32_array_extend_alloc(void);
-TestFuncResult test_i32_array_copy_alloc(void);
-TestFuncResult test_i32_array_pop(void);
-TestFuncResult test_i32_array_clear(void);
-
-#endif // !TEST_INT_ARRAY_H
--- a/tests/array/test_str8_array.c
+++ b/tests/array/test_str8_array.c
@@ -1,25 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "test_str8_array.h"
-
-TestFuncResult test_str8_array(void) {
-  b8 result;
-
-  Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};
-  Str8Array array = wapp_array(Str8, Str8Array, wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye"));
-  result = array.count == 3 && array.capacity == 8;
-
-  Str8 *item;
-  u64 count   = array.count;
-  u64 index   = 0;
-  b8 running = true;
-  while (running) {
-      item   = wapp_array_get(Str8, &array, index);
-      result = result && item && (wapp_str8_equal(item, &expected[index]));
-
-      ++index;
-      running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
--- a/tests/array/test_str8_array.cc
+++ b/tests/array/test_str8_array.cc
@@ -1,30 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#include "test_str8_array.h"
-
-TestFuncResult test_str8_array(void) {
-  b8 result;
-
-  Str8 expected[] = {wapp_str8_lit("Hello"), wapp_str8_lit("Hi"), wapp_str8_lit("Bye")};
-
-  Str8 str1       = wapp_str8_lit("Hello");
-  Str8 str2       = wapp_str8_lit("Hi");
-  Str8 str3       = wapp_str8_lit("Bye");
-  Str8Array array = wapp_array(Str8, Str8Array, str1, str2, str3);
-
-  result = array.count == 3 && array.capacity == 8;
-
-  Str8 *item;
-  u64 count   = array.count;
-  u64 index   = 0;
-  b8 running = true;
-  while (running) {
-    item   = wapp_array_get(Str8, &array, index);
-    result = result && item && (wapp_str8_equal(item, &expected[index]));
-
-    ++index;
-    running = index < count;
-  }
-
-  return wapp_tester_result(result);
-}
--- a/tests/array/test_str8_array.h
+++ b/tests/array/test_str8_array.h
@@ -1,10 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef TEST_STR8_ARRAY_H
-#define TEST_STR8_ARRAY_H
-
-#include "wapp.h"
-
-TestFuncResult test_str8_array(void);
-
-#endif // !TEST_STR8_ARRAY_H
--- a/tests/cpath/test_cpath.c
+++ b/tests/cpath/test_cpath.c
@@ -1,181 +1,183 @@
 #include "test_cpath.h"
-#include "wapp.h"
+#include "cpath.h"
+#include "tester.h"
 #include <string.h>
 #include <stdio.h>
+#include <stdbool.h>

 #define MAIN_BUF_SIZE 4096
 #define TMP_BUF_SIZE  1024

 TestFuncResult test_cpath_join_path(void) {
-  b8 result;
+  char expected[MAIN_BUF_SIZE] = {0};
+  char out[MAIN_BUF_SIZE]      = {0};
+  char tmp[TMP_BUF_SIZE]      = {0};

-  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 out      = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  snprintf(expected, MAIN_BUF_SIZE, "%chome%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP, PATH_SEP);
+  snprintf(tmp, 2, "%c", PATH_SEP);
+  wapp_cpath_join_path(out, tmp, "home", "abdelrahman", "Documents");

-  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
+  bool result = strcmp(out, expected) == 0;
+  if (!result) {
+    goto TEST_JOIN_PATH_EXIT;
+  }

-  Str8List parts = wapp_dbl_list(Str8, Str8List);
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("abdelrahman"));
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("Documents"));
+  memset(out, 0, strlen(out));
+  snprintf(expected, MAIN_BUF_SIZE, "home%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP);
+  wapp_cpath_join_path(out, "home", "abdelrahman", "Documents");

-  wapp_cpath_join_path(&out, &parts);
-  result = wapp_str8_equal(&out, &expected);
+  result = result && strcmp(out, expected) == 0;
+  if (!result) {
+    goto TEST_JOIN_PATH_EXIT;
+  }

-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
+  memset(out, 0, strlen(out));
+  memset(tmp, 0, strlen(tmp));
+  snprintf(expected, MAIN_BUF_SIZE, "%chome%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP, PATH_SEP);
+  snprintf(tmp, TMP_BUF_SIZE, "%chome", PATH_SEP);
+  wapp_cpath_join_path(out, tmp, "abdelrahman", "Documents");

-  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  result = result && strcmp(out, expected) == 0;
+  if (!result) {
+    goto TEST_JOIN_PATH_EXIT;
+  }

-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
+  memset(out, 0, strlen(out));
+  memset(tmp, 0, strlen(tmp));
+  snprintf(expected, MAIN_BUF_SIZE, "home%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP);
+  snprintf(tmp, TMP_BUF_SIZE, "home%c", PATH_SEP);
+  wapp_cpath_join_path(out, tmp, "abdelrahman", "Documents");

-  wapp_str8_concat_capped(&tmp, &wapp_str8_lit_ro("home"));
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_str8(tmp));
+  result = result && strcmp(out, expected) == 0;
+  if (!result) {
+    goto TEST_JOIN_PATH_EXIT;
+  }

-  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
+  memset(out, 0, strlen(out));
+  memset(tmp, 0, strlen(tmp));
+  snprintf(expected, MAIN_BUF_SIZE, "%chome", PATH_SEP);
+  snprintf(tmp, TMP_BUF_SIZE, "%chome", PATH_SEP);
+  wapp_cpath_join_path(out, tmp, "");

-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
+  result = result && strcmp(out, expected) == 0;
+  if (!result) {
+    goto TEST_JOIN_PATH_EXIT;
+  }

-  wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-  wapp_dbl_list_push_front(Str8, &parts, &wapp_str8_node_from_cstr("home"));
+  memset(out, 0, strlen(out));
+  snprintf(expected, 1, "");
+  wapp_cpath_join_path(out, "", "");

-  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
+  result = result && strcmp(out, expected) == 0;
+  if (!result) {
+    goto TEST_JOIN_PATH_EXIT;
+  }

-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
+  memset(out, 0, strlen(out));
+  snprintf(expected, MAIN_BUF_SIZE, "home");
+  wapp_cpath_join_path(out, "", "home");

-  wapp_dbl_list_empty(Str8, &parts);
-
-  wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_str8(tmp));
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));
-
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr(""));
-
-  wapp_str8_format(&expected, "%s", "");
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
-  wapp_dbl_list_push_back(Str8, &parts, &wapp_str8_node_from_cstr("home"));
-
-  wapp_str8_copy_cstr_capped(&expected, "home");
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
+  result = result && strcmp(out, expected) == 0;

+TEST_JOIN_PATH_EXIT:
  return wapp_tester_result(result);
 }

 TestFuncResult test_cpath_dirname(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
-  if (wapp_mem_allocator_invalid(&arena)) {
-    return wapp_tester_result(false);
+  char dst[MAIN_BUF_SIZE]      = {0};
+  char expected[MAIN_BUF_SIZE] = {0};
+  char tmp[TMP_BUF_SIZE]      = {0};
+
+  snprintf(tmp, 2, "%c", PATH_SEP);
+  wapp_cpath_dirname(dst, tmp);
+  bool result = strcmp(dst, tmp) == 0;
+  if (!result) {
+    goto TEST_DIRNAME_EXIT;
  }

-  b8 result;
-  Str8 *output = NULL;
+  memset(dst, 0, strlen(dst));
+  wapp_cpath_dirname(dst, "home");
+  result = strcmp(dst, ".") == 0;
+  if (!result) {
+    goto TEST_DIRNAME_EXIT;
+  }

-  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  memset(dst, 0, strlen(dst));
+  wapp_cpath_dirname(dst, "");
+  result = strcmp(dst, ".") == 0;
+  if (!result) {
+    goto TEST_DIRNAME_EXIT;
+  }

-  // CASE 1
-  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  memset(dst, 0, strlen(dst));
+  snprintf(tmp, TMP_BUF_SIZE, "%chome%ctest", PATH_SEP, PATH_SEP);
+  snprintf(expected, MAIN_BUF_SIZE, "%chome", PATH_SEP);
+  wapp_cpath_dirname(dst, tmp);
+  result = strcmp(dst, expected) == 0;
+  if (!result) {
+    goto TEST_DIRNAME_EXIT;
+  }

-  output = wapp_cpath_dirname(&arena, &tmp);
-  result = output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 2
-  wapp_str8_format(&expected, "%s", ".");
-
-  output = wapp_cpath_dirname(&arena, &wapp_str8_lit("home"));
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 3
-  output = wapp_cpath_dirname(&arena, &wapp_str8_lit(""));
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 4
-  wapp_str8_format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirname(&arena, &tmp);
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 5
-  wapp_str8_format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirname(&arena, &tmp);
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  wapp_mem_arena_allocator_destroy(&arena);
+  memset(dst, 0, strlen(dst));
+  memset(tmp, 0, strlen(tmp));
+  memset(expected, 0, strlen(expected));
+  snprintf(tmp, TMP_BUF_SIZE, "%chome%ctest%c", PATH_SEP, PATH_SEP, PATH_SEP);
+  snprintf(expected, MAIN_BUF_SIZE, "%chome", PATH_SEP);
+  wapp_cpath_dirname(dst, tmp);
+  result = strcmp(dst, expected) == 0;

+TEST_DIRNAME_EXIT:
  return wapp_tester_result(result);
 }

 TestFuncResult test_cpath_dirup(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
-  if (wapp_mem_allocator_invalid(&arena)) {
-    return wapp_tester_result(false);
+  char dst[MAIN_BUF_SIZE]      = {0};
+  char expected[MAIN_BUF_SIZE] = {0};
+  char tmp[TMP_BUF_SIZE]      = {0};
+
+  snprintf(tmp, 2, "%c", PATH_SEP);
+  wapp_cpath_dirup(dst, 3, tmp);
+  bool result = strcmp(dst, tmp) == 0;
+  if (!result) {
+    goto TEST_DIRUP_EXIT;
  }

-  b8 result;
-  Str8 *output = NULL;
+  memset(dst, 0, strlen(dst));
+  memset(tmp, 0, strlen(tmp));
+  snprintf(tmp, TMP_BUF_SIZE, "%chome%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP, PATH_SEP);
+  snprintf(expected, MAIN_BUF_SIZE, "%c", PATH_SEP);
+  wapp_cpath_dirup(dst, 3, tmp);
+  result = strcmp(dst, expected) == 0;
+  if (!result) {
+    goto TEST_DIRUP_EXIT;
+  }

-  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
+  memset(dst, 0, strlen(dst));
+  memset(tmp, 0, strlen(tmp));
+  snprintf(tmp, TMP_BUF_SIZE, "home%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP);
+  wapp_cpath_dirup(dst, 3, tmp);
+  result = strcmp(dst, ".") == 0;
+  if (!result) {
+    goto TEST_DIRUP_EXIT;
+  }

-  // CASE 1
-  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
+  memset(dst, 0, strlen(dst));
+  memset(tmp, 0, strlen(tmp));
+  memset(expected, 0, strlen(expected));
+  snprintf(tmp, TMP_BUF_SIZE, "%chome%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP, PATH_SEP);
+  snprintf(expected, MAIN_BUF_SIZE, "%chome", PATH_SEP);
+  wapp_cpath_dirup(dst, 2, tmp);
+  result = strcmp(dst, expected) == 0;
+  if (!result) {
+    goto TEST_DIRUP_EXIT;
+  }

-  output = wapp_cpath_dirup(&arena, &tmp, 3);
-  result = output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 2
-  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirup(&arena, &tmp, 3);
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 3
-  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_copy_cstr_capped(&expected, ".");
-
-  output = wapp_cpath_dirup(&arena, &tmp, 3);
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 4
-  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirup(&arena, &tmp, 2);
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  // CASE 5
-  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_copy_cstr_capped(&expected, "home");
-
-  output = wapp_cpath_dirup(&arena, &tmp, 2);
-  result = result && output != NULL && wapp_str8_equal(output, &expected);
-
-  wapp_mem_arena_allocator_destroy(&arena);
+  memset(dst, 0, strlen(dst));
+  memset(tmp, 0, strlen(tmp));
+  snprintf(tmp, TMP_BUF_SIZE, "home%cabdelrahman%cDocuments", PATH_SEP, PATH_SEP);
+  wapp_cpath_dirup(dst, 2, tmp);
+  result = strcmp(dst, "home") == 0;

+TEST_DIRUP_EXIT:
  return wapp_tester_result(result);
 }
--- a/tests/cpath/test_cpath.cc
+++ b/tests/cpath/test_cpath.cc
@@ -1,204 +0,0 @@
-#include "test_cpath.h"
-#include "wapp.h"
-#include <string.h>
-#include <stdio.h>
-
-#define MAIN_BUF_SIZE 4096
-#define TMP_BUF_SIZE  1024
-
-TestFuncResult test_cpath_join_path(void) {
-  b8 result;
-
-  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 out      = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
-
-  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-
-  Str8List parts = wapp_dbl_list(Str8, Str8List);
-
-  Str8Node tmp_node = wapp_str8_node_from_str8(tmp);
-  wapp_dbl_list_push_back(Str8, &parts, &tmp_node);
-
-  Str8Node home_node = wapp_str8_node_from_cstr("home");
-  wapp_dbl_list_push_back(Str8, &parts, &home_node);
-
-  Str8Node user_node = wapp_str8_node_from_cstr("abdelrahman");
-  wapp_dbl_list_push_back(Str8, &parts, &user_node);
-
-  Str8Node docs_node = wapp_str8_node_from_cstr("Documents");
-  wapp_dbl_list_push_back(Str8, &parts, &docs_node);
-
-  wapp_cpath_join_path(&out, &parts);
-  result = wapp_str8_equal(&out, &expected);
-
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-
-  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  Str8RO str = wapp_str8_lit_ro("home");
-  wapp_str8_concat_capped(&tmp, &str);
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-
-  Str8Node tmp_node_2 = wapp_str8_node_from_str8(tmp);
-  wapp_dbl_list_push_front(Str8, &parts, &tmp_node_2);
-
-  wapp_str8_format(&expected, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  wapp_str8_format(&tmp, "home%c", WAPP_PATH_SEP);
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-
-  Str8Node home_node_2 = wapp_str8_node_from_cstr("home");
-  wapp_dbl_list_push_front(Str8, &parts, &home_node_2);
-
-  wapp_str8_format(&expected, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  wapp_dbl_list_empty(Str8, &parts);
-
-  wapp_str8_format(&tmp, "%chome", WAPP_PATH_SEP);
-
-  Str8Node tmp_node_3 = wapp_str8_node_from_str8(tmp);
-  wapp_dbl_list_push_back(Str8, &parts, &tmp_node_3);
-
-  Str8Node empty_node = wapp_str8_node_from_cstr("");
-  wapp_dbl_list_push_back(Str8, &parts, &empty_node);
-
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  wapp_dbl_list_pop_front(Str8, Str8Node, &parts);
-
-  Str8Node empty_node_2 = wapp_str8_node_from_cstr("");
-  wapp_dbl_list_push_back(Str8, &parts, &empty_node_2);
-
-  wapp_str8_format(&expected, "%s", "");
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  wapp_dbl_list_pop_back(Str8, Str8Node, &parts);
-
-  Str8Node home_node_3 = wapp_str8_node_from_cstr("home");
-  wapp_dbl_list_push_back(Str8, &parts, &home_node_3);
-
-  wapp_str8_copy_cstr_capped(&expected, "home");
-
-  wapp_cpath_join_path(&out, &parts);
-  result = result && wapp_str8_equal(&out, &expected);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_cpath_dirname(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
-  if (wapp_mem_allocator_invalid(&arena)) {
-    return wapp_tester_result(false);
-  }
-
-  b8 result;
-  Str8 *output = nullptr;
-
-  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
-
-  // CASE 1
-  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirname(&arena, &tmp);
-  result = output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 2
-  wapp_str8_format(&expected, "%s", ".");
-
-  Str8 path = wapp_str8_lit("home");
-  output = wapp_cpath_dirname(&arena, &path);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 3
-  path = wapp_str8_lit("");
-  output = wapp_cpath_dirname(&arena, &path);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 4
-  wapp_str8_format(&tmp, "%chome%ctest", WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirname(&arena, &tmp);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 5
-  wapp_str8_format(&tmp, "%chome%ctest%c", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirname(&arena, &tmp);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_cpath_dirup(void) {
-  Allocator arena = wapp_mem_arena_allocator_init(MB(8));
-  if (wapp_mem_allocator_invalid(&arena)) {
-    return wapp_tester_result(false);
-  }
-
-  b8 result;
-  Str8 *output = nullptr;
-
-  Str8 expected = wapp_str8_buf(MAIN_BUF_SIZE);
-  Str8 tmp      = wapp_str8_buf(TMP_BUF_SIZE);
-
-  // CASE 1
-  wapp_str8_format(&tmp, "%c", WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirup(&arena, &tmp, 3);
-  result = output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 2
-  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%c", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirup(&arena, &tmp, 3);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 3
-  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_copy_cstr_capped(&expected, ".");
-
-  output = wapp_cpath_dirup(&arena, &tmp, 3);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 4
-  wapp_str8_format(&tmp, "%chome%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_format(&expected, "%chome", WAPP_PATH_SEP);
-
-  output = wapp_cpath_dirup(&arena, &tmp, 2);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  // CASE 5
-  wapp_str8_format(&tmp, "home%cabdelrahman%cDocuments", WAPP_PATH_SEP, WAPP_PATH_SEP);
-  wapp_str8_copy_cstr_capped(&expected, "home");
-
-  output = wapp_cpath_dirup(&arena, &tmp, 2);
-  result = result && output != nullptr && wapp_str8_equal(output, &expected);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
--- a/tests/cpath/test_cpath.h
+++ b/tests/cpath/test_cpath.h
@@ -1,10 +1,18 @@
 #ifndef TEST_CPATH_H
 #define TEST_CPATH_H

-#include "wapp.h"
+#include "tester.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus

 TestFuncResult test_cpath_join_path(void);
 TestFuncResult test_cpath_dirname(void);
 TestFuncResult test_cpath_dirup(void);

+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
 #endif // !TEST_CPATH_H
--- a/tests/shell_commander/test_shell_commander.c
+++ b/tests/shell_commander/test_shell_commander.c
@@ -1,62 +1,49 @@
 #include "test_shell_commander.h"
-#include "wapp.h"
+#include "commander.h"
+#include "tester.h"
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

 TestFuncResult test_commander_cmd_success(void) {
-  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("hello world"));
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
-  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, 0, "echo", "hello world");
+  bool succeeded   = result.exited && result.exit_code == EXIT_SUCCESS &&
                     result.error == SHELL_ERR_NO_ERROR;

  return wapp_tester_result(succeeded);
 }

 TestFuncResult test_commander_cmd_failure(void) {
-  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("grep"));
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, &cmd);
-  b8 failed       = result.exited && result.exit_code != EXIT_SUCCESS &&
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, 0, "grep");
+  bool failed      = result.exited && result.exit_code != EXIT_SUCCESS &&
                     result.error == SHELL_ERR_NO_ERROR;

  return wapp_tester_result(failed);
 }

 TestFuncResult test_commander_cmd_out_buf_success(void) {
-  Str8 buf          = wapp_str8_buf(64);
-  Str8 expected     = wapp_str8_buf(64);
-  char msg[]        = "hello world";
-  wapp_str8_copy_cstr_capped(&expected, msg);
+  char buf[64]             = {0};
+  char expected_output[64] = {0};
+  const char *msg          = "hello world";
+  u64 length               = strlen(msg);
+  snprintf(expected_output, length + 2, "%s\n", msg);

-  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg));
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
-                     result.error == SHELL_ERR_NO_ERROR && wapp_str8_equal_to_count(&buf, &expected, strlen(msg));
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, buf, 64, "echo", msg);
+  bool succeeded   = result.exited && result.exit_code == EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_NO_ERROR &&
+                     strncmp(buf, expected_output, length) == 0;

  return wapp_tester_result(succeeded);
 }

 TestFuncResult test_commander_cmd_out_buf_failure(void) {
-  Str8 buf         = wapp_str8_buf(4);
-  Str8 expected    = wapp_str8_buf(64);
-  char msg[]       = "hello world";
-  wapp_str8_copy_cstr_capped(&expected, msg);
-
-  Str8List cmd = wapp_dbl_list(Str8, Str8List);
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr("echo"));
-  wapp_dbl_list_push_back(Str8, &cmd, &wapp_str8_node_from_cstr(msg));
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-  b8 failed       = !result.exited && result.exit_code != EXIT_SUCCESS &&
-                     result.error == SHELL_ERR_OUT_BUF_FULL && !wapp_str8_equal(&buf, &expected);
+  char buf[4]      = {0};
+  const char *msg  = "hello world";
+  u64 length       = strlen(msg);
+  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, buf, 4, "echo", msg);
+  bool failed      = !result.exited && result.exit_code != EXIT_SUCCESS &&
+                     result.error == SHELL_ERR_OUT_BUF_FULL && strncmp(buf, msg, length) != 0;

  return wapp_tester_result(failed);
 }
--- a/tests/shell_commander/test_shell_commander.cc
+++ b/tests/shell_commander/test_shell_commander.cc
@@ -1,69 +0,0 @@
-#include "test_shell_commander.h"
-#include "wapp.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-TestFuncResult test_commander_cmd_success(void) {
-  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-  Str8Node echo = wapp_str8_node_from_cstr("echo");
-  Str8Node msg  = wapp_str8_node_from_cstr("hello world");
-  wapp_dbl_list_push_back(Str8, &cmd, &echo);
-  wapp_dbl_list_push_back(Str8, &cmd, &msg);
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
-  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
-                     result.error == SHELL_ERR_NO_ERROR;
-
-  return wapp_tester_result(succeeded);
-}
-
-TestFuncResult test_commander_cmd_failure(void) {
-  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-  Str8Node grep = wapp_str8_node_from_cstr("grep");
-  wapp_dbl_list_push_back(Str8, &cmd, &grep);
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, nullptr, &cmd);
-  b8 failed       = result.exited && result.exit_code != EXIT_SUCCESS &&
-                     result.error == SHELL_ERR_NO_ERROR;
-
-  return wapp_tester_result(failed);
-}
-
-TestFuncResult test_commander_cmd_out_buf_success(void) {
-  Str8 buf          = wapp_str8_buf(64);
-  Str8 expected     = wapp_str8_buf(64);
-  char msg[]        = "hello world";
-  wapp_str8_copy_cstr_capped(&expected, msg);
-
-  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-  Str8Node echo = wapp_str8_node_from_cstr("echo");
-  Str8Node arg  = wapp_str8_node_from_cstr(msg);
-  wapp_dbl_list_push_back(Str8, &cmd, &echo);
-  wapp_dbl_list_push_back(Str8, &cmd, &arg);
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-  b8 succeeded    = result.exited && result.exit_code == EXIT_SUCCESS &&
-                     result.error == SHELL_ERR_NO_ERROR && wapp_str8_equal_to_count(&buf, &expected, strlen(msg));
-
-  return wapp_tester_result(succeeded);
-}
-
-TestFuncResult test_commander_cmd_out_buf_failure(void) {
-  Str8 buf         = wapp_str8_buf(4);
-  Str8 expected    = wapp_str8_buf(64);
-  char msg[]       = "hello world";
-  wapp_str8_copy_cstr_capped(&expected, msg);
-
-  Str8List cmd  = wapp_dbl_list(Str8, Str8List);
-  Str8Node echo = wapp_str8_node_from_cstr("echo");
-  Str8Node arg  = wapp_str8_node_from_cstr(msg);
-  wapp_dbl_list_push_back(Str8, &cmd, &echo);
-  wapp_dbl_list_push_back(Str8, &cmd, &arg);
-
-  CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_CAPTURE, &buf, &cmd);
-  b8 failed       = !result.exited && result.exit_code != EXIT_SUCCESS &&
-                     result.error == SHELL_ERR_OUT_BUF_FULL && !wapp_str8_equal(&buf, &expected);
-
-  return wapp_tester_result(failed);
-}
--- a/tests/shell_commander/test_shell_commander.h
+++ b/tests/shell_commander/test_shell_commander.h
@@ -1,11 +1,19 @@
 #ifndef TEST_SHELL_COMMANDER_H
 #define TEST_SHELL_COMMANDER_H

-#include "wapp.h"
+#include "tester.h"
+
+#ifdef __cplusplus
+BEGIN_C_LINKAGE
+#endif // __cplusplus

 TestFuncResult test_commander_cmd_success(void);
 TestFuncResult test_commander_cmd_failure(void);
 TestFuncResult test_commander_cmd_out_buf_success(void);
 TestFuncResult test_commander_cmd_out_buf_failure(void);

+#ifdef __cplusplus
+END_C_LINKAGE
+#endif // __cplusplus
+
 #endif // !TEST_SHELL_COMMANDER_H
--- a/tests/str8/test_str8.c
+++ b/tests/str8/test_str8.c
@@ -1,626 +0,0 @@
-#include "test_str8.h"
-#include "wapp.h"
-
-#define ARRLEN(ARR) (sizeof(ARR) / sizeof(ARR[0]))
-
-TestFuncResult test_str8_lit(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("Hello world");
-  result  = s1.capacity == 22 && s1.capacity != s1.size;
-
-  Str8 s2 = wapp_str8_lit("Different strokes for different folks");
-  result  = result && s2.capacity == 74 && s2.capacity != s2.size;
-
-  Str8 s3 = wapp_str8_lit("Discretion is the better part of valour");
-  result  = result && s3.capacity == 78 && s3.capacity != s3.size;
-
-  Str8 s4 = wapp_str8_lit("Distance lends enchantment to the view");
-  result  = result && s4.capacity == 76 && s4.capacity != s4.size;
-
-  Str8 s5 = wapp_str8_lit("Do as I say, not as I do");
-  result  = result && s5.capacity == 48 && s5.capacity != s5.size;
-
-  Str8 s6 = wapp_str8_lit("Do as you would be done by");
-  result  = result && s6.capacity == 52 && s6.capacity != s6.size;
-
-  Str8 s7 = wapp_str8_lit("Do unto others as you would have them do to you");
-  result  = result && s7.capacity == 94 && s7.capacity != s7.size;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_lit_ro(void) {
-  b8 result;
-
-  Str8RO s1 = wapp_str8_lit_ro("Hello world");
-  result    = s1.capacity == 11 && s1.capacity == s1.size;
-
-  Str8RO s2 = wapp_str8_lit_ro("Different strokes for different folks");
-  result    = result && s2.capacity == 37 && s2.capacity == s2.size;
-
-  Str8RO s3 = wapp_str8_lit_ro("Discretion is the better part of valour");
-  result    = result && s3.capacity == 39 && s3.capacity == s3.size;
-
-  Str8RO s4 = wapp_str8_lit_ro("Distance lends enchantment to the view");
-  result    = result && s4.capacity == 38 && s4.capacity == s4.size;
-
-  Str8RO s5 = wapp_str8_lit_ro("Do as I say, not as I do");
-  result    = result && s5.capacity == 24 && s5.capacity == s5.size;
-
-  Str8RO s6 = wapp_str8_lit_ro("Do as you would be done by");
-  result    = result && s6.capacity == 26 && s6.capacity == s6.size;
-
-  Str8RO s7 = wapp_str8_lit_ro("Do unto others as you would have them do to you");
-  result    = result && s7.capacity == 47 && s7.capacity == s7.size;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_buf(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_buf(1024);
-  result  = s1.capacity == 1024 && s1.size == 0;
-
-  Str8 s2 = wapp_str8_buf(2048);
-  result  = result && s2.capacity == 2048 && s2.size == 0;
-
-  Str8 s3 = wapp_str8_buf(4096);
-  result  = result && s3.capacity == 4096 && s3.size == 0;
-
-  Str8 s4 = wapp_str8_buf(8192);
-  result  = result && s4.capacity == 8192 && s4.size == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_buf(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  u64 capacity = 4096;
-
-  Str8 *s = wapp_str8_alloc_buf(&allocator, capacity);
-  if (!s) {
-    result = false;
-    goto TEST_ALLOC_BUF_CLEANUP;
-  }
-
-  result  = s->capacity == capacity;
-
-  const char *cstr = "My name is Abdelrahman";
-  wapp_str8_copy_cstr_capped(s, cstr);
-
-  result = result && s->capacity == capacity && s->size == strlen(cstr) && memcmp(s->buf, cstr, s->size) == 0;
-
-TEST_ALLOC_BUF_CLEANUP:
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_cstr(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  char *str  = "Abdelrahman";
-  u64 length = strlen(str);
-  Str8 *s    = wapp_str8_alloc_cstr(&allocator, str);
-  if (!s) {
-    return wapp_tester_result(false);
-  }
-
-  result = s->size == length && memcmp(s->buf, str, length) == 0;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_str8(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  Str8 str = wapp_str8_lit("Abdelrahman");
-  Str8 *s  = wapp_str8_alloc_str8(&allocator, &str);
-  if (!s) {
-    return wapp_tester_result(false);
-  }
-
-  result = wapp_str8_equal(s, &str);
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_substr(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  Str8 str = wapp_str8_lit("Abdelrahman");
-  Str8 *s  = wapp_str8_alloc_substr(&allocator, &str, 3, 8);
-  if (!s) {
-    return wapp_tester_result(false);
-  }
-
-  result = s->size == 5 && memcmp(s->buf, "elrah", s->size) == 0;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_get_index_within_bounds(void) {
-  b8 result;
-
-  Str8RO s1 = wapp_str8_lit_ro("Hello world");
-  result    = wapp_str8_get(&s1, 4) == 'o';
-
-  Str8RO s2 = wapp_str8_lit_ro("Different strokes for different folks");
-  result    = result && wapp_str8_get(&s2, 0) == 'D';
-
-  Str8RO s3 = wapp_str8_lit_ro("Discretion is the better part of valour");
-  result    = result && wapp_str8_get(&s3, 13) == ' ';
-
-  Str8RO s4 = wapp_str8_lit_ro("Distance lends enchantment to the view");
-  result    = result && wapp_str8_get(&s4, 20) == 'n';
-
-  Str8RO s5 = wapp_str8_lit_ro("Do as I say, not as I do");
-  result    = result && wapp_str8_get(&s5, 11) == ',';
-
-  Str8RO s6 = wapp_str8_lit_ro("Do as you would be done by");
-  result    = result && wapp_str8_get(&s6, 25) == 'y';
-
-  Str8RO s7 = wapp_str8_lit_ro("Do unto others as you would have them do to you");
-  result    = result && wapp_str8_get(&s7, 16) == 's';
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_get_index_out_of_bounds(void) {
-  Str8 s1      = wapp_str8_lit("Hello world");
-  b8 result   = wapp_str8_get(&s1, 20) == '\0';
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_set(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("Hello world");
-  wapp_str8_set(&s1, 4, 'f');
-  result  = wapp_str8_get(&s1, 4) == 'f';
-
-  Str8 s2 = wapp_str8_lit("Different strokes for different folks");
-  wapp_str8_set(&s2, 0, 'A');
-  result  = result && wapp_str8_get(&s2, 0) == 'A';
-
-  Str8 s3 = wapp_str8_lit("Discretion is the better part of valour");
-  wapp_str8_set(&s3, 13, 'u');
-  result  = result && wapp_str8_get(&s3, 13) == 'u';
-
-  Str8 s4 = wapp_str8_lit("Distance lends enchantment to the view");
-  wapp_str8_set(&s4, 20, 'R');
-  result  = result && wapp_str8_get(&s4, 20) == 'R';
-
-  Str8 s5 = wapp_str8_lit("Do as I say, not as I do");
-  wapp_str8_set(&s5, 11, '.');
-  result  = result && wapp_str8_get(&s5, 11) == '.';
-
-  Str8 s6 = wapp_str8_lit("Do as you would be done by");
-  wapp_str8_set(&s6, 25, 'w');
-  result  = result && wapp_str8_get(&s6, 25) == 'w';
-
-  Str8 s7 = wapp_str8_lit("Do unto others as you would have them do to you");
-  wapp_str8_set(&s7, 16, 'i');
-  result  = result && wapp_str8_get(&s7, 16) == 'i';
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_push_back(void) {
-  b8 result;
-
-  Str8 expected = wapp_str8_lit("Abdelrahman");
-  Str8 buf      = wapp_str8_buf(64);
-  wapp_str8_push_back(&buf, 'A');
-  wapp_str8_push_back(&buf, 'b');
-  wapp_str8_push_back(&buf, 'd');
-  wapp_str8_push_back(&buf, 'e');
-  wapp_str8_push_back(&buf, 'l');
-  wapp_str8_push_back(&buf, 'r');
-  wapp_str8_push_back(&buf, 'a');
-  wapp_str8_push_back(&buf, 'h');
-  wapp_str8_push_back(&buf, 'm');
-  wapp_str8_push_back(&buf, 'a');
-  wapp_str8_push_back(&buf, 'n');
-
-  result = wapp_str8_equal(&buf, &expected);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_equal(void) {
-  b8 result;
-
-  Str8RO s1 = wapp_str8_lit_ro("hello");
-  Str8RO s2 = wapp_str8_lit_ro("hell");
-  Str8RO s3 = wapp_str8_lit_ro("hello");
-  Str8RO s4 = wapp_str8_lit_ro("goodbye");
-
-  result = wapp_str8_equal(&s1, &s2) == false;
-  result = result && wapp_str8_equal(&s1, &s3) == true;
-  result = result && wapp_str8_equal(&s1, &s4) == false;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_slice(void) {
-  b8 result;
-  Str8 s = wapp_str8_lit("Different strokes for different folks");
-
-  Str8RO sub1 = wapp_str8_slice(&s, 3, 9);
-  result = sub1.size == 6 && sub1.capacity == 6;
-
-  Str8RO sub2 = wapp_str8_slice(&s, 18, 21);
-  result = result && sub2.size == 3 && sub2.capacity == 3;
-
-  Str8RO sub3 = wapp_str8_slice(&s, 5, 1);
-  result = result && sub3.size == 0 && sub3.capacity == 0;
-
-  Str8RO sub4 = wapp_str8_slice(&s, 70, 80);
-  result = result && sub4.size == 0 && sub4.capacity == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_concat(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str     = wapp_str8_lit("Hello world");
-  Str8 suffix1 = wapp_str8_lit(" from me.");
-  Str8 suffix2 = wapp_str8_lit(" This is my code.");
-  Str8 concat1 = wapp_str8_lit("Hello world from me.");
-  Str8 concat2 = wapp_str8_lit("Hello world from me. This is my code.");
-
-  Str8 *output;
-
-  output = wapp_str8_alloc_concat(&arena, &str, &suffix1);
-  result = output->size == concat1.size && wapp_str8_equal(output, &concat1);
-
-  output = wapp_str8_alloc_concat(&arena, output, &suffix2);
-  result = result && output->size == concat2.size && wapp_str8_equal(output, &concat2);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_concat_capped(void) {
-  b8 result;
-
-  Str8 str     = wapp_str8_lit("Hello world");
-  Str8 suffix1 = wapp_str8_lit(" from me.");
-  Str8 suffix2 = wapp_str8_lit(" This is my code.");
-  Str8 concat1 = wapp_str8_lit("Hello world from me.");
-  Str8 concat2 = wapp_str8_lit("Hello world from me. T");
-
-  wapp_str8_concat_capped(&str, &suffix1);
-  result = str.size == concat1.size && wapp_str8_equal(&str, &concat1);
-
-  wapp_str8_concat_capped(&str, &suffix2);
-  result = result && str.size == concat2.size && wapp_str8_equal(&str, &concat2);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_copy_cstr_capped(void) {
-  b8 result;
-
-  Str8 buf         = wapp_str8_buf(32);
-  const char *src1 = "Hello world";
-  const char *src2 = "Hello world from the Wizard Apprentice standard library";
-  Str8RO src1_cp   = wapp_str8_lit_ro("Hello world");
-  Str8RO src2_cp   = wapp_str8_lit_ro("Hello world from the Wizard Appr");
-
-  wapp_str8_copy_cstr_capped(&buf, src1);
-  result = buf.size == src1_cp.size && wapp_str8_equal(&buf, &src1_cp);
-
-  wapp_str8_copy_cstr_capped(&buf, src2);
-  result = result && buf.size == src2_cp.size && buf.size == buf.capacity && wapp_str8_equal(&buf, &src2_cp);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_copy_str8_capped(void) {
-  b8 result;
-
-  Str8 buf       = wapp_str8_buf(32);
-  Str8RO src1    = wapp_str8_lit_ro("Hello world");
-  Str8RO src2    = wapp_str8_lit_ro("Hello world from the Wizard Apprentice standard library");
-  Str8RO src2_cp = wapp_str8_lit_ro("Hello world from the Wizard Appr");
-
-  wapp_str8_copy_str8_capped(&buf, &src1);
-  result = buf.size == src1.size && wapp_str8_equal(&buf, &src1);
-
-  wapp_str8_copy_str8_capped(&buf, &src2);
-  result = result && buf.size < src2.size && buf.size == buf.capacity && wapp_str8_equal(&buf, &src2_cp);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_format(void) {
-  b8 result;
-
-  Str8 buf      = wapp_str8_buf(128);
-  Str8 expected = wapp_str8_lit("My name is Abdelrahman and I am 35 years old");
-
-  wapp_str8_format(&buf, "My name is %s and I am %u years old", "Abdelrahman", 35);
-
-  result = wapp_str8_equal(&buf, &expected);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_find(void) {
-  b8 result;
-  Str8RO s = wapp_str8_lit("Do as I say, not as I do");
-
-  result = wapp_str8_find(&s, wapp_str8_lit_ro("d")) != -1;
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("not")) != -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("as I say")) != -1);
-
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("f")) == -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("hello")) == -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("not sa I")) == -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("Do unto others as you would have them do to you")) == -1);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_rfind(void) {
-  b8 result;
-  Str8RO s = wapp_str8_lit("Do as I say, not as I do");
-
-  result = wapp_str8_rfind(&s, wapp_str8_lit_ro("d")) != -1;
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("not")) != -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("as I say")) != -1);
-
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("f")) == -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("hello")) == -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("not sa I")) == -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("Do unto others as you would have them do to you")) == -1);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_split(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str        = wapp_str8_lit("hello world from me");
-  Str8 delim1     = wapp_str8_lit(" ");
-  Str8 delim2     = wapp_str8_lit("from");
-  Str8List *list1 = wapp_str8_split(&arena, &str, &delim1);
-  Str8List *list2 = wapp_str8_split(&arena, &str, &delim2);
-
-  Str8RO splits1[] = {
-    wapp_str8_slice(&str, 0, 5),
-    wapp_str8_slice(&str, 6, 11),
-    wapp_str8_slice(&str, 12, 16),
-    wapp_str8_slice(&str, 17, 19),
-  };
-  Str8RO splits2[] = {
-    wapp_str8_slice(&str, 0, 12),
-    wapp_str8_slice(&str, 16, 19),
-  };
-
-  u64 index1    = 0;
-  u64 count1    = ARRLEN(splits1);
-  b8 running1  = true;
-
-  u64 index2    = 0;
-  u64 count2    = ARRLEN(splits2);
-  b8 running2  = true;
-
-  result = list1->node_count == count1 && wapp_str8_list_total_size(list1) == str.size - 3;
-  result = result && list2->node_count == count2 && wapp_str8_list_total_size(list2) == str.size - 4;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running1) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
-
-    ++index1;
-    running1 = index1 < count1;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running2) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
-
-    ++index2;
-    running2 = index2 < count2;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_split_with_max(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str       = wapp_str8_lit("hello world from me");
-  Str8 delim     = wapp_str8_lit(" ");
-  Str8List *list = wapp_str8_split_with_max(&arena, &str, &delim, 2);
-
-  Str8RO splits[] = {
-    wapp_str8_slice(&str, 0, 5),
-    wapp_str8_slice(&str, 6, 11),
-    wapp_str8_slice(&str, 12, 19),
-  };
-
-  u64 index    = 0;
-  u64 count    = ARRLEN(splits);
-  b8 running  = true;
-
-  result = list->node_count == count && wapp_str8_list_total_size(list) == str.size - 2;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-    result = result && wapp_str8_equal(node->item, &(splits[index]));
-
-    ++index;
-    running = index < count;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_rsplit(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str        = wapp_str8_lit("hello world from me");
-  Str8 delim1     = wapp_str8_lit(" ");
-  Str8 delim2     = wapp_str8_lit("from");
-  Str8List *list1 = wapp_str8_rsplit(&arena, &str, &delim1);
-  Str8List *list2 = wapp_str8_rsplit(&arena, &str, &delim2);
-
-  Str8RO splits1[] = {
-    wapp_str8_slice(&str, 0, 5),
-    wapp_str8_slice(&str, 6, 11),
-    wapp_str8_slice(&str, 12, 16),
-    wapp_str8_slice(&str, 17, 19),
-  };
-  Str8RO splits2[] = {
-    wapp_str8_slice(&str, 0, 12),
-    wapp_str8_slice(&str, 16, 19),
-  };
-
-  u64 index1    = 0;
-  u64 count1    = ARRLEN(splits1);
-  b8 running1  = true;
-
-  u64 index2    = 0;
-  u64 count2    = ARRLEN(splits2);
-  b8 running2  = true;
-
-  result = list1->node_count == count1 && wapp_str8_list_total_size(list1) == str.size - 3;
-  result = result && list2->node_count == count2 && wapp_str8_list_total_size(list2) == str.size - 4;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running1) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
-
-    ++index1;
-    running1 = index1 < count1;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running2) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
-
-    ++index2;
-    running2 = index2 < count2;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_rsplit_with_max(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str       = wapp_str8_lit("hello world from me");
-  Str8 delim     = wapp_str8_lit(" ");
-  Str8List *list = wapp_str8_rsplit_with_max(&arena, &str, &delim, 2);
-
-  Str8RO splits[] = {
-    wapp_str8_slice(&str, 0, 11),
-    wapp_str8_slice(&str, 12, 16),
-    wapp_str8_slice(&str, 17, 19),
-  };
-
-  u64 index    = 0;
-  u64 count    = ARRLEN(splits);
-  b8 running  = true;
-
-  result = list->node_count == count && wapp_str8_list_total_size(list) == str.size - 2;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-    result = result && wapp_str8_equal(node->item, &(splits[index]));
-
-    ++index;
-    running = index < count;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_join(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str        = wapp_str8_lit("hello world from me");
-  Str8 delim1     = wapp_str8_lit(" ");
-  Str8 delim2     = wapp_str8_lit("from");
-  Str8List *list1 = wapp_str8_rsplit(&arena, &str, &delim1);
-  Str8List *list2 = wapp_str8_rsplit(&arena, &str, &delim2);
-  Str8 *join1     = wapp_str8_join(&arena, list1, &delim1);
-  Str8 *join2     = wapp_str8_join(&arena, list2, &delim2);
-
-  result = join1->size == str.size && wapp_str8_equal(join1, &str);
-  result = result && join2->size == str.size && wapp_str8_equal(join2, &str);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_from_bytes(void) {
-  b8 result;
-
-  Str8 str      = wapp_str8_buf(1024);
-  U8Array bytes = wapp_array(u8, U8Array, 'W', 'A', 'P', 'P');
-  wapp_str8_from_bytes(&str, &bytes);
-
-  result = str.size == bytes.count * bytes.item_size;
-  result = result && wapp_str8_equal(&str, &wapp_str8_lit_ro("WAPP"));
-
-  return wapp_tester_result(result);
-}
--- a/tests/str8/test_str8.cc
+++ b/tests/str8/test_str8.cc
@@ -1,627 +0,0 @@
-#include "test_str8.h"
-#include "wapp.h"
-
-#define ARRLEN(ARR) (sizeof(ARR) / sizeof(ARR[0]))
-
-TestFuncResult test_str8_lit(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("Hello world");
-  result  = s1.capacity == 22 && s1.capacity != s1.size;
-
-  Str8 s2 = wapp_str8_lit("Different strokes for different folks");
-  result  = result && s2.capacity == 74 && s2.capacity != s2.size;
-
-  Str8 s3 = wapp_str8_lit("Discretion is the better part of valour");
-  result  = result && s3.capacity == 78 && s3.capacity != s3.size;
-
-  Str8 s4 = wapp_str8_lit("Distance lends enchantment to the view");
-  result  = result && s4.capacity == 76 && s4.capacity != s4.size;
-
-  Str8 s5 = wapp_str8_lit("Do as I say, not as I do");
-  result  = result && s5.capacity == 48 && s5.capacity != s5.size;
-
-  Str8 s6 = wapp_str8_lit("Do as you would be done by");
-  result  = result && s6.capacity == 52 && s6.capacity != s6.size;
-
-  Str8 s7 = wapp_str8_lit("Do unto others as you would have them do to you");
-  result  = result && s7.capacity == 94 && s7.capacity != s7.size;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_lit_ro(void) {
-  b8 result;
-
-  Str8RO s1 = wapp_str8_lit_ro("Hello world");
-  result    = s1.capacity == 11 && s1.capacity == s1.size;
-
-  Str8RO s2 = wapp_str8_lit_ro("Different strokes for different folks");
-  result    = result && s2.capacity == 37 && s2.capacity == s2.size;
-
-  Str8RO s3 = wapp_str8_lit_ro("Discretion is the better part of valour");
-  result    = result && s3.capacity == 39 && s3.capacity == s3.size;
-
-  Str8RO s4 = wapp_str8_lit_ro("Distance lends enchantment to the view");
-  result    = result && s4.capacity == 38 && s4.capacity == s4.size;
-
-  Str8RO s5 = wapp_str8_lit_ro("Do as I say, not as I do");
-  result    = result && s5.capacity == 24 && s5.capacity == s5.size;
-
-  Str8RO s6 = wapp_str8_lit_ro("Do as you would be done by");
-  result    = result && s6.capacity == 26 && s6.capacity == s6.size;
-
-  Str8RO s7 = wapp_str8_lit_ro("Do unto others as you would have them do to you");
-  result    = result && s7.capacity == 47 && s7.capacity == s7.size;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_buf(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_buf(1024);
-  result  = s1.capacity == 1024 && s1.size == 0;
-
-  Str8 s2 = wapp_str8_buf(2048);
-  result  = result && s2.capacity == 2048 && s2.size == 0;
-
-  Str8 s3 = wapp_str8_buf(4096);
-  result  = result && s3.capacity == 4096 && s3.size == 0;
-
-  Str8 s4 = wapp_str8_buf(8192);
-  result  = result && s4.capacity == 8192 && s4.size == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_buf(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  u64 capacity = 4096;
-
-  Str8 *s = wapp_str8_alloc_buf(&allocator, capacity);
-  if (!s) {
-    result = false;
-    wapp_mem_arena_allocator_destroy(&allocator);
-    return wapp_tester_result(result);
-  }
-
-  result  = s->capacity == capacity;
-
-  const char *cstr = "My name is Abdelrahman";
-  wapp_str8_copy_cstr_capped(s, cstr);
-
-  result = result && s->capacity == capacity && s->size == strlen(cstr) && memcmp(s->buf, cstr, s->size) == 0;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_cstr(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  const char *str  = "Abdelrahman";
-  u64 length = strlen(str);
-  Str8 *s    = wapp_str8_alloc_cstr(&allocator, str);
-  if (!s) {
-    return wapp_tester_result(false);
-  }
-
-  result = s->size == length && memcmp(s->buf, str, length) == 0;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_str8(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  Str8 str = wapp_str8_lit("Abdelrahman");
-  Str8 *s  = wapp_str8_alloc_str8(&allocator, &str);
-  if (!s) {
-    return wapp_tester_result(false);
-  }
-
-  result = wapp_str8_equal(s, &str);
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_substr(void) {
-  b8 result;
-  Allocator allocator = wapp_mem_arena_allocator_init(KB(100));
-  if (wapp_mem_allocator_invalid(&allocator)) {
-    return wapp_tester_result(false);
-  }
-
-  Str8 str = wapp_str8_lit("Abdelrahman");
-  Str8 *s  = wapp_str8_alloc_substr(&allocator, &str, 3, 8);
-  if (!s) {
-    return wapp_tester_result(false);
-  }
-
-  result = s->size == 5 && memcmp(s->buf, "elrah", s->size) == 0;
-
-  wapp_mem_arena_allocator_destroy(&allocator);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_get_index_within_bounds(void) {
-  b8 result;
-
-  Str8RO s1 = wapp_str8_lit_ro("Hello world");
-  result    = wapp_str8_get(&s1, 4) == 'o';
-
-  Str8RO s2 = wapp_str8_lit_ro("Different strokes for different folks");
-  result    = result && wapp_str8_get(&s2, 0) == 'D';
-
-  Str8RO s3 = wapp_str8_lit_ro("Discretion is the better part of valour");
-  result    = result && wapp_str8_get(&s3, 13) == ' ';
-
-  Str8RO s4 = wapp_str8_lit_ro("Distance lends enchantment to the view");
-  result    = result && wapp_str8_get(&s4, 20) == 'n';
-
-  Str8RO s5 = wapp_str8_lit_ro("Do as I say, not as I do");
-  result    = result && wapp_str8_get(&s5, 11) == ',';
-
-  Str8RO s6 = wapp_str8_lit_ro("Do as you would be done by");
-  result    = result && wapp_str8_get(&s6, 25) == 'y';
-
-  Str8RO s7 = wapp_str8_lit_ro("Do unto others as you would have them do to you");
-  result    = result && wapp_str8_get(&s7, 16) == 's';
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_get_index_out_of_bounds(void) {
-  Str8 s1      = wapp_str8_lit("Hello world");
-  b8 result   = wapp_str8_get(&s1, 20) == '\0';
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_set(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("Hello world");
-  wapp_str8_set(&s1, 4, 'f');
-  result  = wapp_str8_get(&s1, 4) == 'f';
-
-  Str8 s2 = wapp_str8_lit("Different strokes for different folks");
-  wapp_str8_set(&s2, 0, 'A');
-  result  = result && wapp_str8_get(&s2, 0) == 'A';
-
-  Str8 s3 = wapp_str8_lit("Discretion is the better part of valour");
-  wapp_str8_set(&s3, 13, 'u');
-  result  = result && wapp_str8_get(&s3, 13) == 'u';
-
-  Str8 s4 = wapp_str8_lit("Distance lends enchantment to the view");
-  wapp_str8_set(&s4, 20, 'R');
-  result  = result && wapp_str8_get(&s4, 20) == 'R';
-
-  Str8 s5 = wapp_str8_lit("Do as I say, not as I do");
-  wapp_str8_set(&s5, 11, '.');
-  result  = result && wapp_str8_get(&s5, 11) == '.';
-
-  Str8 s6 = wapp_str8_lit("Do as you would be done by");
-  wapp_str8_set(&s6, 25, 'w');
-  result  = result && wapp_str8_get(&s6, 25) == 'w';
-
-  Str8 s7 = wapp_str8_lit("Do unto others as you would have them do to you");
-  wapp_str8_set(&s7, 16, 'i');
-  result  = result && wapp_str8_get(&s7, 16) == 'i';
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_push_back(void) {
-  b8 result;
-
-  Str8 expected = wapp_str8_lit("Abdelrahman");
-  Str8 buf      = wapp_str8_buf(64);
-  wapp_str8_push_back(&buf, 'A');
-  wapp_str8_push_back(&buf, 'b');
-  wapp_str8_push_back(&buf, 'd');
-  wapp_str8_push_back(&buf, 'e');
-  wapp_str8_push_back(&buf, 'l');
-  wapp_str8_push_back(&buf, 'r');
-  wapp_str8_push_back(&buf, 'a');
-  wapp_str8_push_back(&buf, 'h');
-  wapp_str8_push_back(&buf, 'm');
-  wapp_str8_push_back(&buf, 'a');
-  wapp_str8_push_back(&buf, 'n');
-
-  result = wapp_str8_equal(&buf, &expected);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_equal(void) {
-  b8 result;
-
-  Str8RO s1 = wapp_str8_lit_ro("hello");
-  Str8RO s2 = wapp_str8_lit_ro("hell");
-  Str8RO s3 = wapp_str8_lit_ro("hello");
-  Str8RO s4 = wapp_str8_lit_ro("goodbye");
-
-  result = wapp_str8_equal(&s1, &s2) == false;
-  result = result && wapp_str8_equal(&s1, &s3) == (b8)true;
-  result = result && wapp_str8_equal(&s1, &s4) == (b8)false;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_slice(void) {
-  b8 result;
-  Str8 s = wapp_str8_lit("Different strokes for different folks");
-
-  Str8RO sub1 = wapp_str8_slice(&s, 3, 9);
-  result = sub1.size == 6 && sub1.capacity == 6;
-
-  Str8RO sub2 = wapp_str8_slice(&s, 18, 21);
-  result = result && sub2.size == 3 && sub2.capacity == 3;
-
-  Str8RO sub3 = wapp_str8_slice(&s, 5, 1);
-  result = result && sub3.size == 0 && sub3.capacity == 0;
-
-  Str8RO sub4 = wapp_str8_slice(&s, 70, 80);
-  result = result && sub4.size == 0 && sub4.capacity == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_alloc_concat(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str     = wapp_str8_lit("Hello world");
-  Str8 suffix1 = wapp_str8_lit(" from me.");
-  Str8 suffix2 = wapp_str8_lit(" This is my code.");
-  Str8 concat1 = wapp_str8_lit("Hello world from me.");
-  Str8 concat2 = wapp_str8_lit("Hello world from me. This is my code.");
-
-  Str8 *output;
-
-  output = wapp_str8_alloc_concat(&arena, &str, &suffix1);
-  result = output->size == concat1.size && wapp_str8_equal(output, &concat1);
-
-  output = wapp_str8_alloc_concat(&arena, output, &suffix2);
-  result = result && output->size == concat2.size && wapp_str8_equal(output, &concat2);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_concat_capped(void) {
-  b8 result;
-
-  Str8 str     = wapp_str8_lit("Hello world");
-  Str8 suffix1 = wapp_str8_lit(" from me.");
-  Str8 suffix2 = wapp_str8_lit(" This is my code.");
-  Str8 concat1 = wapp_str8_lit("Hello world from me.");
-  Str8 concat2 = wapp_str8_lit("Hello world from me. T");
-
-  wapp_str8_concat_capped(&str, &suffix1);
-  result = str.size == concat1.size && wapp_str8_equal(&str, &concat1);
-
-  wapp_str8_concat_capped(&str, &suffix2);
-  result = result && str.size == concat2.size && wapp_str8_equal(&str, &concat2);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_copy_cstr_capped(void) {
-  b8 result;
-
-  Str8 buf         = wapp_str8_buf(32);
-  const char *src1 = "Hello world";
-  const char *src2 = "Hello world from the Wizard Apprentice standard library";
-  Str8RO src1_cp   = wapp_str8_lit_ro("Hello world");
-  Str8RO src2_cp   = wapp_str8_lit_ro("Hello world from the Wizard Appr");
-
-  wapp_str8_copy_cstr_capped(&buf, src1);
-  result = buf.size == src1_cp.size && wapp_str8_equal(&buf, &src1_cp);
-
-  wapp_str8_copy_cstr_capped(&buf, src2);
-  result = result && buf.size == src2_cp.size && buf.size == buf.capacity && wapp_str8_equal(&buf, &src2_cp);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_copy_str8_capped(void) {
-  b8 result;
-
-  Str8 buf       = wapp_str8_buf(32);
-  Str8RO src1    = wapp_str8_lit_ro("Hello world");
-  Str8RO src2    = wapp_str8_lit_ro("Hello world from the Wizard Apprentice standard library");
-  Str8RO src2_cp = wapp_str8_lit_ro("Hello world from the Wizard Appr");
-
-  wapp_str8_copy_str8_capped(&buf, &src1);
-  result = buf.size == src1.size && wapp_str8_equal(&buf, &src1);
-
-  wapp_str8_copy_str8_capped(&buf, &src2);
-  result = result && buf.size < src2.size && buf.size == buf.capacity && wapp_str8_equal(&buf, &src2_cp);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_format(void) {
-  b8 result;
-
-  Str8 buf      = wapp_str8_buf(128);
-  Str8 expected = wapp_str8_lit("My name is Abdelrahman and I am 35 years old");
-
-  wapp_str8_format(&buf, "My name is %s and I am %u years old", "Abdelrahman", 35);
-
-  result = wapp_str8_equal(&buf, &expected);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_find(void) {
-  b8 result;
-  Str8RO s = wapp_str8_lit("Do as I say, not as I do");
-
-  result = wapp_str8_find(&s, wapp_str8_lit_ro("d")) != -1;
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("not")) != -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("as I say")) != -1);
-
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("f")) == -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("hello")) == -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("not sa I")) == -1);
-  result = result && (wapp_str8_find(&s, wapp_str8_lit_ro("Do unto others as you would have them do to you")) == -1);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_rfind(void) {
-  b8 result;
-  Str8RO s = wapp_str8_lit("Do as I say, not as I do");
-
-  result = wapp_str8_rfind(&s, wapp_str8_lit_ro("d")) != -1;
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("not")) != -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("as I say")) != -1);
-
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("f")) == -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("hello")) == -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("not sa I")) == -1);
-  result = result && (wapp_str8_rfind(&s, wapp_str8_lit_ro("Do unto others as you would have them do to you")) == -1);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_split(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str        = wapp_str8_lit("hello world from me");
-  Str8 delim1     = wapp_str8_lit(" ");
-  Str8 delim2     = wapp_str8_lit("from");
-  Str8List *list1 = wapp_str8_split(&arena, &str, &delim1);
-  Str8List *list2 = wapp_str8_split(&arena, &str, &delim2);
-
-  Str8RO splits1[] = {
-    wapp_str8_slice(&str, 0, 5),
-    wapp_str8_slice(&str, 6, 11),
-    wapp_str8_slice(&str, 12, 16),
-    wapp_str8_slice(&str, 17, 19),
-  };
-  Str8RO splits2[] = {
-    wapp_str8_slice(&str, 0, 12),
-    wapp_str8_slice(&str, 16, 19),
-  };
-
-  u64 index1    = 0;
-  u64 count1    = ARRLEN(splits1);
-  b8 running1  = true;
-
-  u64 index2    = 0;
-  u64 count2    = ARRLEN(splits2);
-  b8 running2  = true;
-
-  result = list1->node_count == count1 && wapp_str8_list_total_size(list1) == str.size - 3;
-  result = result && list2->node_count == count2 && wapp_str8_list_total_size(list2) == str.size - 4;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running1) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
-
-    ++index1;
-    running1 = index1 < count1;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running2) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
-
-    ++index2;
-    running2 = index2 < count2;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_split_with_max(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str       = wapp_str8_lit("hello world from me");
-  Str8 delim     = wapp_str8_lit(" ");
-  Str8List *list = wapp_str8_split_with_max(&arena, &str, &delim, 2);
-
-  Str8RO splits[] = {
-    wapp_str8_slice(&str, 0, 5),
-    wapp_str8_slice(&str, 6, 11),
-    wapp_str8_slice(&str, 12, 19),
-  };
-
-  u64 index    = 0;
-  u64 count    = ARRLEN(splits);
-  b8 running  = true;
-
-  result = list->node_count == count && wapp_str8_list_total_size(list) == str.size - 2;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-    result = result && wapp_str8_equal(node->item, &(splits[index]));
-
-    ++index;
-    running = index < count;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_rsplit(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str        = wapp_str8_lit("hello world from me");
-  Str8 delim1     = wapp_str8_lit(" ");
-  Str8 delim2     = wapp_str8_lit("from");
-  Str8List *list1 = wapp_str8_rsplit(&arena, &str, &delim1);
-  Str8List *list2 = wapp_str8_rsplit(&arena, &str, &delim2);
-
-  Str8RO splits1[] = {
-    wapp_str8_slice(&str, 0, 5),
-    wapp_str8_slice(&str, 6, 11),
-    wapp_str8_slice(&str, 12, 16),
-    wapp_str8_slice(&str, 17, 19),
-  };
-  Str8RO splits2[] = {
-    wapp_str8_slice(&str, 0, 12),
-    wapp_str8_slice(&str, 16, 19),
-  };
-
-  u64 index1    = 0;
-  u64 count1    = ARRLEN(splits1);
-  b8 running1  = true;
-
-  u64 index2    = 0;
-  u64 count2    = ARRLEN(splits2);
-  b8 running2  = true;
-
-  result = list1->node_count == count1 && wapp_str8_list_total_size(list1) == str.size - 3;
-  result = result && list2->node_count == count2 && wapp_str8_list_total_size(list2) == str.size - 4;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running1) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list1, index1);
-    result = result && wapp_str8_equal(node->item, &(splits1[index1]));
-
-    ++index1;
-    running1 = index1 < count1;
-  }
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running2) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list2, index2);
-    result = result && wapp_str8_equal(node->item, &(splits2[index2]));
-
-    ++index2;
-    running2 = index2 < count2;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_rsplit_with_max(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str       = wapp_str8_lit("hello world from me");
-  Str8 delim     = wapp_str8_lit(" ");
-  Str8List *list = wapp_str8_rsplit_with_max(&arena, &str, &delim, 2);
-
-  Str8RO splits[] = {
-    wapp_str8_slice(&str, 0, 11),
-    wapp_str8_slice(&str, 12, 16),
-    wapp_str8_slice(&str, 17, 19),
-  };
-
-  u64 index    = 0;
-  u64 count    = ARRLEN(splits);
-  b8 running  = true;
-
-  result = list->node_count == count && wapp_str8_list_total_size(list) == str.size - 2;
-
-  // NOTE (Abdelrahman): Uses a while loop instead of a for loop to get rid of
-  // MSVC Spectre mitigation warnings
-  while (running) {
-    Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, list, index);
-    result = result && wapp_str8_equal(node->item, &(splits[index]));
-
-    ++index;
-    running = index < count;
-  }
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_join(void) {
-  b8 result;
-  Allocator arena = wapp_mem_arena_allocator_init(KB(100));
-
-  Str8 str        = wapp_str8_lit("hello world from me");
-  Str8 delim1     = wapp_str8_lit(" ");
-  Str8 delim2     = wapp_str8_lit("from");
-  Str8List *list1 = wapp_str8_rsplit(&arena, &str, &delim1);
-  Str8List *list2 = wapp_str8_rsplit(&arena, &str, &delim2);
-  Str8 *join1     = wapp_str8_join(&arena, list1, &delim1);
-  Str8 *join2     = wapp_str8_join(&arena, list2, &delim2);
-
-  result = join1->size == str.size && wapp_str8_equal(join1, &str);
-  result = result && join2->size == str.size && wapp_str8_equal(join2, &str);
-
-  wapp_mem_arena_allocator_destroy(&arena);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_from_bytes(void) {
-  b8 result;
-
-  Str8 str      = wapp_str8_buf(1024);
-  Str8 expected = wapp_str8_lit_ro("WAPP");
-  U8Array bytes = wapp_array(u8, U8Array, 'W', 'A', 'P', 'P');
-  wapp_str8_from_bytes(&str, &bytes);
-
-  result = str.size == bytes.count * bytes.item_size;
-  result = result && wapp_str8_equal(&str, &expected);
-
-  return wapp_tester_result(result);
-}
--- a/tests/str8/test_str8.h
+++ b/tests/str8/test_str8.h
@@ -1,33 +0,0 @@
-#ifndef TEST_STR8_H
-#define TEST_STR8_H
-
-#include "wapp.h"
-
-TestFuncResult test_str8_lit(void);
-TestFuncResult test_str8_lit_ro(void);
-TestFuncResult test_str8_buf(void);
-TestFuncResult test_str8_alloc_buf(void);
-TestFuncResult test_str8_alloc_cstr(void);
-TestFuncResult test_str8_alloc_str8(void);
-TestFuncResult test_str8_alloc_substr(void);
-TestFuncResult test_str8_alloc_concat(void);
-TestFuncResult test_str8_get_index_within_bounds(void);
-TestFuncResult test_str8_get_index_out_of_bounds(void);
-TestFuncResult test_str8_set(void);
-TestFuncResult test_str8_push_back(void);
-TestFuncResult test_str8_equal(void);
-TestFuncResult test_str8_slice(void);
-TestFuncResult test_str8_concat_capped(void);
-TestFuncResult test_str8_copy_cstr_capped(void);
-TestFuncResult test_str8_copy_str8_capped(void);
-TestFuncResult test_str8_format(void);
-TestFuncResult test_str8_find(void);
-TestFuncResult test_str8_rfind(void);
-TestFuncResult test_str8_split(void);
-TestFuncResult test_str8_split_with_max(void);
-TestFuncResult test_str8_rsplit(void);
-TestFuncResult test_str8_rsplit_with_max(void);
-TestFuncResult test_str8_join(void);
-TestFuncResult test_str8_from_bytes(void);
-
-#endif // !TEST_STR8_H
--- a/tests/str8/test_str8_list.c
+++ b/tests/str8/test_str8_list.c
@@ -1,263 +0,0 @@
-#include "test_str8_list.h"
-#include "wapp.h"
-
-TestFuncResult test_str8_list_get(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0);
-  result = node->item == &s1 && wapp_str8_equal(node->item, &s1);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 1);
-  result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-  result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 3);
-  result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 4);
-  result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_push_front(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-
-  wapp_dbl_list_push_front(Str8, &list, &n1);
-  result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  wapp_dbl_list_push_front(Str8, &list, &n2);
-  result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  wapp_dbl_list_push_front(Str8, &list, &n3);
-  result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_push_back(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_insert(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-  Str8 s6 = wapp_str8_lit("6");
-  Str8 s7 = wapp_str8_lit("7");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-  Str8Node n6   = wapp_str8_node_from_str8(s6);
-  Str8Node n7   = wapp_str8_node_from_str8(s7);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node;
-  wapp_dbl_list_insert(Str8, &list, &n6, 2);
-  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-  result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
-  wapp_dbl_list_insert(Str8, &list, &n7, 5);
-  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 5);
-  result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_pop_front(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_pop_back(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_front(Str8, &list, &n1);
-  wapp_dbl_list_push_front(Str8, &list, &n2);
-  wapp_dbl_list_push_front(Str8, &list, &n3);
-  wapp_dbl_list_push_front(Str8, &list, &n4);
-  wapp_dbl_list_push_front(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_remove(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_empty(void) {
-  b8 result;
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("Hello"));
-  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("from"));
-  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("wizapp"));
-  wapp_dbl_list_push_back(Str8, &list, &wapp_str8_node_from_cstr("stdlib"));
-
-  wapp_dbl_list_empty(Str8, &list);
-
-  result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;
-
-  return wapp_tester_result(result);
-}
--- a/tests/str8/test_str8_list.cc
+++ b/tests/str8/test_str8_list.cc
@@ -1,271 +0,0 @@
-#include "test_str8_list.h"
-#include "wapp.h"
-
-TestFuncResult test_str8_list_get(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_get(Str8, Str8Node, &list, 0);
-  result = node->item == &s1 && wapp_str8_equal(node->item, &s1);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 1);
-  result = result && node->item == &s2 && wapp_str8_equal(node->item, &s2);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-  result = result && node->item == &s3 && wapp_str8_equal(node->item, &s3);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 3);
-  result = result && node->item == &s4 && wapp_str8_equal(node->item, &s4);
-
-  node = wapp_dbl_list_get(Str8, Str8Node, &list, 4);
-  result = result && node->item == &s5 && wapp_str8_equal(node->item, &s5);
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_push_front(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-
-  wapp_dbl_list_push_front(Str8, &list, &n1);
-  result = list.first == list.last && list.first == &n1 && list.first->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  wapp_dbl_list_push_front(Str8, &list, &n2);
-  result = result && list.first == &n2 && list.first->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  wapp_dbl_list_push_front(Str8, &list, &n3);
-  result = result && list.first == &n3 && list.first->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_push_back(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  result = list.first == list.last && list.last == &n1 && list.last->item == &s1 && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  result = result && list.last == &n2 && list.last->item == &s2 && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  result = result && list.last == &n3 && list.last->item == &s3 && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_insert(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-  Str8 s6 = wapp_str8_lit("6");
-  Str8 s7 = wapp_str8_lit("7");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-  Str8Node n6   = wapp_str8_node_from_str8(s6);
-  Str8Node n7   = wapp_str8_node_from_str8(s7);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node;
-  wapp_dbl_list_insert(Str8, &list, &n6, 2);
-  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 2);
-  result = node != NULL && node->item == &s6 && wapp_str8_list_total_size(&list) == 6 && list.node_count == 6;
-  wapp_dbl_list_insert(Str8, &list, &n7, 5);
-  node   = wapp_dbl_list_get(Str8, Str8Node, &list, 5);
-  result = result && node != NULL && node->item == &s7 && wapp_str8_list_total_size(&list) == 7 && list.node_count == 7;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_pop_front(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  node = wapp_dbl_list_pop_front(Str8, Str8Node, &list);
-  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_pop_back(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_front(Str8, &list, &n1);
-  wapp_dbl_list_push_front(Str8, &list, &n2);
-  wapp_dbl_list_push_front(Str8, &list, &n3);
-  wapp_dbl_list_push_front(Str8, &list, &n4);
-  wapp_dbl_list_push_front(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  node = wapp_dbl_list_pop_back(Str8, Str8Node, &list);
-  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_remove(void) {
-  b8 result;
-
-  Str8 s1 = wapp_str8_lit("1");
-  Str8 s2 = wapp_str8_lit("2");
-  Str8 s3 = wapp_str8_lit("3");
-  Str8 s4 = wapp_str8_lit("4");
-  Str8 s5 = wapp_str8_lit("5");
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-  Str8Node n1   = wapp_str8_node_from_str8(s1);
-  Str8Node n2   = wapp_str8_node_from_str8(s2);
-  Str8Node n3   = wapp_str8_node_from_str8(s3);
-  Str8Node n4   = wapp_str8_node_from_str8(s4);
-  Str8Node n5   = wapp_str8_node_from_str8(s5);
-
-  wapp_dbl_list_push_back(Str8, &list, &n1);
-  wapp_dbl_list_push_back(Str8, &list, &n2);
-  wapp_dbl_list_push_back(Str8, &list, &n3);
-  wapp_dbl_list_push_back(Str8, &list, &n4);
-  wapp_dbl_list_push_back(Str8, &list, &n5);
-
-  Str8Node *node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = node == &n1 && node->item == &s1 && wapp_str8_equal(node->item, &s1) && wapp_str8_list_total_size(&list) == 4 && list.node_count == 4;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n2 && node->item == &s2 && wapp_str8_equal(node->item, &s2) && wapp_str8_list_total_size(&list) == 3 && list.node_count == 3;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n3 && node->item == &s3 && wapp_str8_equal(node->item, &s3) && wapp_str8_list_total_size(&list) == 2 && list.node_count == 2;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n4 && node->item == &s4 && wapp_str8_equal(node->item, &s4) && wapp_str8_list_total_size(&list) == 1 && list.node_count == 1;
-
-  node = wapp_dbl_list_remove(Str8, Str8Node, &list, 0);
-  result = result && node == &n5 && node->item == &s5 && wapp_str8_equal(node->item, &s5) && wapp_str8_list_total_size(&list) == 0 && list.node_count == 0;
-
-  return wapp_tester_result(result);
-}
-
-TestFuncResult test_str8_list_empty(void) {
-  b8 result;
-
-  Str8List list = wapp_dbl_list(Str8, Str8List);
-
-  Str8Node hello = wapp_str8_node_from_cstr("Hello");
-  wapp_dbl_list_push_back(Str8, &list, &hello);
-
-  Str8Node from = wapp_str8_node_from_cstr("from");
-  wapp_dbl_list_push_back(Str8, &list, &from);
-
-  Str8Node wizapp = wapp_str8_node_from_cstr("wizapp");
-  wapp_dbl_list_push_back(Str8, &list, &wizapp);
-
-  Str8Node stdlib = wapp_str8_node_from_cstr("stdlib");
-  wapp_dbl_list_push_back(Str8, &list, &stdlib);
-
-  wapp_dbl_list_empty(Str8, &list);
-
-  result = list.first == NULL && list.last == NULL && list.node_count == 0 && wapp_str8_list_total_size(&list) == 0;
-
-  return wapp_tester_result(result);
-}
--- a/tests/str8/test_str8_list.h
+++ b/tests/str8/test_str8_list.h
@@ -1,15 +0,0 @@
-#ifndef TEST_STR8_LIST_H
-#define TEST_STR8_LIST_H
-
-#include "wapp.h"
-
-TestFuncResult test_str8_list_get(void);
-TestFuncResult test_str8_list_push_front(void);
-TestFuncResult test_str8_list_push_back(void);
-TestFuncResult test_str8_list_insert(void);
-TestFuncResult test_str8_list_pop_front(void);
-TestFuncResult test_str8_list_pop_back(void);
-TestFuncResult test_str8_list_remove(void);
-TestFuncResult test_str8_list_empty(void);
-
-#endif // !TEST_STR8_LIST_H
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Abdelrahman Said	f23f85e305	Update .gitignore	2024-10-07 08:04:47 +01:00
Abdelrahman Said	751192173f	Implement very basic Str8 type	2024-10-07 08:03:56 +01:00
Abdelrahman Said	1108ed686e	Switch to using snprintf instead of sprintf	2024-10-07 08:01:33 +01:00
Abdelrahman	36e88ba84d	Remove old strings implementation	2024-10-06 22:41:43 +01:00
Abdelrahman	0617ca2316	Update compile script	2024-10-06 22:06:57 +01:00