diff --git a/.codacy.yml b/.codacy.yml
index 9420553..0d752ef 100644
--- a/.codacy.yml
+++ b/.codacy.yml
@@ -15,3 +15,4 @@ engines:
         - cppcheck-suppressions.txt
 exclude_paths:
   - src/util_safeio.c
+  - include/cppcheck_stubs/**
diff --git a/include/cppcheck_stubs/SIOCookie.h b/include/cppcheck_stubs/SIOCookie.h
new file mode 100644
index 0000000..6f89468
--- /dev/null
+++ b/include/cppcheck_stubs/SIOCookie.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int ee_sio_start(int baudrate, int mode, int parity, int stop, int ctrl, int intr);
diff --git a/include/cppcheck_stubs/ctype.h b/include/cppcheck_stubs/ctype.h
new file mode 100644
index 0000000..65ba795
--- /dev/null
+++ b/include/cppcheck_stubs/ctype.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int isspace(int c);
diff --git a/include/cppcheck_stubs/debug.h b/include/cppcheck_stubs/debug.h
new file mode 100644
index 0000000..f558c1b
--- /dev/null
+++ b/include/cppcheck_stubs/debug.h
@@ -0,0 +1,8 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int scr_printf(const char *fmt, ...);
+void scr_setfontcolor(int color);
+void scr_setbgcolor(int color);
+void scr_clear(void);
+void scr_setCursor(int cursor);
diff --git a/include/cppcheck_stubs/elf-loader.h b/include/cppcheck_stubs/elf-loader.h
new file mode 100644
index 0000000..0e244bf
--- /dev/null
+++ b/include/cppcheck_stubs/elf-loader.h
@@ -0,0 +1,5 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int LoadELFFromFile(const char *filename, int argc, const char *argv[]);
+int LoadELFFromFileWithPartition(const char *filename, const char *partition, int argc, const char *argv[]);
diff --git a/include/cppcheck_stubs/fileXio_rpc.h b/include/cppcheck_stubs/fileXio_rpc.h
new file mode 100644
index 0000000..65d637f
--- /dev/null
+++ b/include/cppcheck_stubs/fileXio_rpc.h
@@ -0,0 +1,10 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int fileXioInit(void);
+int fileXioDopen(const char *path);
+int fileXioDclose(int fd);
+int fileXioIoctl(int fd, int cmd, void *arg);
+int fileXioDevctl(const char *name, int cmd, void *arg, unsigned int arglen, void *buf, unsigned int buflen);
+int fileXioMount(const char *mnt, const char *dev, int flag);
+int fileXioUmount(const char *mnt);
diff --git a/include/cppcheck_stubs/hdd-ioctl.h b/include/cppcheck_stubs/hdd-ioctl.h
new file mode 100644
index 0000000..7691707
--- /dev/null
+++ b/include/cppcheck_stubs/hdd-ioctl.h
@@ -0,0 +1,18 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef HDIOC_STATUS
+#define HDIOC_STATUS 0
+#endif
+
+#ifndef HDIOC_SMARTSTAT
+#define HDIOC_SMARTSTAT 0
+#endif
+
+#ifndef HDIOC_GETSECTORERROR
+#define HDIOC_GETSECTORERROR 0
+#endif
+
+#ifndef HDIOC_GETERRORPARTNAME
+#define HDIOC_GETERRORPARTNAME 0
+#endif
diff --git a/include/cppcheck_stubs/io_common.h b/include/cppcheck_stubs/io_common.h
new file mode 100644
index 0000000..533fe16
--- /dev/null
+++ b/include/cppcheck_stubs/io_common.h
@@ -0,0 +1,14 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef FIO_MT_RDONLY
+#define FIO_MT_RDONLY 0
+#endif
+
+#ifndef PDIOC_CLOSEALL
+#define PDIOC_CLOSEALL 0
+#endif
+
+#ifndef DDIOC_OFF
+#define DDIOC_OFF 0
+#endif
diff --git a/include/cppcheck_stubs/iopcontrol.h b/include/cppcheck_stubs/iopcontrol.h
new file mode 100644
index 0000000..8ad6569
--- /dev/null
+++ b/include/cppcheck_stubs/iopcontrol.h
@@ -0,0 +1,5 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int SifIopReset(const char *arg, int mode);
+int SifIopSync(void);
diff --git a/include/cppcheck_stubs/iopcontrol_special.h b/include/cppcheck_stubs/iopcontrol_special.h
new file mode 100644
index 0000000..a280dad
--- /dev/null
+++ b/include/cppcheck_stubs/iopcontrol_special.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int SifIopRebootBuffer(const void *ioprp, int size);
diff --git a/include/cppcheck_stubs/iopheap.h b/include/cppcheck_stubs/iopheap.h
new file mode 100644
index 0000000..4583547
--- /dev/null
+++ b/include/cppcheck_stubs/iopheap.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int SifInitIopHeap(void);
diff --git a/include/cppcheck_stubs/kernel.h b/include/cppcheck_stubs/kernel.h
new file mode 100644
index 0000000..8d08324
--- /dev/null
+++ b/include/cppcheck_stubs/kernel.h
@@ -0,0 +1,19 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef UNCACHED_SEG
+#define UNCACHED_SEG(x) (x)
+#endif
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+typedef signed int s32;
+
+int AddIntcHandler(int interrupt, int (*handler)(int), int next);
+int RemoveIntcHandler(int interrupt, int id);
+int EnableIntc(int interrupt);
+int DisableIntc(int interrupt);
+int SetAlarm(u32 ticks, void (*callback)(s32 alarm_id, u16 time, void *common), void *common);
+int GetThreadId(void);
+void SignalSema(int sema_id);
diff --git a/include/cppcheck_stubs/libcdvd.h b/include/cppcheck_stubs/libcdvd.h
new file mode 100644
index 0000000..dcc7d79
--- /dev/null
+++ b/include/cppcheck_stubs/libcdvd.h
@@ -0,0 +1,36 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef SCECdINoD
+#define SCECdINoD 0
+#endif
+
+#ifndef SCECdEXIT
+#define SCECdEXIT 1
+#endif
+
+typedef unsigned char u8;
+typedef unsigned int u32;
+
+typedef struct sceCdCLOCK {
+    u8 stat;
+    u8 second;
+    u8 minute;
+    u8 hour;
+    u8 pad[4];
+} sceCdCLOCK;
+
+int sceCdInit(int mode);
+int sceCdReadClock(sceCdCLOCK *clock);
+int sceCdOpenConfig(int arg0, int arg1, int arg2, u32 *stat);
+int sceCdReadConfig(u8 *config, u32 *stat);
+int sceCdWriteConfig(const u8 *config, u32 *stat);
+int sceCdCloseConfig(u32 *stat);
+int sceCdReadKey(int key, int index, int keynum, u8 *buffer);
+int sceCdGetError(void);
+int sceCdApplySCmd(int cmd, const void *in, int in_size, void *out);
+int sceCdMV(u8 *data, u32 *status);
+int sceCdAutoAdjustCtrl(int mode, u32 *stat);
+int sceCdGetDiskType(void);
+int sceCdTrayReq(int mode, u32 *stat);
+int sceCdForbidDVDP(u32 *stat);
diff --git a/include/cppcheck_stubs/libmc.h b/include/cppcheck_stubs/libmc.h
new file mode 100644
index 0000000..5d0e5cc
--- /dev/null
+++ b/include/cppcheck_stubs/libmc.h
@@ -0,0 +1,39 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef MC_TYPE_MC
+#define MC_TYPE_MC 0
+#endif
+
+#ifndef MC_TYPE_XMC
+#define MC_TYPE_XMC 1
+#endif
+
+#ifndef sceMcTypePS2
+#define sceMcTypePS2 2
+#endif
+
+#ifndef sceMcResSucceed
+#define sceMcResSucceed 0
+#endif
+
+#ifndef sceMcResChangedCard
+#define sceMcResChangedCard 1
+#endif
+
+#ifndef MC_FORMATTED
+#define MC_FORMATTED 1
+#endif
+
+int mcInit(int type);
+int mcGetInfo(int port, int slot, int *type, int *free, int *format);
+int mcOpen(int port, int slot, const char *path, int mode);
+int mcClose(int fd);
+int mcSeek(int fd, int offset, int origin);
+int mcRead(int fd, void *buffer, int size);
+int mcWrite(int fd, const void *buffer, int size);
+int mcGetDir(int port, int slot, const char *path, int flags, int max_entries, void *mc_table);
+int mcMkDir(int port, int slot, const char *path);
+int mcSetFileInfo(int port, int slot, const char *path, void *info, int flags);
+int mcDelete(int port, int slot, const char *path);
+int mcSync(int mode, int *cmd, int *result);
diff --git a/include/cppcheck_stubs/libpad.h b/include/cppcheck_stubs/libpad.h
new file mode 100644
index 0000000..6621d92
--- /dev/null
+++ b/include/cppcheck_stubs/libpad.h
@@ -0,0 +1,17 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+typedef unsigned short u16;
+typedef unsigned int u32;
+
+typedef struct padButtonStatus {
+    u16 btns;
+    u16 _pad;
+    u32 btns2;
+} padButtonStatus;
+
+int padInit(int mode);
+int padPortOpen(int port, int slot, void *pad_area);
+int padPortClose(int port, int slot);
+int padEnd(void);
+int padRead(int port, int slot, struct padButtonStatus *buttons);
diff --git a/include/cppcheck_stubs/libpwroff.h b/include/cppcheck_stubs/libpwroff.h
new file mode 100644
index 0000000..4b6c361
--- /dev/null
+++ b/include/cppcheck_stubs/libpwroff.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+void poweroffShutdown(void);
diff --git a/include/cppcheck_stubs/limits.h b/include/cppcheck_stubs/limits.h
new file mode 100644
index 0000000..fadbbf5
--- /dev/null
+++ b/include/cppcheck_stubs/limits.h
@@ -0,0 +1,6 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef INT_MAX
+#define INT_MAX 2147483647
+#endif
diff --git a/include/cppcheck_stubs/loadfile.h b/include/cppcheck_stubs/loadfile.h
new file mode 100644
index 0000000..cff4ab0
--- /dev/null
+++ b/include/cppcheck_stubs/loadfile.h
@@ -0,0 +1,7 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int SifLoadFileInit(void);
+int SifLoadModule(const char *path, int argc, const char *argv);
+int SifLoadStartModule(const char *path, int argc, const char *argv, int *ret);
+int SifExecModuleBuffer(const void *modptr, int size, int argc, const char *argv, int *ret);
diff --git a/include/cppcheck_stubs/osd_config.h b/include/cppcheck_stubs/osd_config.h
new file mode 100644
index 0000000..8003e1a
--- /dev/null
+++ b/include/cppcheck_stubs/osd_config.h
@@ -0,0 +1,64 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+typedef struct ConfigParam {
+    int spdifMode;
+    int screenType;
+    int videoOutput;
+    int japLanguage;
+    int ps1drvConfig;
+    int version;
+    int language;
+    int timezoneOffset;
+} ConfigParam;
+
+typedef struct Config2Param {
+    int format;
+    int daylightSaving;
+    int timeFormat;
+    int dateFormat;
+    int version;
+    int language;
+} Config2Param;
+
+#ifndef LANGUAGE_JAPANESE
+#define LANGUAGE_JAPANESE 0
+#endif
+#ifndef LANGUAGE_ENGLISH
+#define LANGUAGE_ENGLISH 1
+#endif
+#ifndef LANGUAGE_FRENCH
+#define LANGUAGE_FRENCH 2
+#endif
+#ifndef LANGUAGE_SPANISH
+#define LANGUAGE_SPANISH 3
+#endif
+#ifndef LANGUAGE_GERMAN
+#define LANGUAGE_GERMAN 4
+#endif
+#ifndef LANGUAGE_ITALIAN
+#define LANGUAGE_ITALIAN 5
+#endif
+#ifndef LANGUAGE_DUTCH
+#define LANGUAGE_DUTCH 6
+#endif
+#ifndef LANGUAGE_PORTUGUESE
+#define LANGUAGE_PORTUGUESE 7
+#endif
+#ifndef LANGUAGE_RUSSIAN
+#define LANGUAGE_RUSSIAN 8
+#endif
+#ifndef LANGUAGE_KOREAN
+#define LANGUAGE_KOREAN 9
+#endif
+#ifndef LANGUAGE_TRAD_CHINESE
+#define LANGUAGE_TRAD_CHINESE 10
+#endif
+#ifndef LANGUAGE_SIMPL_CHINESE
+#define LANGUAGE_SIMPL_CHINESE 11
+#endif
+
+void SetOsdConfigParam(const ConfigParam *config);
+void GetOsdConfigParam(ConfigParam *config);
+void SetOsdConfigParam2(const Config2Param *config, int size, int offset);
+void GetOsdConfigParam2(Config2Param *config, int size, int offset);
diff --git a/include/cppcheck_stubs/ps2sdkapi.h b/include/cppcheck_stubs/ps2sdkapi.h
new file mode 100644
index 0000000..22d0818
--- /dev/null
+++ b/include/cppcheck_stubs/ps2sdkapi.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+void SetGsVParam(int mode);
diff --git a/include/cppcheck_stubs/sbv_patches.h b/include/cppcheck_stubs/sbv_patches.h
new file mode 100644
index 0000000..78a4ea8
--- /dev/null
+++ b/include/cppcheck_stubs/sbv_patches.h
@@ -0,0 +1,5 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+int sbv_patch_enable_lmb(void);
+int sbv_patch_disable_prefix_check(void);
diff --git a/include/cppcheck_stubs/sifcmd.h b/include/cppcheck_stubs/sifcmd.h
new file mode 100644
index 0000000..62562b0
--- /dev/null
+++ b/include/cppcheck_stubs/sifcmd.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+void SifExitCmd(void);
diff --git a/include/cppcheck_stubs/sifrpc.h b/include/cppcheck_stubs/sifrpc.h
new file mode 100644
index 0000000..7bd9a38
--- /dev/null
+++ b/include/cppcheck_stubs/sifrpc.h
@@ -0,0 +1,12 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#include "tamtypes.h"
+
+typedef struct SifRpcClientData {
+    int dummy;
+} SifRpcClientData_t;
+
+int SifCallRpc(SifRpcClientData_t *client, int rpc_number, int mode, void *send, int ssize, void *recv, int rsize,
+               void *endfunc, void *endparam);
+int SifInitRpc(int mode);
diff --git a/include/cppcheck_stubs/sio.h b/include/cppcheck_stubs/sio.h
new file mode 100644
index 0000000..b892301
--- /dev/null
+++ b/include/cppcheck_stubs/sio.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+void sio_putsn(const char *str);
diff --git a/include/cppcheck_stubs/stdarg.h b/include/cppcheck_stubs/stdarg.h
new file mode 100644
index 0000000..35ab9e1
--- /dev/null
+++ b/include/cppcheck_stubs/stdarg.h
@@ -0,0 +1,14 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#if defined(__GNUC__) || defined(__clang__)
+typedef __builtin_va_list va_list;
+#define va_start(ap, last) __builtin_va_start(ap, last)
+#define va_end(ap) __builtin_va_end(ap)
+#define va_arg(ap, type) __builtin_va_arg(ap, type)
+#else
+typedef char *va_list;
+#define va_start(ap, last) ((void)0)
+#define va_end(ap) ((void)0)
+#define va_arg(ap, type) (*(type *)(ap))
+#endif
diff --git a/include/cppcheck_stubs/stddef.h b/include/cppcheck_stubs/stddef.h
new file mode 100644
index 0000000..0e6e9c1
--- /dev/null
+++ b/include/cppcheck_stubs/stddef.h
@@ -0,0 +1,8 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+typedef unsigned int size_t;
+
+#ifndef NULL
+#define NULL ((void *)0)
+#endif
diff --git a/include/cppcheck_stubs/string.h b/include/cppcheck_stubs/string.h
new file mode 100644
index 0000000..ef7a890
--- /dev/null
+++ b/include/cppcheck_stubs/string.h
@@ -0,0 +1,4 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#include "stddef.h"
diff --git a/include/cppcheck_stubs/tamtypes.h b/include/cppcheck_stubs/tamtypes.h
new file mode 100644
index 0000000..3874a1a
--- /dev/null
+++ b/include/cppcheck_stubs/tamtypes.h
@@ -0,0 +1,16 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+typedef unsigned long long u64;
+
+typedef signed char s8;
+typedef signed short s16;
+typedef signed int s32;
+typedef signed long long s64;
+
+#ifndef ALIGNED
+#define ALIGNED(x) __attribute__((aligned(x)))
+#endif
diff --git a/include/cppcheck_stubs/usbhdfsd-common.h b/include/cppcheck_stubs/usbhdfsd-common.h
new file mode 100644
index 0000000..02ba6c2
--- /dev/null
+++ b/include/cppcheck_stubs/usbhdfsd-common.h
@@ -0,0 +1,10 @@
+#pragma once
+// Stub for Codacy/Cppcheck static analysis; not used in PS2SDK builds.
+
+#ifndef USBMASS_IOCTL_GET_DRIVERNAME
+#define USBMASS_IOCTL_GET_DRIVERNAME 0
+#endif
+
+#ifndef USBMASS_DEVCTL_STOP_ALL
+#define USBMASS_DEVCTL_STOP_ALL 0
+#endif
diff --git a/include/debugprintf.h b/include/debugprintf.h
index 9793276..0303ce5 100644
--- a/include/debugprintf.h
+++ b/include/debugprintf.h
@@ -1,12 +1,16 @@
 #ifndef DEBUG_PRINTF
 #define DEBUG_PRINTF
 
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/stdarg.h"
+#else
 #include <stdarg.h>
+#endif
 #include <stdio.h>
 
 #ifdef SCR_PRINT
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/debug.h"
 #else
 #include <debug.h>
 #endif
@@ -17,7 +21,7 @@
 #ifdef EE_SIO_DEBUG
 void sio_printf(const char *fmt, ...);
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/SIOCookie.h"
 #else
 #include <SIOCookie.h>
 #endif
diff --git a/include/libcdvd_add.h b/include/libcdvd_add.h
index af64e68..90cd9bf 100644
--- a/include/libcdvd_add.h
+++ b/include/libcdvd_add.h
@@ -1,4 +1,8 @@
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/stddef.h"
+#else
 #include <stddef.h>
+#endif
 
 // Initialize add-on functions. Currently only retrieves the MECHACON's version to determine what sceCdAltGetRegionParams() should do.
 int cdInitAdd(void);
diff --git a/include/main.h b/include/main.h
index 05b5a2e..54ebb89 100644
--- a/include/main.h
+++ b/include/main.h
@@ -4,13 +4,31 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <unistd.h>
 #include <malloc.h>
 #include <fcntl.h>
 
 #ifdef __CPPCHECK__
 #include "cppcheck_shims.h"
+#include "cppcheck_stubs/tamtypes.h"
+#include "cppcheck_stubs/kernel.h"
+#include "cppcheck_stubs/sifrpc.h"
+#include "cppcheck_stubs/loadfile.h"
+#include "cppcheck_stubs/debug.h"
+#include "cppcheck_stubs/iopcontrol.h"
+#include "cppcheck_stubs/iopheap.h"
+#include "cppcheck_stubs/sbv_patches.h"
+#include "cppcheck_stubs/ps2sdkapi.h"
+#include "cppcheck_stubs/usbhdfsd-common.h"
+#include "cppcheck_stubs/osd_config.h"
+#include "cppcheck_stubs/libpad.h"
+#include "cppcheck_stubs/libmc.h"
+#include "cppcheck_stubs/libcdvd.h"
 #else
 #include <tamtypes.h>
 #include <kernel.h>
@@ -46,7 +64,7 @@
 
 #ifdef PSX
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/iopcontrol_special.h"
 #else
 #include <iopcontrol_special.h>
 #endif
@@ -105,7 +123,9 @@ void loadUDPTTY();
 
 #if defined(HDD) || defined(HDD_RUNTIME)
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/hdd-ioctl.h"
+#include "cppcheck_stubs/io_common.h"
+#include "cppcheck_stubs/libpwroff.h"
 #else
 #include <hdd-ioctl.h>
 #include <io_common.h>
@@ -130,7 +150,7 @@ int LookForBDMDevice(void);
 
 #ifdef FILEXIO
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/fileXio_rpc.h"
 #else
 #include <fileXio_rpc.h>
 #endif
diff --git a/include/psx/plibcdvd_add.h b/include/psx/plibcdvd_add.h
index 9ad018c..2c8f60b 100644
--- a/include/psx/plibcdvd_add.h
+++ b/include/psx/plibcdvd_add.h
@@ -1,5 +1,5 @@
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/tamtypes.h"
 #else
 #include <tamtypes.h>
 #endif
diff --git a/include/util.h b/include/util.h
index c8650b7..de3fdde 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,4 +1,8 @@
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/stddef.h"
+#else
 #include <stddef.h>
+#endif
 
 /**
  * @brief checks for file existence
diff --git a/include/util_safe_compat.h b/include/util_safe_compat.h
index a7847dc..f3e486e 100644
--- a/include/util_safe_compat.h
+++ b/include/util_safe_compat.h
@@ -1,7 +1,12 @@
 #ifndef UTIL_SAFE_COMPAT_H
 #define UTIL_SAFE_COMPAT_H
 
-#if defined(__has_include)
+#ifdef __CPPCHECK__
+  #include "cppcheck_stubs/stddef.h"
+  #include "cppcheck_stubs/stdarg.h"
+  #include "cppcheck_stubs/limits.h"
+  #include "cppcheck_stubs/string.h"
+#elif defined(__has_include)
   #if __has_include(<stddef.h>)
     #include <stddef.h>
   #endif
diff --git a/src/OSDConfig.c b/src/OSDConfig.c
index 087ecf4..a02ea92 100644
--- a/src/OSDConfig.c
+++ b/src/OSDConfig.c
@@ -1,11 +1,14 @@
 #include <stdio.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/osd_config.h"
 #else
 #include <osd_config.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/kernel.h"
+#else
 #include <kernel.h>
 #endif
-
 #include "OSDInit.h"
 #include "OSDConfig.h"
 
diff --git a/src/OSDHistory.c b/src/OSDHistory.c
index 9a73ae0..672efd6 100644
--- a/src/OSDHistory.c
+++ b/src/OSDHistory.c
@@ -2,14 +2,30 @@
 #include <fcntl.h>
 #include <unistd.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libmc.h"
+#else
 #include <libmc.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
 #endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/limits.h"
+#else
 #include <limits.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <stdio.h>
 #include "OSDInit.h"
 #include "util.h"
diff --git a/src/OSDInit.c b/src/OSDInit.c
index 592d7dd..ce1e114 100644
--- a/src/OSDInit.c
+++ b/src/OSDInit.c
@@ -1,13 +1,25 @@
 #include <stdio.h>
 #include <fcntl.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/osd_config.h"
+#else
 #include <osd_config.h>
 #endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include "libcdvd_add.h"
 #include "OSDInit.h"
 #include "util_safe.h"
diff --git a/src/dvdplayer.c b/src/dvdplayer.c
index 0aa1778..f1e35da 100644
--- a/src/dvdplayer.c
+++ b/src/dvdplayer.c
@@ -1,13 +1,29 @@
 #include <stdio.h>
 #include <fcntl.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <stdlib.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/sifcmd.h"
+#else
 #include <sifcmd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libmc.h"
+#else
 #include <libmc.h>
 #endif
 #include <errno.h>
diff --git a/src/elf.c b/src/elf.c
index 45b98dc..36ee681 100644
--- a/src/elf.c
+++ b/src/elf.c
@@ -1,12 +1,19 @@
 #include <stdio.h>
-#include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/tamtypes.h"
 #else
 #include <tamtypes.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/kernel.h"
+#else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/elf-loader.h"
+#else
 #include <elf-loader.h>
 #endif
 #include "debugprintf.h"
diff --git a/src/libcdvd_add.c b/src/libcdvd_add.c
index 6cc5d6f..2e623a4 100644
--- a/src/libcdvd_add.c
+++ b/src/libcdvd_add.c
@@ -1,11 +1,23 @@
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/sifrpc.h"
+#else
 #include <sifrpc.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
 #endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <stdio.h>
 
 #include "debugprintf.h"
diff --git a/src/main.c b/src/main.c
index ea8cb9d..eb39f3f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,9 @@
 #include <errno.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 
 #include "util_safe_compat.h"
 #include "util_safe.h"
diff --git a/src/modelname.c b/src/modelname.c
index c03dbf7..962016d 100644
--- a/src/modelname.c
+++ b/src/modelname.c
@@ -1,12 +1,24 @@
 #include <stdio.h>
 #include <fcntl.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <stdlib.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/sifcmd.h"
+#else
 #include <sifcmd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
 #endif
 #include "libcdvd_add.h"
diff --git a/src/pad.c b/src/pad.c
index 7d073f0..d6cebac 100644
--- a/src/pad.c
+++ b/src/pad.c
@@ -1,12 +1,19 @@
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libpad.h"
+#else
 #include <libpad.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/tamtypes.h"
+#else
 #include <tamtypes.h>
 #endif
 #include <stdio.h>
-#include <string.h>
 
 #include "debugprintf.h"
 #include "pad.h"
diff --git a/src/ps1.c b/src/ps1.c
index 75544f2..c2f798e 100644
--- a/src/ps1.c
+++ b/src/ps1.c
@@ -1,14 +1,34 @@
 #include <stdio.h>
 #include <fcntl.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <stdlib.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/ctype.h"
+#else
 #include <ctype.h>
+#endif
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/sifcmd.h"
+#else
 #include <sifcmd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libmc.h"
+#else
 #include <libmc.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
 #endif
 #include "libcdvd_add.h"
diff --git a/src/ps2.c b/src/ps2.c
index bc9489c..6ed5079 100644
--- a/src/ps2.c
+++ b/src/ps2.c
@@ -1,17 +1,37 @@
 #include <stdio.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <stdlib.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/sifcmd.h"
+#else
 #include <sifcmd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/debug.h"
+#else
 #include <debug.h>
 #endif
 #include "libcdvd_add.h"
 #include <fcntl.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/ctype.h"
+#else
 #include <ctype.h>
+#endif
 #include <unistd.h>
 //#include "main.h"
 #include "ps2.h"
diff --git a/src/scmd_add.c b/src/scmd_add.c
index 40089a6..8b7ec3b 100644
--- a/src/scmd_add.c
+++ b/src/scmd_add.c
@@ -19,14 +19,21 @@
 
 #include <stdio.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/kernel.h"
 #else
 #include <kernel.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/sifrpc.h"
+#else
 #include <sifrpc.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/libcdvd.h"
+#else
 #include <libcdvd.h>
 #endif
 #include "psx/plibcdvd_add.h"
-#include <string.h>
 
 enum PSX_CD_SCMD_CMDS
 {
diff --git a/src/sioprintf.c b/src/sioprintf.c
index 50f4b5e..b2b1919 100644
--- a/src/sioprintf.c
+++ b/src/sioprintf.c
@@ -1,7 +1,11 @@
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/stdarg.h"
+#else
 #include <stdarg.h>
+#endif
 #include <stdio.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/sio.h"
 #else
 #include <sio.h>
 #endif
diff --git a/src/timer.c b/src/timer.c
index d150682..fa5223c 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -35,9 +35,13 @@
 */
 
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/tamtypes.h"
 #else
 #include <tamtypes.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/kernel.h"
+#else
 #include <kernel.h>
 #endif
 
diff --git a/src/util.c b/src/util.c
index 9f3bb5f..a56fcb6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,13 +1,21 @@
 #include <errno.h>
 #include "util_safe_compat.h"
 #include <stdio.h>
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/string.h"
+#else
 #include <string.h>
+#endif
 #include <fcntl.h>
 #include <unistd.h>
 #ifdef __CPPCHECK__
-#include "cppcheck_shims.h"
+#include "cppcheck_stubs/tamtypes.h"
 #else
 #include <tamtypes.h>
+#endif
+#ifdef __CPPCHECK__
+#include "cppcheck_stubs/loadfile.h"
+#else
 #include <loadfile.h>
 #endif
 #include <malloc.h>