-#ifdef GHCI
-/* entry code for constructors created by the metacircular interpreter */
-STGFUN(stg_mci_constr_entry);
-STGFUN(stg_mci_constr1_entry);
-STGFUN(stg_mci_constr2_entry);
-STGFUN(stg_mci_constr3_entry);
-STGFUN(stg_mci_constr4_entry);
-STGFUN(stg_mci_constr5_entry);
-STGFUN(stg_mci_constr6_entry);
-STGFUN(stg_mci_constr7_entry);
-STGFUN(stg_mci_constr8_entry);
-#endif
+/* entry code for constructors created by the bytecode interpreter */
+STGFUN(stg_interp_constr_entry);
+STGFUN(stg_interp_constr1_entry);
+STGFUN(stg_interp_constr2_entry);
+STGFUN(stg_interp_constr3_entry);
+STGFUN(stg_interp_constr4_entry);
+STGFUN(stg_interp_constr5_entry);
+STGFUN(stg_interp_constr6_entry);
+STGFUN(stg_interp_constr7_entry);
+STGFUN(stg_interp_constr8_entry);
+
+/* Magic glue code for when compiled code returns a value in R1/F1/D1
+ or a VoidRep to the interpreter. */
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_R1p_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_R1n_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_F1_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_D1_info;
+extern DLL_IMPORT_RTS const vec_info_8 stg_ctoi_ret_V_info;
+
+/* Used by the interpreter to return an unboxed value on the stack to
+ compiled code. */
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_unbx_r1_info;
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_f1_info;
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_d1_info;
+extern DLL_IMPORT_RTS const StgInfoTable stg_gc_l1_info;
+