diff --git a/compiler/include/libraries/reqtools.h b/compiler/include/libraries/reqtools.h
index 00cb3eeb98..40067ecb74 100644
--- a/compiler/include/libraries/reqtools.h
+++ b/compiler/include/libraries/reqtools.h
@@ -94,7 +94,7 @@ struct ReqDefaults
     UWORD TopOffset;
     UWORD MinEntries;
     UWORD MaxEntries;
-};
+} __packed;
 
 struct ReqToolsPrefs
 {
@@ -102,12 +102,13 @@ struct ReqToolsPrefs
     ULONG 			PrefsSize;
     struct SignalSemaphore 	PrefsSemaphore;
 
-    /* Start of real preferences */
+    /* Start of real preferences (saved/loaded from ReqTools.prefs) */
     ULONG 			Flags;
     struct ReqDefaults 		ReqDefaults[RTPREF_NR_OF_REQ];
+    /* End of real preferences */
 
     BOOL IsLoaded; /* To avoid multiple loading of preferences */
-};
+} __packed;
 
 #ifdef __AROS__
 #define RTPREFS_SIZE		(4 + (RTPREF_NR_OF_REQ * (4 + 4 + 2 + 2 + 2 + 2)))
@@ -157,7 +158,6 @@ struct ReqToolsBase
              confused by the library bases below.  Add the rt_ prefix to the
              library names to fix the problem (e.g. rt_IntuitionBase). */
 
-
     /* The following library bases may be read and used by your program */
     struct IntuitionBase 	*IntuitionBase;
     struct GfxBase 		*GfxBase;
@@ -169,8 +169,11 @@ struct ReqToolsBase
 
     /* PRIVATE FIELDS, THESE WILL CHANGE FROM RELEASE TO RELEASE! */
 
+    /* The RealOpenCnt is for the buffered AvailFonts feature.  Since
+       Kickstart 3.0 offers low memory handlers a release of ReqTools for 3.0
+       will not use this field and start using the normal OpenCnt again. */
     /* Obsolete, at least for AROS. Dont know about AmigaOS. -ksvalast. */
-    UWORD  RealOpenCnt;
+    UWORD 			RealOpenCnt;
 
     UWORD 			AvailFontsLock;
     struct AvailFontsHeader 	*AvailFontsHeader;
diff --git a/workbench/libs/reqtools/amigaincludesforgcc/libraries/reqtools.h b/workbench/libs/reqtools/amigaincludesforgcc/libraries/reqtools.h
index 0d8f1fd15d..40067ecb74 100644
--- a/workbench/libs/reqtools/amigaincludesforgcc/libraries/reqtools.h
+++ b/workbench/libs/reqtools/amigaincludesforgcc/libraries/reqtools.h
@@ -61,6 +61,10 @@
 #include <utility/utility.h>
 #endif	/* UTILITY_TAGITEM_H */
 
+#ifndef INTUITION_INTUITION_H
+#include <intuition/intuition.h>
+#endif	/* INTUITION_INTUITION_H */
+
 #define	REQTOOLSNAME		 "reqtools.library"
 #define	REQTOOLSVERSION		 38L
 
@@ -90,19 +94,21 @@ struct ReqDefaults
     UWORD TopOffset;
     UWORD MinEntries;
     UWORD MaxEntries;
-};
+} __packed;
 
 struct ReqToolsPrefs
 {
     /* Size of preferences (_without_ this field, the semaphore and IsLoaded) */
     ULONG 			PrefsSize;
     struct SignalSemaphore 	PrefsSemaphore;
-    BOOL IsLoaded; /* To avoid multiple loading of preferences */
 
-    /* Start of real preferences */
+    /* Start of real preferences (saved/loaded from ReqTools.prefs) */
     ULONG 			Flags;
     struct ReqDefaults 		ReqDefaults[RTPREF_NR_OF_REQ];
-};
+    /* End of real preferences */
+
+    BOOL IsLoaded; /* To avoid multiple loading of preferences */
+} __packed;
 
 #ifdef __AROS__
 #define RTPREFS_SIZE		(4 + (RTPREF_NR_OF_REQ * (4 + 4 + 2 + 2 + 2 + 2)))
@@ -166,7 +172,9 @@ struct ReqToolsBase
     /* The RealOpenCnt is for the buffered AvailFonts feature.  Since
        Kickstart 3.0 offers low memory handlers a release of ReqTools for 3.0
        will not use this field and start using the normal OpenCnt again. */
+    /* Obsolete, at least for AROS. Dont know about AmigaOS. -ksvalast. */
     UWORD 			RealOpenCnt;
+
     UWORD 			AvailFontsLock;
     struct AvailFontsHeader 	*AvailFontsHeader;
     ULONG 			FontsAssignType;
diff --git a/workbench/libs/reqtools/reqtools.conf b/workbench/libs/reqtools/reqtools.conf
index 773f12422a..e3a5bda811 100644
--- a/workbench/libs/reqtools/reqtools.conf
+++ b/workbench/libs/reqtools/reqtools.conf
@@ -3,7 +3,7 @@ basename ReqTools
 libbasetype struct ReqToolsBase
 libbasetypeextern struct ReqToolsBase
 seglist_field SegList
-version 39.6
+version 39.7
 ##end config
 
 ##begin cdef