diff --git a/include/fe_proto.h b/include/fe_proto.h
index 6a20a9b682a1..d69dce8e61b7 100644
--- a/include/fe_proto.h
+++ b/include/fe_proto.h
@@ -547,10 +547,8 @@ BOOL   FE_FileType(char * path,
 			(*context->funcs->SetFormElementToggle)(context, form_element,toggle)
 #define FE_FreeEmbedElement(context, data) \
 			(*context->funcs->FreeEmbedElement)(context, data)
-#ifdef SHACK
 #define FE_FreeBuiltinElement(context, data) \
                         (*context->funcs->FreeBuiltinElement)(context, data)
-#endif
 #endif /* MOZ_NGLAYOUT */
 #define FE_CreateEmbedWindow(context, data) \
             (*context->funcs->CreateEmbedWindow)(context, data)
@@ -588,10 +586,8 @@ BOOL   FE_FileType(char * path,
 #ifndef MOZ_NGLAYOUT
 #define FE_DisplayEmbed(context, iLocation , embed_struct) \
 			(*context->funcs->DisplayEmbed)(context, iLocation ,embed_struct)
-#ifdef SHACK
 #define FE_DisplayBuiltin(context, iLocation , builtin_struct) \
                         (*context->funcs->DisplayBuiltin)(context, iLocation ,builtin_struct)
-#endif
 #endif /* MOZ_NGLAYOUT */
 #define FE_DisplayJavaApp(context, iLocation , java_struct) \
 			(*context->funcs->DisplayJavaApp)(context, iLocation ,java_struct)
@@ -744,9 +740,7 @@ void            FE_ResetFormElement(MWContext * context, LO_FormElementStruct *
 void            FE_SetFormElementToggle(MWContext * context, LO_FormElementStruct * form_element, Bool toggle);
 #ifndef MOZ_NGLAYOUT
 void            FE_FreeEmbedElement(MWContext *context, LO_EmbedStruct *);
-#ifdef SHACK
 void            FE_FreeBuiltinElement(MWContext *context, LO_BuiltinStruct *);
-#endif
 #endif /* MOZ_NGLAYOUT */
 void            FE_FreeJavaAppElement(MWContext *context, struct LJAppletData *appletData);
 void            FE_HideJavaAppElement(MWContext *context, void*);
@@ -771,9 +765,7 @@ extern void FE_DisplaySubtext(MWContext * context, int iLocation, LO_TextStruct
 extern void FE_DisplayText(MWContext * context, int iLocation, LO_TextStruct *text, Bool need_bg);
 #ifndef MOZ_NGLAYOUT
 void        FE_DisplayEmbed(MWContext * context, int iLocation ,LO_EmbedStruct *embed_struct);
-#ifdef SHACK
 void        FE_DisplayBuiltin(MWContext * context, int iLocation ,LO_BuiltinStruct *builtin_struct);
-#endif
 #endif /* MOZ_NGLAYOUT */
 void        FE_DisplayJavaApp(MWContext * context, int iLocation ,LO_JavaAppStruct *java_struct);
 #ifndef MOZ_NGLAYOUT
diff --git a/include/lo_ele.h b/include/lo_ele.h
index bd4cc4d4d833..215e0d8e7f14 100644
--- a/include/lo_ele.h
+++ b/include/lo_ele.h
@@ -123,12 +123,8 @@
 #define LO_HEADING		25
 #define LO_SPAN			26
 #define LO_DIV			27
-#ifdef SHACK
 #define LO_BUILTIN      28
 #define LO_SPACER		29
-#else
-#define LO_SPACER		28
-#endif /* SHACK */
 
 #define LO_FONT_NORMAL      0x0000
 #define LO_FONT_BOLD        0x0001
@@ -989,7 +985,6 @@ struct LO_CommonPluginStruct_struct {
 #endif		
 };
 
-#ifdef SHACK
 struct LO_BuiltinStruct_struct {
 		int16 type;
 		int16 x_offset;
@@ -1029,7 +1024,6 @@ struct LO_BuiltinStruct_struct {
 		int32 percent_width; /* needed for relayout. */
 		int32 percent_height; /* needed for relayout. */
 };
-#endif /* SHACK */
 
 struct LO_EmbedStruct_struct {
     struct LO_CommonPluginStruct_struct objTag;     /* "superclass" */
@@ -1273,9 +1267,7 @@ union LO_Element_struct {
 	LO_SpanStruct lo_span;
 	LO_DivStruct lo_div;
 	LO_SpacerStruct lo_spacer;
-#ifdef SHACK
 	LO_BuiltinStruct lo_builtin;
-#endif /* SHACK */
 };
 
 struct LO_ObjectStruct_struct {
@@ -1365,9 +1357,7 @@ typedef enum LO_LayerType_enum {
 #define LO_BLINK_GROUP_NAME "_BLINKGROUP"
 #define LO_CONTENT_LAYER_NAME "_CONTENT"
 #define LO_EMBED_LAYER_NAME "_EMBED"
-#ifdef SHACK
 #define LO_BUILTIN_LAYER_NAME "_BUILTIN"
-#endif /* SHACK */
 
 #define LO_DOCUMENT_LAYER_ID 0
 
diff --git a/include/mk_cx_fn.h b/include/mk_cx_fn.h
index 46e4ef9b605d..31d851167222 100644
--- a/include/mk_cx_fn.h
+++ b/include/mk_cx_fn.h
@@ -75,9 +75,7 @@ FE_DEFINE(GetFormElementValue,void, (MWContext * context, LO_FormElementStruct *
 FE_DEFINE(ResetFormElement,void, (MWContext * context, LO_FormElementStruct * form_element))
 FE_DEFINE(SetFormElementToggle,void, (MWContext * context, LO_FormElementStruct * form_element, XP_Bool toggle))
 FE_DEFINE(FreeEmbedElement,void, (MWContext *context, LO_EmbedStruct *))
-#ifdef SHACK
 FE_DEFINE(FreeBuiltinElement,void, (MWContext *context, LO_BuiltinStruct *))
-#endif
 #endif /* MOZ_NGLAYOUT */
 FE_DEFINE(CreateEmbedWindow, void, (MWContext *context, NPEmbeddedApp *app))
 FE_DEFINE(SaveEmbedWindow, void, (MWContext *context, NPEmbeddedApp *app))
@@ -93,9 +91,7 @@ FE_DEFINE(DisplaySubtext,void, (MWContext * context, int iLocation, LO_TextStruc
 FE_DEFINE(DisplayText,void, (MWContext * context, int iLocation, LO_TextStruct *text, XP_Bool need_bg))
 #ifndef MOZ_NGLAYOUT
 FE_DEFINE(DisplayEmbed,void, (MWContext * context, int iLocation ,LO_EmbedStruct *embed_struct))
-#ifdef SHACK
 FE_DEFINE(DisplayBuiltin,void, (MWContext * context, int iLocation ,LO_BuiltinStruct *builtin_struct))
-#endif
 #endif /* MOZ_NGLAYOUT */
 FE_DEFINE(DisplayJavaApp,void, (MWContext * context, int iLocation ,LO_JavaAppStruct *java_struct))
 #ifndef MOZ_NGLAYOUT
diff --git a/include/ntypes.h b/include/ntypes.h
index ee105cf8c7fa..83621435da7f 100644
--- a/include/ntypes.h
+++ b/include/ntypes.h
@@ -90,9 +90,7 @@ typedef struct LO_ImageStruct_struct LO_ImageStruct;
 typedef struct LO_SubDocStruct_struct LO_SubDocStruct;
 typedef struct LO_CommonPluginStruct_struct LO_CommonPluginStruct;
 typedef struct LO_EmbedStruct_struct LO_EmbedStruct;
-#ifdef SHACK
 typedef struct LO_BuiltinStruct_struct LO_BuiltinStruct;
-#endif /* SHACK */
 typedef struct LO_JavaAppStruct_struct LO_JavaAppStruct;
 typedef struct LO_EdgeStruct_struct LO_EdgeStruct;
 typedef struct LO_ObjectStruct_struct LO_ObjectStruct;