diff --git a/historic/jam/src/rules.c b/historic/jam/src/rules.c
index 955da344d..0d3a748a8 100644
--- a/historic/jam/src/rules.c
+++ b/historic/jam/src/rules.c
@@ -134,12 +134,13 @@ bindtarget( const char *targetname )
 	if( !targethash )
 	    targethash = hashinit( sizeof( TARGET ), "targets" );
 
-	t->name = targetname;
+    /* Perforce added const everywhere. No time to merge that change. */
+	t->name = (char*)targetname;
 
 	if( hashenter( targethash, (HASHDATA **)&t ) )
 	{
 	    memset( (char *)t, '\0', sizeof( *t ) );
-	    t->name = newstr( targetname );	/* never freed */
+	    t->name = newstr( (char*)targetname );	/* never freed */
 	    t->boundname = t->name;		/* default for T_FLAG_NOTFILE */
 	}
 
diff --git a/historic/jam/src/rules.h b/historic/jam/src/rules.h
index e1eca16f6..a66ec61c6 100644
--- a/historic/jam/src/rules.h
+++ b/historic/jam/src/rules.h
@@ -235,9 +235,7 @@ void freeactions( ACTIONS *chain );
 SETTINGS *addsettings( SETTINGS *head, int append, char *symbol, LIST *value );
 void 	pushsettings( SETTINGS *v );
 void 	popsettings( SETTINGS *v );
-#ifdef OPT_FIX_TARGET_VARIABLES_EXT
 SETTINGS *copysettings( SETTINGS *v );
-#endif
 void 	freesettings( SETTINGS *v );
 void    rule_free( RULE *r );
 void	donerules();
diff --git a/jam_src/rules.c b/jam_src/rules.c
index 955da344d..0d3a748a8 100644
--- a/jam_src/rules.c
+++ b/jam_src/rules.c
@@ -134,12 +134,13 @@ bindtarget( const char *targetname )
 	if( !targethash )
 	    targethash = hashinit( sizeof( TARGET ), "targets" );
 
-	t->name = targetname;
+    /* Perforce added const everywhere. No time to merge that change. */
+	t->name = (char*)targetname;
 
 	if( hashenter( targethash, (HASHDATA **)&t ) )
 	{
 	    memset( (char *)t, '\0', sizeof( *t ) );
-	    t->name = newstr( targetname );	/* never freed */
+	    t->name = newstr( (char*)targetname );	/* never freed */
 	    t->boundname = t->name;		/* default for T_FLAG_NOTFILE */
 	}
 
diff --git a/jam_src/rules.h b/jam_src/rules.h
index e1eca16f6..a66ec61c6 100644
--- a/jam_src/rules.h
+++ b/jam_src/rules.h
@@ -235,9 +235,7 @@ void freeactions( ACTIONS *chain );
 SETTINGS *addsettings( SETTINGS *head, int append, char *symbol, LIST *value );
 void 	pushsettings( SETTINGS *v );
 void 	popsettings( SETTINGS *v );
-#ifdef OPT_FIX_TARGET_VARIABLES_EXT
 SETTINGS *copysettings( SETTINGS *v );
-#endif
 void 	freesettings( SETTINGS *v );
 void    rule_free( RULE *r );
 void	donerules();