diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 8aa2a217844..3405ba71bef 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-03  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	PR libobjc/24775
+	* encoding.c (objc_layout_finish_structure): Remove usage of
+	ROUND_TYPE_SIZE.
+
 2015-09-12  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
 	PR libobjc/24775
diff --git a/libobjc/encoding.c b/libobjc/encoding.c
index abb61454097..7de768f4509 100644
--- a/libobjc/encoding.c
+++ b/libobjc/encoding.c
@@ -1245,14 +1245,8 @@ void objc_layout_finish_structure (struct objc_struct_layout *layout,
       layout->record_align = MAX (1, layout->record_align);
 #endif
 
-#ifdef ROUND_TYPE_SIZE
-      layout->record_size = ROUND_TYPE_SIZE (layout->original_type,
-                                             layout->record_size,
-                                             layout->record_align);
-#else
       /* Round the size up to be a multiple of the required alignment */
       layout->record_size = ROUND (layout->record_size, layout->record_align);
-#endif
 
       layout->type = NULL;
     }