diff --git a/xtrn/sbl/sbldefs.h b/xtrn/sbl/sbldefs.h
index ae1b7e25e465462a01afe93453f3206d2f17f459..d4a3ea7f6c0801bc5e7c79aa9f0b5eb2a657d511 100644
--- a/xtrn/sbl/sbldefs.h
+++ b/xtrn/sbl/sbldefs.h
@@ -57,6 +57,14 @@
 #pragma pack(1)
 #endif
 
+#ifndef _PACK
+	#ifdef __GNUC__
+		#define _PACK __attribute__ ((packed))
+	#else
+		#define _PACK
+	#endif
+#endif
+
 typedef union _PACK {
 
 		struct {
diff --git a/xtrn/sbl/sblpack.c b/xtrn/sbl/sblpack.c
index 8e0b28d09476f8d97aa5ccbcbb392452313e09f7..5daad044b4a13c84a9b4a3fd731caf018682dcde 100644
--- a/xtrn/sbl/sblpack.c
+++ b/xtrn/sbl/sblpack.c
@@ -41,8 +41,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include "filewrap.h"	/* sopen() */
-#include "xsdkwrap.h"	/* PLATFORM_DESC */
-#include "xsdkdefs.h"
+#include "genwrap.h"	/* PLATFORM_DESC */
 #include "sbldefs.h"
 
 int main(void)