diff --git a/frame/1m/packm/ukernels/bli_packm_ref_10xk.h b/frame/1m/packm/ukernels/bli_packm_ref_10xk.h
index bf7a6239d..e8c9c7019 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_10xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_10xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_10xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_10xk_ri3 )
+
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_12xk.h b/frame/1m/packm/ukernels/bli_packm_ref_12xk.h
index 1187d7ff5..eb187dae4 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_12xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_12xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_12xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_12xk_ri3 )
+
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_14xk.h b/frame/1m/packm/ukernels/bli_packm_ref_14xk.h
index 36ec5d1d9..f33849340 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_14xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_14xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_14xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_14xk_ri3 )
+
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_16xk.h b/frame/1m/packm/ukernels/bli_packm_ref_16xk.h
index d123c1fe8..55c19cbab 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_16xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_16xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_16xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_16xk_ri3 )
+
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_2xk.h b/frame/1m/packm/ukernels/bli_packm_ref_2xk.h
index 76b41db62..8ce60c9e3 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_2xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_2xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_2xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_2xk_ri3 )
+
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_4xk.h b/frame/1m/packm/ukernels/bli_packm_ref_4xk.h
index f10297efc..72980195d 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_4xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_4xk.h
@@ -59,17 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_4xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_4xk_ri3 )
 
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_6xk.h b/frame/1m/packm/ukernels/bli_packm_ref_6xk.h
index 271b0509e..af832df2a 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_6xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_6xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_6xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_6xk_ri3 )
+
diff --git a/frame/1m/packm/ukernels/bli_packm_ref_8xk.h b/frame/1m/packm/ukernels/bli_packm_ref_8xk.h
index a2dc9ec7e..0dd438fc3 100644
--- a/frame/1m/packm/ukernels/bli_packm_ref_8xk.h
+++ b/frame/1m/packm/ukernels/bli_packm_ref_8xk.h
@@ -59,16 +59,5 @@ void PASTEMAC(ch,varname)( \
 
 INSERT_GENTPROTCO_BASIC( packm_ref_8xk_ri )
 
-
-#undef  GENTPROTCO
-#define GENTPROTCO( ctype, ctype_r, ch, chr, varname ) \
-\
-void PASTEMAC(ch,varname)( \
-                           conj_t  conja, \
-                           dim_t   n, \
-                           void*   beta, \
-                           void*   a, inc_t inca, inc_t lda, \
-                           void*   p, inc_t psp,  inc_t ldp  \
-                         );
-
 INSERT_GENTPROTCO_BASIC( packm_ref_8xk_ri3 )
+