8 files changed, 22 insertions, 15 deletions
diff --git a/regress/libexec/ld.so/Makefile b/regress/libexec/ld.so/Makefile
index 6a48b5ef214..dc5bb9abf52 100644
--- a/regress/libexec/ld.so/Makefile
+++ b/regress/libexec/ld.so/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.16 2016/03/20 05:13:22 guenther Exp $
+#	$OpenBSD: Makefile,v 1.17 2016/09/27 06:52:50 kettenis Exp $
 
 SUBDIR+= elf hidden weak dlsym dlopen dlclose lazy
-#SUBDIR+= constructor 
+SUBDIR+= constructor 
 SUBDIR+= link-order edgecases initfirst
 SUBDIR+= df_1_noopen randomdata subst dependencies
 SUBDIR+= init-env
diff --git a/regress/libexec/ld.so/constructor/libaa/aa.C b/regress/libexec/ld.so/constructor/libaa/aa.C
index 8974fc873f6..530da6f32d0 100644
--- a/regress/libexec/ld.so/constructor/libaa/aa.C
+++ b/regress/libexec/ld.so/constructor/libaa/aa.C
@@ -1,10 +1,9 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: aa.C,v 1.1 2003/02/01 19:56:17 drahn Exp $
+ * $OpenBSD: aa.C,v 1.2 2016/09/27 06:52:50 kettenis Exp $
  */
 
-#include "iostream.h"
 #include "aa.h"
 int a;
 
diff --git a/regress/libexec/ld.so/constructor/libab/Makefile b/regress/libexec/ld.so/constructor/libab/Makefile
index 4053e97fea0..25ba75dc380 100644
--- a/regress/libexec/ld.so/constructor/libab/Makefile
+++ b/regress/libexec/ld.so/constructor/libab/Makefile
@@ -1,6 +1,6 @@
 LIB=ab
 SRCS= ab.C
-CFLAGS=-I${.CURDIR}/../libaa
+CPPFLAGS=-I${.CURDIR}/../libaa
 LDADD=-L../libaa
 LDADD+=-laa
 .include <bsd.lib.mk>
diff --git a/regress/libexec/ld.so/constructor/libab/ab.C b/regress/libexec/ld.so/constructor/libab/ab.C
index a6903d47a28..4c689a3f8fd 100644
--- a/regress/libexec/ld.so/constructor/libab/ab.C
+++ b/regress/libexec/ld.so/constructor/libab/ab.C
@@ -1,13 +1,15 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: ab.C,v 1.2 2003/02/18 13:14:42 jmc Exp $
+ * $OpenBSD: ab.C,v 1.3 2016/09/27 06:52:50 kettenis Exp $
  */
 
-#include "iostream.h"
+#include <iostream>
 #include "aa.h"
 #include "ab.h"
 
+using namespace std;
+
 extern int a;
 
 BB::BB(char *str)
diff --git a/regress/libexec/ld.so/constructor/prog1/Makefile b/regress/libexec/ld.so/constructor/prog1/Makefile
index 70440f5553a..11728afc525 100644
--- a/regress/libexec/ld.so/constructor/prog1/Makefile
+++ b/regress/libexec/ld.so/constructor/prog1/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2003/02/01 19:56:17 drahn Exp $
+# $OpenBSD: Makefile,v 1.2 2016/09/27 06:52:50 kettenis Exp $
 
 .include <bsd.obj.mk>
 
@@ -22,7 +22,7 @@ AB_OBJDIR!=    if [ -d $(AB_DIR)/${__objdir} ]; then \
 
 
 
-CFLAGS=-I${.CURDIR}/../libab
+CPPFLAGS=-I${.CURDIR}/../libab
 LDADD=
 LDADD+=-lab
 LDADD+=-laa
diff --git a/regress/libexec/ld.so/constructor/prog1/prog1.C b/regress/libexec/ld.so/constructor/prog1/prog1.C
index 07b7dd1d436..be3a9c178cd 100644
--- a/regress/libexec/ld.so/constructor/prog1/prog1.C
+++ b/regress/libexec/ld.so/constructor/prog1/prog1.C
@@ -1,10 +1,13 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: prog1.C,v 1.1 2003/02/01 19:56:17 drahn Exp $
+ * $OpenBSD: prog1.C,v 1.2 2016/09/27 06:52:50 kettenis Exp $
  */
-#include "iostream.h"
+#include <iostream>
 #include "ab.h"
+
+using namespace std;
+
 BB BBmain("main");
 
 int a;
diff --git a/regress/libexec/ld.so/constructor/prog2/Makefile b/regress/libexec/ld.so/constructor/prog2/Makefile
index a80ede7dd6d..760b524511e 100644
--- a/regress/libexec/ld.so/constructor/prog2/Makefile
+++ b/regress/libexec/ld.so/constructor/prog2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2003/02/01 19:56:17 drahn Exp $
+# $OpenBSD: Makefile,v 1.2 2016/09/27 06:52:50 kettenis Exp $
 
 .include <bsd.obj.mk>
 
@@ -22,7 +22,7 @@ AB_OBJDIR!=    if [ -d $(AB_DIR)/${__objdir} ]; then \
 
 
 
-CFLAGS=-I${.CURDIR}/../libab
+CPPFLAGS=-I${.CURDIR}/../libab
 LDADD=
 LDADD+=-laa
 LDADD+=-lab
diff --git a/regress/libexec/ld.so/constructor/prog2/prog2.C b/regress/libexec/ld.so/constructor/prog2/prog2.C
index 5d96a63d865..c7712e84bfd 100644
--- a/regress/libexec/ld.so/constructor/prog2/prog2.C
+++ b/regress/libexec/ld.so/constructor/prog2/prog2.C
@@ -1,10 +1,13 @@
 /*
  * Public Domain 2003 Dale Rahn
  *
- * $OpenBSD: prog2.C,v 1.1 2003/02/01 19:56:17 drahn Exp $
+ * $OpenBSD: prog2.C,v 1.2 2016/09/27 06:52:50 kettenis Exp $
  */
-#include "iostream.h"
+#include <iostream>
 #include "ab.h"
+
+using namespace std;
+
 BB BBmain("main");
 
 int a;