All: Migrate includes to separate directory

CMakeLists.txt

@@ -65,7 +65,7 @@ source_group("GBA board" FILES ${GBA_SRC} ${GBA_RENDERER_SRC} ${GBA_SIO_SRC})
 source_group("GBA extra" FILES ${GBA_CHEATS_SRC} ${GBA_RR_SRC})
 source_group("GB board" FILES ${GB_SRC} ${GB_SIO_SRC})
 source_group("Utilities" FILES ${UTIL_SRC})
-include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
+include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type (e.g. Release or Debug)" FORCE)
@@ -774,7 +774,7 @@ if(BUILD_EXAMPLE)
 		target_link_libraries(${BINARY_NAME}-example-client ${BINARY_NAME} ${SDL_LIBRARY} ${SDLMAIN_LIBRARY} ${OPENGL_LIBRARY} ${OPENGLES2_LIBRARY})
 		set_target_properties(${BINARY_NAME}-example-client PROPERTIES
 		                      COMPILE_DEFINITIONS "${OS_DEFINES};${FEATURE_DEFINES};${FUNCTION_DEFINES}"
-		                      INCLUDE_DIRECTORIES "${SDL_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/src")
+		                      INCLUDE_DIRECTORIES "${SDL_INCLUDE_DIR};${CMAKE_CURRENT_SOURCE_DIR}/src;${CMAKE_CURRENT_SOURCE_DIR}/include")
 	endif()
 endif()
 

include/mgba-util/circle-buffer.h

@@ -6,7 +6,7 @@
 #ifndef CIRCLE_BUFFER_H
 #define CIRCLE_BUFFER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/configuration.h

@@ -6,11 +6,11 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/table.h"
+#include <mgba-util/table.h>
 
 struct VFile;
 

include/mgba-util/crc32.h

@@ -6,7 +6,7 @@
 #ifndef CRC32_H
 #define CRC32_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/export.h

@@ -6,7 +6,7 @@
 #ifndef EXPORT_H
 #define EXPORT_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/formatting.h

@@ -6,7 +6,7 @@
 #ifndef FORMATTING_H
 #define FORMATTING_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/gui.h

@@ -6,12 +6,13 @@
 #ifndef GUI_H
 #define GUI_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/input.h"
-#include "util/vector.h"
+// TODO: Fix layering violation
+#include <mgba/core/input.h>
+#include <mgba-util/vector.h>
 
 struct GUIFont;
 

include/mgba-util/gui/file-select.h

@@ -6,11 +6,11 @@
 #ifndef GUI_FILE_CHOOSER_H
 #define GUI_FILE_CHOOSER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/gui.h"
+#include <mgba-util/gui.h>
 
 struct VFile;
 

include/mgba-util/gui/font-metrics.h

@@ -6,7 +6,7 @@
 #ifndef DEFAULT_FONT_METRICS_H
 #define DEFAULT_FONT_METRICS_H
 
-#include "util/gui/font.h"
+#include <mgba-util/gui/font.h>
 
 extern struct GUIFontGlyphMetric defaultFontMetrics[];
 extern struct GUIIconMetric defaultIconMetrics[];

include/mgba-util/gui/font.h

@@ -6,7 +6,7 @@
 #ifndef GUI_FONT_H
 #define GUI_FONT_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/gui/menu.h

@@ -6,11 +6,11 @@
 #ifndef GUI_MENU_H
 #define GUI_MENU_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/vector.h"
+#include <mgba-util/vector.h>
 
 struct GUIMenu;
 struct GUIMenuItem {

include/mgba-util/hash.h

@@ -6,7 +6,7 @@
 #ifndef HASH_H
 #define HASH_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/math.h

@@ -6,7 +6,7 @@
 #ifndef UTIL_MATH_H
 #define UTIL_MATH_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/memory.h

@@ -6,7 +6,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/nointro.h

@@ -6,7 +6,7 @@
 #ifndef NOINTRO_H
 #define NOINTRO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/patch.h

@@ -6,7 +6,7 @@
 #ifndef PATCH_H
 #define PATCH_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/patch/fast.h

@@ -6,12 +6,12 @@
 #ifndef PATCH_FAST_H
 #define PATCH_FAST_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/patch.h"
-#include "util/vector.h"
+#include <mgba-util/patch.h>
+#include <mgba-util/vector.h>
 
 #define PATCH_FAST_EXTENT 256
 

include/mgba-util/patch/ips.h

@@ -6,7 +6,7 @@
 #ifndef PATCH_IPS_H
 #define PATCH_IPS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/patch/ups.h

@@ -6,7 +6,7 @@
 #ifndef PATCH_UPS_H
 #define PATCH_UPS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/platform/3ds/3ds-vfs.h

@@ -6,7 +6,7 @@
 #ifndef N3DS_VFS_H
 #define N3DS_VFS_H
 
-#include "util/vfs.h"
+#include <mgba-util/vfs.h>
 
 #include <3ds.h>
 

include/mgba-util/platform/3ds/threading.h

@@ -6,7 +6,7 @@
 #ifndef N3DS_THREADING_H
 #define N3DS_THREADING_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 #include <3ds.h>
 #include <malloc.h>

include/mgba-util/platform/posix/threading.h

@@ -6,7 +6,7 @@
 #ifndef POSIX_THREADING_H
 #define POSIX_THREADING_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/platform/windows/threading.h

@@ -6,7 +6,7 @@
 #ifndef WINDOWS_THREADING_H
 #define WINDOWS_THREADING_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 #define _WIN32_WINNT 0x0600
 #include <windows.h>

include/mgba-util/png-io.h

@@ -6,7 +6,7 @@
 #ifndef PNG_IO_H
 #define PNG_IO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/ring-fifo.h

@@ -6,7 +6,7 @@
 #ifndef RING_FIFO_H
 #define RING_FIFO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/socket.h

@@ -6,7 +6,7 @@
 #ifndef SOCKET_H
 #define SOCKET_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/string.h

@@ -6,7 +6,7 @@
 #ifndef UTIL_STRING_H
 #define UTIL_STRING_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/table.h

@@ -6,7 +6,7 @@
 #ifndef TABLE_H
 #define TABLE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/text-codec.h

@@ -6,7 +6,7 @@
 #ifndef TEXT_CODEC_H
 #define TEXT_CODEC_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/threading.h

@@ -6,19 +6,19 @@
 #ifndef THREADING_H
 #define THREADING_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
 #ifndef DISABLE_THREADING
 #ifdef USE_PTHREADS
-#include "platform/posix/threading.h"
+#include <mgba-util/platform/posix/threading.h>
 #elif _WIN32
-#include "platform/windows/threading.h"
+#include <mgba-util/platform/windows/threading.h>
 #elif PSP2
-#include "platform/psp2/threading.h"
+#include <mgba-util/platform/psp2/threading.h>
 #elif _3DS
-#include "platform/3ds/threading.h"
+#include <mgba-util/platform/3ds/threading.h>
 #else
 #define DISABLE_THREADING
 #endif

include/mgba-util/vector.h

@@ -6,7 +6,7 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba-util/vfs.h

@@ -6,7 +6,7 @@
 #ifndef VFS_H
 #define VFS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
@@ -84,7 +84,7 @@ struct VDir* VDirOpenZip(const char* path, int flags);
 struct VDir* VDirOpen7z(const char* path, int flags);
 #endif
 
-#if defined(WII) || defined(_3DS)
+#if defined(__wii__) || defined(_3DS)
 struct VFile* VFileFOpen(const char* path, const char* mode);
 struct VFile* VFileFromFILE(FILE* file);
 struct VDir* VDeviceList(void);

include/mgba/core/cheats.h

@@ -6,13 +6,13 @@
 #ifndef CHEATS_H
 #define CHEATS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/cpu.h"
-#include "core/log.h"
-#include "util/vector.h"
+#include <mgba/core/cpu.h>
+#include <mgba/core/log.h>
+#include <mgba-util/vector.h>
 
 #define MAX_ROM_PATCHES 4
 

include/mgba/core/config.h

@@ -6,11 +6,11 @@
 #ifndef M_CORE_CONFIG_H
 #define M_CORE_CONFIG_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/configuration.h"
+#include <mgba-util/configuration.h>
 
 struct mCoreConfig {
 	struct Configuration configTable;

include/mgba/core/core.h

@@ -6,20 +6,21 @@
 #ifndef M_CORE_H
 #define M_CORE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/config.h"
+#include <mgba/core/config.h>
 #if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2
-#include "core/directories.h"
+#include <mgba/core/directories.h>
 #endif
 #ifndef MINIMAL_CORE
-#include "core/input.h"
+#include <mgba/core/input.h>
 #endif
-#include "core/interface.h"
+#include <mgba/core/interface.h>
 #ifdef USE_DEBUGGERS
-#include "debugger/debugger.h"
+// TODO: Fix layering violation
+#include <mgba/internal/debugger/debugger.h>
 #endif
 
 enum mPlatform {

include/mgba/core/cpu.h

@@ -6,7 +6,7 @@
 #ifndef M_CPU_H
 #define M_CPU_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/directories.h

@@ -6,7 +6,7 @@
 #ifndef DIRECTORIES_H
 #define DIRECTORIES_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/input.h

@@ -6,7 +6,7 @@
 #ifndef M_INPUT_H
 #define M_INPUT_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/interface.h

@@ -6,7 +6,7 @@
 #ifndef CORE_INTERFACE_H
 #define CORE_INTERFACE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/library.h

@@ -6,12 +6,12 @@
 #ifndef M_LIBRARY_H
 #define M_LIBRARY_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/core.h"
-#include "util/vector.h"
+#include <mgba/core/core.h>
+#include <mgba-util/vector.h>
 
 struct mLibraryEntry {
 	char* filename;

include/mgba/core/lockstep.h

@@ -6,7 +6,7 @@
 #ifndef SIO_LOCKSTEP_H
 #define SIO_LOCKSTEP_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/log.h

@@ -6,7 +6,7 @@
 #ifndef M_LOG_H
 #define M_LOG_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/rewind.h

@@ -6,11 +6,11 @@
 #ifndef M_CORE_REWIND_H
 #define M_CORE_REWIND_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/vector.h"
+#include <mgba-util/vector.h>
 
 DECLARE_VECTOR(mCoreRewindPatches, struct PatchFast);
 

include/mgba/core/serialize.h

@@ -6,7 +6,7 @@
 #ifndef M_SERIALIZE_H
 #define M_SERIALIZE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/sync.h

@@ -6,11 +6,11 @@
 #ifndef M_CORE_SYNC_H
 #define M_CORE_SYNC_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "util/threading.h"
+#include <mgba-util/threading.h>
 
 struct mCoreSync {
 	int videoFramePending;

include/mgba/core/thread.h

@@ -6,14 +6,14 @@
 #ifndef M_CORE_THREAD_H
 #define M_CORE_THREAD_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
-#include "core/rewind.h"
-#include "core/sync.h"
-#include "util/threading.h"
+#include <mgba/core/log.h>
+#include <mgba/core/rewind.h>
+#include <mgba/core/sync.h>
+#include <mgba-util/threading.h>
 
 struct mCoreThread;
 struct mCore;

include/mgba/core/tile-cache.h

@@ -6,7 +6,7 @@
 #ifndef M_TILE_CACHE_H
 #define M_TILE_CACHE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/core/timing.h

@@ -6,7 +6,7 @@
 #ifndef M_CORE_TIMING
 #define M_CORE_TIMING
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/gb/core.h

@@ -6,7 +6,7 @@
 #ifndef GB_CORE_H
 #define GB_CORE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/gb/interface.h

@@ -6,7 +6,7 @@
 #ifndef GB_INTERFACE_H
 #define GB_INTERFACE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/gba/core.h

@@ -6,7 +6,7 @@
 #ifndef GBA_CORE_H
 #define GBA_CORE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/gba/interface.h

@@ -6,11 +6,11 @@
 #ifndef GBA_INTERFACE_H
 #define GBA_INTERFACE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/interface.h"
+#include <mgba/core/interface.h>
 
 enum GBASIOMode {
 	SIO_NORMAL_8 = 0,

include/mgba/internal/arm/arm.h

@@ -6,11 +6,11 @@
 #ifndef ARM_H
 #define ARM_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/cpu.h"
+#include <mgba/core/cpu.h>
 
 enum {
 	ARM_SP = 13,

include/mgba/internal/arm/debugger/cli-debugger.h

@@ -6,7 +6,7 @@
 #ifndef ARM_CLI_DEBUGGER_H
 #define ARM_CLI_DEBUGGER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/internal/arm/debugger/debugger.h

@@ -6,13 +6,13 @@
 #ifndef ARM_DEBUGGER_H
 #define ARM_DEBUGGER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "debugger/debugger.h"
+#include <mgba/internal/debugger/debugger.h>
 
-#include "arm/arm.h"
+#include <mgba/internal/arm/arm.h>
 
 struct ARMDebugBreakpoint {
 	uint32_t address;

include/mgba/internal/arm/debugger/memory-debugger.h

@@ -6,7 +6,7 @@
 #ifndef MEMORY_DEBUGGER_H
 #define MEMORY_DEBUGGER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/internal/arm/decoder.h

@@ -6,11 +6,11 @@
 #ifndef ARM_DECODER_H
 #define ARM_DECODER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "arm.h"
+#include <mgba/internal/arm/arm.h>
 
 // Bit 0: a register is involved with this operand
 // Bit 1: an immediate is invovled with this operand

include/mgba/internal/arm/isa-arm.h

@@ -6,7 +6,7 @@
 #ifndef ISA_ARM_H
 #define ISA_ARM_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/internal/arm/isa-thumb.h

@@ -6,7 +6,7 @@
 #ifndef ISA_THUMB_H
 #define ISA_THUMB_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/internal/arm/macros.h

@@ -6,7 +6,7 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 #define LOAD_64 LOAD_64LE
 #define LOAD_32 LOAD_32LE

include/mgba/internal/debugger/cli-debugger.h

@@ -6,11 +6,11 @@
 #ifndef CLI_DEBUGGER_H
 #define CLI_DEBUGGER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "debugger.h"
+#include <mgba/internal/debugger/debugger.h>
 
 struct CLIDebugger;
 

include/mgba/internal/debugger/debugger.h

@@ -6,13 +6,13 @@
 #ifndef DEBUGGER_H
 #define DEBUGGER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/cpu.h"
-#include "core/log.h"
-#include "util/vector.h"
+#include <mgba/core/cpu.h>
+#include <mgba/core/log.h>
+#include <mgba-util/vector.h>
 
 mLOG_DECLARE_CATEGORY(DEBUGGER);
 

include/mgba/internal/debugger/gdb-stub.h

@@ -6,13 +6,13 @@
 #ifndef GDB_STUB_H
 #define GDB_STUB_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "debugger/debugger.h"
+#include <mgba/internal/debugger/debugger.h>
 
-#include "util/socket.h"
+#include <mgba-util/socket.h>
 
 #define GDB_STUB_MAX_LINE 1200
 #define GDB_STUB_INTERVAL 32

include/mgba/internal/debugger/parser.h

@@ -6,11 +6,11 @@
 #ifndef PARSER_H
 #define PARSER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "debugger.h"
+#include <mgba/internal/debugger/debugger.h>
 
 enum LexState {
 	LEX_ERROR = -1,

include/mgba/internal/gb/audio.h

@@ -6,12 +6,11 @@
 #ifndef GB_AUDIO_H
 #define GB_AUDIO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/timing.h"
-#include "third-party/blip_buf/blip_buf.h"
+#include <mgba/core/timing.h>
 
 DECL_BITFIELD(GBAudioRegisterDuty, uint8_t);
 DECL_BITS(GBAudioRegisterDuty, Length, 0, 6);
@@ -157,8 +156,8 @@ struct GBAudio {
 	struct GBAudioWaveChannel ch3;
 	struct GBAudioNoiseChannel ch4;
 
-	blip_t* left;
-	blip_t* right;
+	struct blip_t* left;
+	struct blip_t* right;
 	int16_t lastLeft;
 	int16_t lastRight;
 	int clock;

include/mgba/internal/gb/cheats.h

@@ -6,12 +6,12 @@
 #ifndef GB_CHEATS_H
 #define GB_CHEATS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/cheats.h"
-#include "util/vector.h"
+#include <mgba/core/cheats.h>
+#include <mgba-util/vector.h>
 
 enum GBCheatType {
 	GB_CHEAT_AUTODETECT,

include/mgba/internal/gb/extra/cli.h

@@ -6,11 +6,11 @@
 #ifndef GB_CLI_H
 #define GB_CLI_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "debugger/cli-debugger.h"
+#include <mgba/internal/debugger/cli-debugger.h>
 
 struct GBCLIDebugger {
 	struct CLIDebuggerSystem d;

include/mgba/internal/gb/gb.h

@@ -6,21 +6,19 @@
 #ifndef GB_H
 #define GB_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
-#include "core/timing.h"
+#include <mgba/core/cpu.h>
+#include <mgba/core/log.h>
+#include <mgba/core/timing.h>
 
-#include "lr35902/lr35902.h"
-
-#include "gb/audio.h"
-#include "gb/interface.h"
-#include "gb/memory.h"
-#include "gb/sio.h"
-#include "gb/timer.h"
-#include "gb/video.h"
+#include <mgba/internal/gb/audio.h>
+#include <mgba/internal/gb/memory.h>
+#include <mgba/internal/gb/sio.h>
+#include <mgba/internal/gb/timer.h>
+#include <mgba/internal/gb/video.h>
 
 extern const uint32_t DMG_LR35902_FREQUENCY;
 extern const uint32_t CGB_LR35902_FREQUENCY;
@@ -45,6 +43,7 @@ enum GBIRQVector {
 	GB_VECTOR_KEYPAD = 0x60,
 };
 
+struct LR35902Core;
 struct mCoreSync;
 struct mAVStream;
 struct mCoreCallbacks;

include/mgba/internal/gb/io.h

@@ -6,11 +6,11 @@
 #ifndef GB_IO_H
 #define GB_IO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
+#include <mgba/core/log.h>
 
 mLOG_DECLARE_CATEGORY(GB_IO);
 

include/mgba/internal/gb/mbc.h

@@ -6,11 +6,11 @@
 #ifndef GB_MBC_H
 #define GB_MBC_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
+#include <mgba/core/log.h>
 
 mLOG_DECLARE_CATEGORY(GB_MBC);
 

include/mgba/internal/gb/memory.h

@@ -6,14 +6,13 @@
 #ifndef GB_MEMORY_H
 #define GB_MEMORY_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
-#include "core/timing.h"
-#include "gb/interface.h"
-#include "lr35902/lr35902.h"
+#include <mgba/core/log.h>
+#include <mgba/core/timing.h>
+#include <mgba/gb/interface.h>
 
 #include <time.h>
 
@@ -154,6 +153,7 @@ struct GBMemory {
 	struct mRumble* rumble;
 };
 
+struct LR35902Core;
 void GBMemoryInit(struct GB* gb);
 void GBMemoryDeinit(struct GB* gb);
 

include/mgba/internal/gb/overrides.h

@@ -6,11 +6,11 @@
 #ifndef GB_OVERRIDES_H
 #define GB_OVERRIDES_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "gb/interface.h"
+#include <mgba/gb/interface.h>
 
 struct GBCartridgeOverride {
 	int headerCrc32;

include/mgba/internal/gb/renderers/software.h

@@ -6,13 +6,13 @@
 #ifndef GB_RENDERER_SOFTWARE_H
 #define GB_RENDERER_SOFTWARE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/core.h"
-#include "gb/gb.h"
-#include "gb/video.h"
+#include <mgba/core/core.h>
+#include <mgba/internal/gb/gb.h>
+#include <mgba/internal/gb/video.h>
 
 struct GBVideoSoftwareRenderer {
 	struct GBVideoRenderer d;

include/mgba/internal/gb/renderers/tile-cache.h

@@ -6,7 +6,7 @@
 #ifndef GB_TILE_CACHE_H
 #define GB_TILE_CACHE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/internal/gb/serialize.h

@@ -6,12 +6,12 @@
 #ifndef GB_SERIALIZE_H
 #define GB_SERIALIZE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/core.h"
-#include "gb/gb.h"
+#include <mgba/core/core.h>
+#include <mgba/internal/gb/gb.h>
 
 extern const uint32_t GB_SAVESTATE_MAGIC;
 extern const uint32_t GB_SAVESTATE_VERSION;

include/mgba/internal/gb/sio.h

@@ -6,12 +6,12 @@
 #ifndef GB_SIO_H
 #define GB_SIO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
-#include "core/timing.h"
+#include <mgba/core/log.h>
+#include <mgba/core/timing.h>
 
 #define MAX_GBS 2
 

include/mgba/internal/gb/sio/lockstep.h

@@ -6,13 +6,13 @@
 #ifndef GB_SIO_LOCKSTEP_H
 #define GB_SIO_LOCKSTEP_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/lockstep.h"
-#include "core/timing.h"
-#include "gb/sio.h"
+#include <mgba/core/lockstep.h>
+#include <mgba/core/timing.h>
+#include <mgba/internal/gb/sio.h>
 
 struct GBSIOLockstep {
 	struct mLockstep d;

include/mgba/internal/gb/timer.h

@@ -6,11 +6,11 @@
 #ifndef GB_TIMER_H
 #define GB_TIMER_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/timing.h"
+#include <mgba/core/timing.h>
 
 DECL_BITFIELD(GBRegisterTAC, uint8_t);
 DECL_BITS(GBRegisterTAC, Clock, 0, 2);

include/mgba/internal/gb/video.h

@@ -6,14 +6,12 @@
 #ifndef GB_VIDEO_H
 #define GB_VIDEO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/interface.h"
-#include "core/timing.h"
-#include "gb/interface.h"
-#include "gb/memory.h"
+#include <mgba/core/timing.h>
+#include <mgba/gb/interface.h>
 
 enum {
 	GB_VIDEO_HORIZONTAL_PIXELS = 160,
@@ -55,7 +53,6 @@ union GBOAM {
 	uint8_t raw[160];
 };
 
-enum GBModel;
 struct mTileCache;
 struct GBVideoRenderer {
 	void (*init)(struct GBVideoRenderer* renderer, enum GBModel model);

include/mgba/internal/gba/audio.h

@@ -6,13 +6,13 @@
 #ifndef GBA_AUDIO_H
 #define GBA_AUDIO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/log.h"
-#include "gb/audio.h"
-#include "util/circle-buffer.h"
+#include <mgba/core/log.h>
+#include <mgba/internal/gb/audio.h>
+#include <mgba-util/circle-buffer.h>
 
 mLOG_DECLARE_CATEGORY(GBA_AUDIO);
 

include/mgba/internal/gba/bios.h

@@ -6,15 +6,15 @@
 #ifndef GBA_BIOS_H
 #define GBA_BIOS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "arm/arm.h"
-#include "core/log.h"
+#include <mgba/core/log.h>
 
 mLOG_DECLARE_CATEGORY(GBA_BIOS);
 
+struct ARMCore;
 void GBASwi16(struct ARMCore* cpu, int immediate);
 void GBASwi32(struct ARMCore* cpu, int immediate);
 

include/mgba/internal/gba/cheats.h

@@ -6,12 +6,12 @@
 #ifndef GBA_CHEATS_H
 #define GBA_CHEATS_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "arm/arm.h"
-#include "core/cheats.h"
+#include <mgba/internal/arm/arm.h>
+#include <mgba/core/cheats.h>
 
 #define MAX_ROM_PATCHES 4
 #define COMPLETE ((size_t) -1)

include/mgba/internal/gba/dma.h

@@ -6,7 +6,7 @@
 #ifndef GBA_DMA_H
 #define GBA_DMA_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 

include/mgba/internal/gba/extra/cli.h

@@ -6,11 +6,11 @@
 #ifndef GBA_CLI_H
 #define GBA_CLI_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "debugger/cli-debugger.h"
+#include <mgba/internal/debugger/cli-debugger.h>
 
 struct mCore;
 

include/mgba/internal/gba/gba.h

@@ -6,20 +6,18 @@
 #ifndef GBA_H
 #define GBA_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "arm/arm.h"
-#include "core/log.h"
-#include "core/timing.h"
+#include <mgba/core/log.h>
+#include <mgba/core/timing.h>
 
-#include "gba/interface.h"
-#include "gba/memory.h"
-#include "gba/video.h"
-#include "gba/audio.h"
-#include "gba/sio.h"
-#include "gba/timer.h"
+#include <mgba/internal/gba/memory.h>
+#include <mgba/internal/gba/video.h>
+#include <mgba/internal/gba/audio.h>
+#include <mgba/internal/gba/sio.h>
+#include <mgba/internal/gba/timer.h>
 
 #define GBA_ARM7TDMI_FREQUENCY 0x1000000U
 
@@ -52,6 +50,7 @@ enum {
 	SP_BASE_SUPERVISOR = 0x03007FE0
 };
 
+struct ARMCore;
 struct GBA;
 struct Patch;
 struct VFile;

include/mgba/internal/gba/hardware.h

@@ -6,14 +6,13 @@
 #ifndef GBA_HARDWARE_H
 #define GBA_HARDWARE_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "arm/macros.h"
-#include "core/log.h"
-#include "core/timing.h"
-#include "gba/interface.h"
+#include <mgba/core/log.h>
+#include <mgba/core/timing.h>
+#include <mgba/gba/interface.h>
 
 #include <time.h>
 

include/mgba/internal/gba/input.h

@@ -6,11 +6,11 @@
 #ifndef GBA_INPUT_H
 #define GBA_INPUT_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "core/input.h"
+#include <mgba/core/input.h>
 
 extern const struct mInputPlatformInfo GBAInputInfo;
 

include/mgba/internal/gba/io.h

@@ -6,11 +6,11 @@
 #ifndef GBA_IO_H
 #define GBA_IO_H
 
-#include "util/common.h"
+#include <mgba-util/common.h>
 
 CXX_GUARD_START
 
-#include "gba/gba.h"
+#include <mgba/core/log.h>
 
 enum GBAIORegisters {
 	// Video
@@ -163,6 +163,7 @@ mLOG_DECLARE_CATEGORY(GBA_IO);
 
 extern const char* const GBAIORegisterNames[];
 
+struct GBA;
 void GBAIOInit(struct GBA* gba);
 void GBAIOWrite(struct GBA* gba, uint32_t address, uint16_t value);
 void GBAIOWrite8(struct GBA* gba, uint32_t address, uint8_t value);