diff --git a/sched/Makefile.am b/sched/Makefile.am
index f4d68569fa..1d5371c6b1 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -130,7 +130,7 @@ fcgi_SOURCES =                                  \
 
 fcgi_DEPENDENCIES = $(LIBRSA) $(LIB_SCHED)
 fcgi_CPPFLAGS = -include fcgi_stdio.h -D_USING_FCGI_ $(AM_CPPFLAGS)
-fcgi_LDADD = $(LDADD) $(RSA_LIBS) -lfcgi -lfcgi++ $(MYSQL_LIBS)
+fcgi_LDADD = $(LDADD) $(RSA_LIBS) -lfcgi $(MYSQL_LIBS)
 
 .PHONY: PHONY-start
 
diff --git a/sched/handle_request.C b/sched/handle_request.C
index 9864c0aec2..6ef47e7cb2 100644
--- a/sched/handle_request.C
+++ b/sched/handle_request.C
@@ -23,7 +23,7 @@
 #include <string>
 using namespace std;
 
-#include <cstdio>
+#include <stdio.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <ctime>
diff --git a/sched/handle_request.h b/sched/handle_request.h
index 7dd17c2625..c0ebe75779 100644
--- a/sched/handle_request.h
+++ b/sched/handle_request.h
@@ -17,7 +17,7 @@
 // Contributor(s):
 //
 
-#include <cstdio>
+#include <stdio.h>
 
 #include "sched_shmem.h"
 #include "server_types.h"
diff --git a/sched/main.C b/sched/main.C
index b4276fae6b..9561e4e1b0 100644
--- a/sched/main.C
+++ b/sched/main.C
@@ -25,9 +25,9 @@
 #include <string>
 using namespace std;
 
-#include <cstdio>
+#include <stdio.h>
 #include <unistd.h>
-#include <cassert>
+#include <assert.h>
 #include <sys/stat.h>
 #include <sys/types.h>