diff --git a/include/ntapi/nt_acl.h b/include/ntapi/nt_acl.h
index 4619ade..0eb6e35 100644
--- a/include/ntapi/nt_acl.h
+++ b/include/ntapi/nt_acl.h
@@ -1,7 +1,7 @@
 #ifndef _NT_ACL_H_
 #define _NT_ACL_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_sid_name_use {
diff --git a/include/ntapi/nt_argv.h b/include/ntapi/nt_argv.h
index 531c6c0..db52e95 100644
--- a/include/ntapi/nt_argv.h
+++ b/include/ntapi/nt_argv.h
@@ -10,7 +10,7 @@
  *                                                    *
  *****************************************************/
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 /* ntapi_tt_get_argv_envp_utf16 flag bits */
 #define NT_GET_ARGV_ENVP_USE_INTERNAL_BUFFER	(0x0000)
diff --git a/include/ntapi/nt_atom.h b/include/ntapi/nt_atom.h
index 36d660d..24909d2 100644
--- a/include/ntapi/nt_atom.h
+++ b/include/ntapi/nt_atom.h
@@ -1,7 +1,7 @@
 #ifndef _NT_ATOM_H_
 #define _NT_ATOM_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 typedef enum _nt_atom_info_class {
 	NT_ATOM_BASIC_INFORMATION,
diff --git a/include/ntapi/nt_atomic.h b/include/ntapi/nt_atomic.h
index 068b4e2..45a4018 100644
--- a/include/ntapi/nt_atomic.h
+++ b/include/ntapi/nt_atomic.h
@@ -1,7 +1,7 @@
 #ifndef _NT_ATOMIC_H_
 #define _NT_ATOMIC_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 static __inline__ void at_locked_inc(
 	intptr_t volatile * ptr);
diff --git a/include/ntapi/nt_auxv.h b/include/ntapi/nt_auxv.h
index d460c82..8d19ee5 100644
--- a/include/ntapi/nt_auxv.h
+++ b/include/ntapi/nt_auxv.h
@@ -1,7 +1,7 @@
 #ifndef _NT_AUXV_H_
 #define _NT_AUXV_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 #define NT_AT_NULL		0
 #define NT_AT_IGNORE		1
diff --git a/include/ntapi/nt_blitter.h b/include/ntapi/nt_blitter.h
index 2546412..9c9a145 100644
--- a/include/ntapi/nt_blitter.h
+++ b/include/ntapi/nt_blitter.h
@@ -1,7 +1,7 @@
 #ifndef _NT_BLITTER_H_
 #define _NT_BLITTER_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 /* blt_alloc flag bits */
diff --git a/include/ntapi/nt_crc32.h b/include/ntapi/nt_crc32.h
index 9f08e12..b8afb15 100644
--- a/include/ntapi/nt_crc32.h
+++ b/include/ntapi/nt_crc32.h
@@ -1,7 +1,7 @@
 #ifndef _NT_CRC32_H_
 #define _NT_CRC32_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 #define NTAPI_CRC32_POLY  0xd35a6b40
 
diff --git a/include/ntapi/nt_daemon.h b/include/ntapi/nt_daemon.h
index ef9939b..c3734c6 100644
--- a/include/ntapi/nt_daemon.h
+++ b/include/ntapi/nt_daemon.h
@@ -35,7 +35,7 @@
  *     the nt_daemon_params structure.
 **/
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_thread.h"
 #include "nt_port.h"
 
diff --git a/include/ntapi/nt_debug.h b/include/ntapi/nt_debug.h
index e73d75a..a517a78 100644
--- a/include/ntapi/nt_debug.h
+++ b/include/ntapi/nt_debug.h
@@ -1,7 +1,7 @@
 #ifndef _NT_DEBUG_H_
 #define _NT_DEBUG_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_file.h"
 
 typedef ssize_t __cdecl ntapi_dbg_write(
diff --git a/include/ntapi/nt_device.h b/include/ntapi/nt_device.h
index ca1b4d9..c9e81b6 100644
--- a/include/ntapi/nt_device.h
+++ b/include/ntapi/nt_device.h
@@ -1,7 +1,7 @@
 #ifndef _NT_DEVICE_H_
 #define _NT_DEVICE_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_device_type {
diff --git a/include/ntapi/nt_exception.h b/include/ntapi/nt_exception.h
index 6284372..657c0bd 100644
--- a/include/ntapi/nt_exception.h
+++ b/include/ntapi/nt_exception.h
@@ -1,7 +1,7 @@
 #ifndef _NT_EXCEPTION_H_
 #define _NT_EXCEPTION_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_thread.h"
 
diff --git a/include/ntapi/nt_file.h b/include/ntapi/nt_file.h
index d676bf5..8860833 100644
--- a/include/ntapi/nt_file.h
+++ b/include/ntapi/nt_file.h
@@ -1,7 +1,7 @@
 #ifndef _NT_FILE_H_
 #define _NT_FILE_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_device.h"
 
diff --git a/include/ntapi/nt_guid.h b/include/ntapi/nt_guid.h
index 7de2170..289e861 100644
--- a/include/ntapi/nt_guid.h
+++ b/include/ntapi/nt_guid.h
@@ -1,7 +1,7 @@
 #ifndef _NT_GUID_H_
 #define _NT_GUID_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef struct _nt_guid_str_utf16 {
diff --git a/include/ntapi/nt_hash.h b/include/ntapi/nt_hash.h
index a838c5c..9f82aef 100644
--- a/include/ntapi/nt_hash.h
+++ b/include/ntapi/nt_hash.h
@@ -1,7 +1,7 @@
 #ifndef _NT_HASH_H_
 #define _NT_HASH_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_crc32.h"
 
 typedef int32_t __cdecl ntapi_tt_populate_hashed_import_table(
diff --git a/include/ntapi/nt_ipc.h b/include/ntapi/nt_ipc.h
index 6119b8b..d799587 100644
--- a/include/ntapi/nt_ipc.h
+++ b/include/ntapi/nt_ipc.h
@@ -1,7 +1,7 @@
 #ifndef _NT_IPC_H_
 #define _NT_IPC_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef int32_t __stdcall	ntapi_ipc_create_pipe(
diff --git a/include/ntapi/nt_istat.h b/include/ntapi/nt_istat.h
index 5586628..7ad02a3 100644
--- a/include/ntapi/nt_istat.h
+++ b/include/ntapi/nt_istat.h
@@ -1,7 +1,7 @@
 #ifndef _NT_ISTAT_H_
 #define _NT_ISTAT_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_file.h"
 
diff --git a/include/ntapi/nt_job.h b/include/ntapi/nt_job.h
index 83a561e..1e34712 100644
--- a/include/ntapi/nt_job.h
+++ b/include/ntapi/nt_job.h
@@ -1,7 +1,7 @@
 #ifndef _NT_JOB_H_
 #define _NT_JOB_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_job_object_info_class {
diff --git a/include/ntapi/nt_ldr.h b/include/ntapi/nt_ldr.h
index fa7af3a..daabc11 100644
--- a/include/ntapi/nt_ldr.h
+++ b/include/ntapi/nt_ldr.h
@@ -2,7 +2,7 @@
 #define _NT_LDR_H_
 
 #include <dalist/dalist.h>
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef int32_t	__stdcall	ntapi_ldr_load_dll(
diff --git a/include/ntapi/nt_locale.h b/include/ntapi/nt_locale.h
index 7d7ef80..0eea406 100644
--- a/include/ntapi/nt_locale.h
+++ b/include/ntapi/nt_locale.h
@@ -1,7 +1,7 @@
 #ifndef _NT_LOCALE_H_
 #define _NT_LOCALE_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 typedef uint32_t nt_lcid;
 typedef uint16_t nt_langid;
diff --git a/include/ntapi/nt_memory.h b/include/ntapi/nt_memory.h
index 72bc452..9801023 100644
--- a/include/ntapi/nt_memory.h
+++ b/include/ntapi/nt_memory.h
@@ -1,7 +1,7 @@
 #ifndef _NT_MEMORY_H_
 #define _NT_MEMORY_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_memory_info_class {
diff --git a/include/ntapi/nt_mount.h b/include/ntapi/nt_mount.h
index 982a24d..0e0b979 100644
--- a/include/ntapi/nt_mount.h
+++ b/include/ntapi/nt_mount.h
@@ -1,7 +1,7 @@
 #ifndef _NT_MOUNT_H_
 #define _NT_MOUNT_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_ioctl.h"
 #include "nt_statfs.h"
 
diff --git a/include/ntapi/nt_object.h b/include/ntapi/nt_object.h
index 1a34a40..68aa6a5 100644
--- a/include/ntapi/nt_object.h
+++ b/include/ntapi/nt_object.h
@@ -1,7 +1,7 @@
 #ifndef _NT_OBJECT_H_
 #define _NT_OBJECT_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 typedef enum _nt_object_info_class {
 	NT_OBJECT_BASIC_INFORMATION	= 0,
diff --git a/include/ntapi/nt_os.h b/include/ntapi/nt_os.h
index 2ecd1d4..a3e1a9a 100644
--- a/include/ntapi/nt_os.h
+++ b/include/ntapi/nt_os.h
@@ -1,7 +1,7 @@
 #ifndef _NT_OS_H_
 #define _NT_OS_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 
diff --git a/include/ntapi/nt_pnp.h b/include/ntapi/nt_pnp.h
index e806baf..d34ae25 100644
--- a/include/ntapi/nt_pnp.h
+++ b/include/ntapi/nt_pnp.h
@@ -1,7 +1,7 @@
 #ifndef _NT_PNP_H_
 #define _NT_PNP_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_latency_time {
diff --git a/include/ntapi/nt_port.h b/include/ntapi/nt_port.h
index 99a92df..9bfa440 100644
--- a/include/ntapi/nt_port.h
+++ b/include/ntapi/nt_port.h
@@ -1,7 +1,7 @@
 #ifndef _NT_PORT_H_
 #define _NT_PORT_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_process.h"
 
diff --git a/include/ntapi/nt_process.h b/include/ntapi/nt_process.h
index 8d15a29..44b237a 100644
--- a/include/ntapi/nt_process.h
+++ b/include/ntapi/nt_process.h
@@ -2,7 +2,8 @@
 #define _NT_PROCESS_H_
 
 #include <pemagine/pemagine.h>
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_object.h"
 #include "nt_memory.h"
 #include "nt_section.h"
diff --git a/include/ntapi/nt_profiling.h b/include/ntapi/nt_profiling.h
index 4c11909..ef0f254 100644
--- a/include/ntapi/nt_profiling.h
+++ b/include/ntapi/nt_profiling.h
@@ -1,7 +1,7 @@
 #ifndef _NT_PROFILING_H_
 #define _NT_PROFILING_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_kprofile_source {
diff --git a/include/ntapi/nt_registry.h b/include/ntapi/nt_registry.h
index 7634d8a..d21a46c 100644
--- a/include/ntapi/nt_registry.h
+++ b/include/ntapi/nt_registry.h
@@ -1,7 +1,7 @@
 #ifndef _NT_REGISTRY_H_
 #define _NT_REGISTRY_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_registry_types {
diff --git a/include/ntapi/nt_section.h b/include/ntapi/nt_section.h
index f1ce381..2f3072f 100644
--- a/include/ntapi/nt_section.h
+++ b/include/ntapi/nt_section.h
@@ -1,7 +1,7 @@
 #ifndef _NT_SECTION_H_
 #define _NT_SECTION_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_memory.h"
 
diff --git a/include/ntapi/nt_security.h b/include/ntapi/nt_security.h
index 20fa956..1a912b8 100644
--- a/include/ntapi/nt_security.h
+++ b/include/ntapi/nt_security.h
@@ -1,7 +1,7 @@
 #ifndef _NT_SECURITY_H_
 #define _NT_SECURITY_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_audit_event_type {
diff --git a/include/ntapi/nt_slist.h b/include/ntapi/nt_slist.h
index edb5a0f..3fda161 100644
--- a/include/ntapi/nt_slist.h
+++ b/include/ntapi/nt_slist.h
@@ -1,7 +1,8 @@
 #ifndef _NT_SLIST_H_
 #define _NT_SLIST_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_sync.h"
 
 struct nt_slist;
diff --git a/include/ntapi/nt_socket.h b/include/ntapi/nt_socket.h
index aad4c0d..977dd17 100644
--- a/include/ntapi/nt_socket.h
+++ b/include/ntapi/nt_socket.h
@@ -49,7 +49,7 @@
  *  of questionable relevance:-)
 **/
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_status.h"
 #include "nt_object.h"
 #include "nt_tty.h"
diff --git a/include/ntapi/nt_stat.h b/include/ntapi/nt_stat.h
index c2e9036..17cb080 100644
--- a/include/ntapi/nt_stat.h
+++ b/include/ntapi/nt_stat.h
@@ -1,7 +1,7 @@
 #ifndef _NT_STAT_H_
 #define _NT_STAT_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_file.h"
 
diff --git a/include/ntapi/nt_statfs.h b/include/ntapi/nt_statfs.h
index ae1b541..b57b418 100644
--- a/include/ntapi/nt_statfs.h
+++ b/include/ntapi/nt_statfs.h
@@ -1,7 +1,7 @@
 #ifndef _NT_STATFS_H_
 #define _NT_STATFS_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 /* ntapi_tt_statfs info flags bits */
diff --git a/include/ntapi/nt_status.h b/include/ntapi/nt_status.h
index a3d7528..57c9a9f 100644
--- a/include/ntapi/nt_status.h
+++ b/include/ntapi/nt_status.h
@@ -1,7 +1,7 @@
 #ifndef _NT_STATUS_H_
 #define _NT_STATUS_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 typedef int32_t nt_status;
 
diff --git a/include/ntapi/nt_string.h b/include/ntapi/nt_string.h
index 1a6a451..fb76ed1 100644
--- a/include/ntapi/nt_string.h
+++ b/include/ntapi/nt_string.h
@@ -1,7 +1,7 @@
 #ifndef _NT_STRING_H_
 #define _NT_STRING_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef void * __cdecl ntapi_memset(
diff --git a/include/ntapi/nt_symlink.h b/include/ntapi/nt_symlink.h
index e7bb301..a64a456 100644
--- a/include/ntapi/nt_symlink.h
+++ b/include/ntapi/nt_symlink.h
@@ -1,7 +1,8 @@
 #ifndef _NT_SYMLINK_H_
 #define _NT_SYMLINK_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_object.h"
 #include "nt_port.h"
 
diff --git a/include/ntapi/nt_sync.h b/include/ntapi/nt_sync.h
index 38d304b..f5e62f3 100644
--- a/include/ntapi/nt_sync.h
+++ b/include/ntapi/nt_sync.h
@@ -1,7 +1,8 @@
 #ifndef _NT_SYNC_H_
 #define _NT_SYNC_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_object.h"
 
 typedef enum _nt_wait_type {
diff --git a/include/ntapi/nt_sysinfo.h b/include/ntapi/nt_sysinfo.h
index 37cf4a1..3f57a43 100644
--- a/include/ntapi/nt_sysinfo.h
+++ b/include/ntapi/nt_sysinfo.h
@@ -1,7 +1,7 @@
 #ifndef _NT_SYSINFO_H_
 #define _NT_SYSINFO_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_memory.h"
 
diff --git a/include/ntapi/nt_termios.h b/include/ntapi/nt_termios.h
index 4d381d2..b72339c 100644
--- a/include/ntapi/nt_termios.h
+++ b/include/ntapi/nt_termios.h
@@ -1,7 +1,7 @@
 #ifndef _NT_TERMIOS_H_
 #define _NT_TERMIOS_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 
 /* tty friendly guids */
 #define TTY_PTM_GUID	{0x21b51c45,0x3388,0x4dd9,{0x82,0x9a,0x5b,0x67,0x4e,0x3e,0x31,0x55}}
diff --git a/include/ntapi/nt_thread.h b/include/ntapi/nt_thread.h
index a4cf1b7..0c931b1 100644
--- a/include/ntapi/nt_thread.h
+++ b/include/ntapi/nt_thread.h
@@ -1,7 +1,7 @@
 #ifndef _NT_THREAD_H_
 #define _NT_THREAD_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_compiler.h"
 #include "nt_object.h"
 #include "bits/nt32/nt_thread_i386.h"
diff --git a/include/ntapi/nt_time.h b/include/ntapi/nt_time.h
index 29f8d42..b58fe04 100644
--- a/include/ntapi/nt_time.h
+++ b/include/ntapi/nt_time.h
@@ -1,7 +1,7 @@
 #ifndef _NT_TIME_H_
 #define _NT_TIME_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef struct _nt_itimerval {
diff --git a/include/ntapi/nt_token.h b/include/ntapi/nt_token.h
index dfb221e..639df8c 100644
--- a/include/ntapi/nt_token.h
+++ b/include/ntapi/nt_token.h
@@ -1,7 +1,7 @@
 #ifndef _NT_TOKEN_H_
 #define _NT_TOKEN_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef enum _nt_token_type {
diff --git a/include/ntapi/nt_tty.h b/include/ntapi/nt_tty.h
index c2456ce..ebcb4d5 100644
--- a/include/ntapi/nt_tty.h
+++ b/include/ntapi/nt_tty.h
@@ -9,7 +9,8 @@
  *  ntctty, the project's native subsystem and pty server.
 **/
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_object.h"
 #include "nt_process.h"
 #include "nt_port.h"
diff --git a/include/ntapi/nt_unicode.h b/include/ntapi/nt_unicode.h
index 294c2f8..01b6a7e 100644
--- a/include/ntapi/nt_unicode.h
+++ b/include/ntapi/nt_unicode.h
@@ -14,6 +14,9 @@
  *  termination of the source stream has been reached.
 **/
 
+#include "nt_abi.h"
+#include "nt_compiler.h"
+
 typedef struct _nt_utf8_callback_args {
 	const unsigned char *	src;
 	void *			dst;
diff --git a/include/ntapi/nt_uuid.h b/include/ntapi/nt_uuid.h
index c4b4cde..11678df 100644
--- a/include/ntapi/nt_uuid.h
+++ b/include/ntapi/nt_uuid.h
@@ -1,7 +1,7 @@
 #ifndef _NT_UUID_H_
 #define _NT_UUID_H_
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 
 typedef int32_t __stdcall ntapi_zw_allocate_locally_unique_id(
diff --git a/include/ntapi/nt_vfd.h b/include/ntapi/nt_vfd.h
index 0437c33..6f2953c 100644
--- a/include/ntapi/nt_vfd.h
+++ b/include/ntapi/nt_vfd.h
@@ -2,7 +2,7 @@
 #define _NT_VFD_H_
 
 #include <dalist/dalist.h>
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
 #include "nt_object.h"
 #include "nt_guid.h"
 
diff --git a/include/ntapi/nt_vmount.h b/include/ntapi/nt_vmount.h
index 989b7ea..be3bb33 100644
--- a/include/ntapi/nt_vmount.h
+++ b/include/ntapi/nt_vmount.h
@@ -2,7 +2,8 @@
 #define _NT_VMOUNT_H_
 
 #include <dalist/dalist.h>
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_port.h"
 #include "nt_file.h"
 #include "nt_statfs.h"
diff --git a/include/ntapi/ntapi.h b/include/ntapi/ntapi.h
index 6247dc0..7dc0ea6 100644
--- a/include/ntapi/ntapi.h
+++ b/include/ntapi/ntapi.h
@@ -11,7 +11,8 @@
 #define	__ntapi_api
 #endif
 
-#include <psxtypes/psxtypes.h>
+#include "nt_abi.h"
+#include "nt_compiler.h"
 #include "nt_status.h"
 #include "nt_crc32.h"
 #include "nt_object.h"