diff --git a/goldlib/gall/gusrgold.h b/goldlib/gall/gusrgold.h
index f5d0275..ac3ca06 100644
--- a/goldlib/gall/gusrgold.h
+++ b/goldlib/gall/gusrgold.h
@@ -49,10 +49,10 @@ struct GoldUsers {
   char  city[26];
   byte  reservedzero;
   byte  language;
-  long  pwdcrc;
+  int32_t  pwdcrc;
   word  pwdchangedate;
   word  expiredate;
-  long  highmsgread;
+  int32_t  highmsgread;
   byte  extraspace[2];
   char  dataphone[13];
   char  homephone[13];
@@ -75,7 +75,7 @@ struct GoldUsers {
   short  len;
   word  combinedptr;
   word  aliasptr;
-  long  birthday;
+  int32_t  birthday;
 };
 
 
diff --git a/goldlib/gall/gusrhuds.h b/goldlib/gall/gusrhuds.h
index b358109..e7e7664 100644
--- a/goldlib/gall/gusrhuds.h
+++ b/goldlib/gall/gusrhuds.h
@@ -50,10 +50,10 @@ struct HudsUsers {
   char  city[26];
   byte  reservedzero;
   byte  language;
-  long  pwdcrc;
+  int32_t  pwdcrc;
   word  pwdchangedate;
   word  expiredate;
-  long  unusedspace;
+  int32_t  unusedspace;
   byte  extraspace[2];
   char  dataphone[13];
   char  homephone[13];
@@ -76,7 +76,7 @@ struct HudsUsers {
   short  len;
   word  combinedptr;  // record number in COMBINED.*
   word  aliasptr;     // record number in ALIAS.*
-  long  birthday;
+  int32_t  birthday;
 };
 
 
diff --git a/goldlib/gall/gusrpcb.h b/goldlib/gall/gusrpcb.h
index b84be17..b9a18d6 100644
--- a/goldlib/gall/gusrpcb.h
+++ b/goldlib/gall/gusrpcb.h
@@ -75,7 +75,7 @@ struct PcbUsers {
   dword  totalbytesuploaded[2];    // Total Bytes Uploaded
   char  deleteflag;               // Delete Flag (Y or N)
   dword  lastmsgread[40];          // Last Message Read pointer (conference 0-39)
-  long  usersinfrec;              // Record Number of USERS.INF Record
+  int32_t  usersinfrec;              // Record Number of USERS.INF Record
   byte  bitflags2;                // Bit Flags 2 (see below)
   char  reserved[8];              // Reserved (do not use)
   short  lastconferencein;         // Last Conference In (used instead of offset 192)
@@ -90,9 +90,9 @@ struct PcbUsersInfHdr {
   uint16_t version;               // PCBoard Version Number
   uint16_t numofconf;             // Number of EXTENDED Conferences Allocated in File
   uint16_t sizeofrec;             // Size of the 'static' PCBoard User Record
-  long  sizeofconf;               // Total Size of PCBoard Conference Information
+  int32_t  sizeofconf;               // Total Size of PCBoard Conference Information
   uint16_t numofapps;             // Number of Third Party Apps adding onto the record
-  long  totalrecsize;             // Total Record Size (PCB and all TPA components)
+  int32_t  totalrecsize;             // Total Record Size (PCB and all TPA components)
 };
 
 
@@ -106,7 +106,7 @@ struct PcbUsersInfApp {
   uint16_t sizeofrec;             // Size of Application Record information (0-65535)
   uint16_t sizeofconfrec;         // Size of Conference Record information (0-65535)
   char  keyword[9];               // Keyword to execute Application (NULL terminated)
-  long  offset;                   // Offset in User Record where TPA record begins
+  int32_t  offset;                   // Offset in User Record where TPA record begins
 };
 
 
diff --git a/goldlib/gall/gusrra2.h b/goldlib/gall/gusrra2.h
index d9af7b5..25df0d7 100644
--- a/goldlib/gall/gusrra2.h
+++ b/goldlib/gall/gusrra2.h
@@ -54,7 +54,7 @@ struct RA2Users {
   char  address3[51];
   char  handle[36];
   char  comment[81];
-  long  passwordcrc;
+  int32_t  passwordcrc;
   char  dataphone[16];
   char  voicephone[16];
   char  lasttime[6];
@@ -62,17 +62,17 @@ struct RA2Users {
   byte  attribute;
   byte  attribute2;
   byte  flagsx[4];
-  long  credit;
-  long  pending;
+  int32_t  credit;
+  int32_t  pending;
   word  msgsposted;
   word  security;
-  long  lastread;
-  long  nocalls;
-  long  uploads;
-  long  downloads;
-  long  uploadsk;
-  long  downloadsk;
-  long  todayk;
+  int32_t  lastread;
+  int32_t  nocalls;
+  int32_t  uploads;
+  int32_t  downloads;
+  int32_t  uploadsk;
+  int32_t  downloadsk;
+  int32_t  todayk;
   short  elapsed;
   word  screenlength;
   byte  lastpwdchange;
@@ -91,7 +91,7 @@ struct RA2Users {
   word  filegroup;
   byte  lastdobcheck;
   byte  sex;
-  long  xirecord;
+  int32_t  xirecord;
   word  msggroup;
   byte  freespace[48];
 };