diff --git a/reactos/dll/win32/dbghelp/compat.h b/reactos/dll/win32/dbghelp/compat.h
index 5530a388c96..76a2d07984f 100644
--- a/reactos/dll/win32/dbghelp/compat.h
+++ b/reactos/dll/win32/dbghelp/compat.h
@@ -15,7 +15,11 @@ typedef HANDLE HWND;
 #define min(x, y) (((x) < (y)) ? (x) : (y))
 #define max(x, y) (((x) > (y)) ? (x) : (y))
 
+#ifdef __i386__
 #define CDECL __cdecl
+#else
+#define CDECL
+#endif
 typedef PVOID IUnknown, IDispatch, IRecordInfo;
 
 // windef.h
@@ -719,7 +723,6 @@ typedef BOOL (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK64W)(PCWSTR, DWORD64, ULONG, PV
 
 BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, PSYM_ENUMMODULES_CALLBACKW64 EnumModulesCallback, PVOID UserContext);
 
-#ifndef _LP64
 typedef struct _tagADDRESS
 {
     DWORD                       Offset;
@@ -763,23 +766,6 @@ typedef BOOL  (CALLBACK *PSYM_ENUMMODULES_CALLBACK)(PCSTR, ULONG, PVOID);
 typedef BOOL  (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACK)(PCSTR, ULONG, ULONG, PVOID);
 typedef BOOL  (CALLBACK *PSYM_ENUMSYMBOLS_CALLBACKW)(PCWSTR, ULONG, ULONG, PVOID);
 
-#else
-#define ADDRESS ADDRESS64
-#define LPADDRESS LPADDRESS64
-#define IMAGEHLP_MODULE IMAGEHLP_MODULE64
-#define PIMAGEHLP_MODULE PIMAGEHLP_MODULE64
-#define IMAGEHLP_MODULEW IMAGEHLP_MODULEW64
-#define PIMAGEHLP_MODULEW PIMAGEHLP_MODULEW64
-#define PENUMLOADED_MODULES_CALLBACK PENUMLOADED_MODULES_CALLBACK64
-#define PFUNCTION_TABLE_ACCESS_ROUTINE PFUNCTION_TABLE_ACCESS_ROUTINE64
-#define PTRANSLATE_ADDRESS_ROUTINE PTRANSLATE_ADDRESS_ROUTINE64
-#define PSYMBOL_REGISTERED_CALLBACK PSYMBOL_REGISTERED_CALLBACK64
-#define PREAD_PROCESS_MEMORY_ROUTINE PREAD_PROCESS_MEMORY_ROUTINE64
-#define PGET_MODULE_BASE_ROUTINE PGET_MODULE_BASE_ROUTINE64
-#define PSYM_ENUMMODULES_CALLBACK PSYM_ENUMMODULES_CALLBACK64
-#define PSYM_ENUMSYMBOLS_CALLBACK PSYM_ENUMSYMBOLS_CALLBACK64
-#define PSYM_ENUMSYMBOLS_CALLBACKW PSYM_ENUMSYMBOLS_CALLBACKW64
-#endif
 typedef struct _IMAGEHLP_MODULE64
 {
     DWORD                       SizeOfStruct;
diff --git a/reactos/dll/win32/dbghelp/symbol.c b/reactos/dll/win32/dbghelp/symbol.c
index 46ca7985a75..30e33a5e746 100644
--- a/reactos/dll/win32/dbghelp/symbol.c
+++ b/reactos/dll/win32/dbghelp/symbol.c
@@ -70,7 +70,7 @@ int symt_cmp_addr(const void* p1, const void* p2)
 
 DWORD             symt_ptr2index(struct module* module, const struct symt* sym)
 {
-#ifdef _WIN64
+#ifdef __x86_64__
     const struct symt** c;
     int                 len = vector_length(&module->vsymt), i;
 
@@ -91,7 +91,7 @@ DWORD             symt_ptr2index(struct module* module, const struct symt* sym)
 
 struct symt*      symt_index2ptr(struct module* module, DWORD id)
 {
-#ifdef _WIN64
+#ifdef __x86_64__
     if (!id-- || id >= vector_length(&module->vsymt)) return NULL;
     return *(struct symt**)vector_at(&module->vsymt, id);
 #else