diff --git a/include/bfd.h b/include/bfd.h
index 1c91bc21d0..f59a80de0e 100644
--- a/include/bfd.h
+++ b/include/bfd.h
@@ -545,26 +545,22 @@ typedef struct bfd_target
 
   /* Jumps for coff swapping */
 
-#define AUXENT void*
-#define SYMENT void*
-#define LINENO void*
-
   SDEF(void, _bfd_coff_swap_aux_in,(
        bfd            *abfd ,
-       AUXENT    *ext ,
+       PTR		ext,
        int             type,
        int             class ,
-       union internal_auxent  *in));
+       PTR             in));
 
   SDEF(void, _bfd_coff_swap_sym_in,(
        bfd            *abfd ,
-       SYMENT *ext ,
-       struct internal_syment      *in));
+       PTR 		ext,
+       PTR 		in));
 
-  SDEF(void, _bfd_coff_swap_lineno_in,(
-       bfd            *abfd,
-       LINENO *ext,
-       struct internal_lineno      *in));
+  SDEF(void, _bfd_coff_swap_lineno_in,  (
+	bfd            *abfd,
+	PTR            ext,
+	PTR		in));
 
 } bfd_target;
 
diff --git a/include/oasys.h b/include/oasys.h
index b54a3fe5e9..214095f4b5 100644
--- a/include/oasys.h
+++ b/include/oasys.h
@@ -1,9 +1,9 @@
-
+#define OASYS_MAX_SEC_COUNT 16
 /* **** */
 
 
 typedef struct {
-  int32_type  version;
+  uint32_type  version;
   char create_date[12];
   char revision_date[12];
   uint32_type mod_count;
@@ -34,9 +34,10 @@ typedef struct {
   int32_type mod_size;
   int32_type dep_count;
   int32_type depee_count;
-  int32_type sect_count;
   int32_type file_offset;
-  int32_type mod_name_length;
+  int32_type sect_count;
+  char *module_name;
+
 } oasys_module_table_type;
 
 
@@ -48,10 +49,11 @@ typedef struct {
   char depee_count[4];
   char sect_count[4];
   char file_offset[4];
-  char mod_name_length[4];
+  char mod_name[32];
 } oasys_external_module_table_type;
 
 
+
 typedef enum {
   oasys_record_is_end_enum = 0,
   oasys_record_is_data_enum = 1,
@@ -129,7 +131,7 @@ typedef struct {
 } oasys_end_record_type;
 
 
-#define OASYS_MAX_SEC_COUNT 16
+
 typedef union
 {
   oasys_record_header_type header;