diff --git a/MultiSource/Benchmarks/FreeBench/pifft/Makefile b/MultiSource/Benchmarks/FreeBench/pifft/Makefile
index a263379cc..91fb07d7a 100644
--- a/MultiSource/Benchmarks/FreeBench/pifft/Makefile
+++ b/MultiSource/Benchmarks/FreeBench/pifft/Makefile
@@ -1,7 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = pifft
-CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
+CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\""
 LDFLAGS  = -lm
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = $(PROJ_SRC_DIR)/ref.in
diff --git a/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
index 341354350..96a2f50ea 100644
--- a/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/espresso/CMakeLists.txt
@@ -1,5 +1,5 @@
 list(APPEND CPPFLAGS -DNOMEMOPT)
-list(APPEND CFLAGS -std=gnu89)
+list(APPEND CFLAGS -std=gnu89 -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 set(RUN_OPTIONS -t INPUT/largest.espresso)
 llvm_multisource(espresso)
 llvm_test_data(espresso INPUT/largest.espresso)
diff --git a/MultiSource/Benchmarks/MallocBench/espresso/Makefile b/MultiSource/Benchmarks/MallocBench/espresso/Makefile
index f9d70b16d..9d4973dda 100644
--- a/MultiSource/Benchmarks/MallocBench/espresso/Makefile
+++ b/MultiSource/Benchmarks/MallocBench/espresso/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../..
 PROG = espresso
 CPPFLAGS += -DNOMEMOPT
-CFLAGS += -std=gnu89
+CFLAGS += -std=gnu89 -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 RUN_OPTIONS = -t $(PROJ_SRC_DIR)/INPUT/largest.espresso
 include ../../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt b/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
index 08e05bd86..dce95c155 100644
--- a/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/05-eks/CMakeLists.txt
@@ -1,2 +1,3 @@
 list(APPEND LDFLAGS -lm)
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 llvm_multisource(eks)
diff --git a/MultiSource/Benchmarks/McCat/05-eks/Makefile b/MultiSource/Benchmarks/McCat/05-eks/Makefile
index 2c56a443c..dc9feb9e2 100644
--- a/MultiSource/Benchmarks/McCat/05-eks/Makefile
+++ b/MultiSource/Benchmarks/McCat/05-eks/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../..
 PROG = eks
+CFLAGS += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 #STDIN_FILENAME = bnchmrk.in1
diff --git a/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
index b1033271e..c2c1f17bb 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/consumer-lame/CMakeLists.txt
@@ -1,4 +1,5 @@
 list(APPEND CPPFLAGS -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -DLAMESNDFILE)
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -S large.wav /dev/null)
 llvm_multisource(consumer-lame)
diff --git a/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile b/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
index 484e8e426..21546e8c1 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
+++ b/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
@@ -2,6 +2,7 @@ LEVEL = ../../../..
 
 PROG     = consumer-lame
 CPPFLAGS = -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 RUN_OPTIONS = -S $(PROJ_SRC_DIR)/large.wav /dev/null
 
diff --git a/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
index 6925e01d6..fd08ad273 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/consumer-typeset/CMakeLists.txt
@@ -1,4 +1,5 @@
 list(APPEND CPPFLAGS -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR="lout.lib" -DFONT_DIR="font" -DMAPS_DIR="maps" -DINCL_DIR="include" -DDATA_DIR="data" -DHYPH_DIR="hyph" -DLOCALE_DIR="locale" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0)
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 
 if(ARCH STREQUAL "Mips")
   list(APPEND CPPFLAGS -DCOLLATE=0 -DLOCALE_ON=0)
diff --git a/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile b/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
index 98a3be02e..76e3b264f 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
+++ b/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
@@ -4,6 +4,7 @@ PROG     = consumer-typeset
 # FORTIFY_SOURCE is turned off for this benchmark because the type lies at some
 # point in this program and FORIFY implementations rely on the correct type.
 CPPFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"lout.lib\" -DFONT_DIR=\"font\" -DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" -DHYPH_DIR=\"hyph\" -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 
 ifeq ($(ARCH),Mips)
 CPPFLAGS += -DCOLLATE=0 -DLOCALE_ON=0
diff --git a/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
index c412039f0..fe0d9b0ec 100644
--- a/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/network-patricia/CMakeLists.txt
@@ -1,3 +1,4 @@
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS large.udp)
 set(HASH_PROGRAM_OUTPUT 1)
diff --git a/MultiSource/Benchmarks/MiBench/network-patricia/Makefile b/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
index e07b48014..e445e02bb 100644
--- a/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
+++ b/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = network-patricia
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 RUN_OPTIONS = $(PROJ_SRC_DIR)/large.udp
 HASH_PROGRAM_OUTPUT = 1
diff --git a/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
index 13920af8e..a90cd5cb5 100644
--- a/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/office-ispell/CMakeLists.txt
@@ -1,4 +1,5 @@
 list(APPEND CPPFLAGS -Dconst=)
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -a -d americanmed+ < large.txt)
 llvm_multisource(office-ispell)
diff --git a/MultiSource/Benchmarks/MiBench/office-ispell/Makefile b/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
index 5f3b84011..a509eec7a 100644
--- a/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
+++ b/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
@@ -2,6 +2,7 @@ LEVEL = ../../../..
 
 PROG     = office-ispell
 CPPFLAGS = -Dconst=
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 RUN_OPTIONS = -a -d $(PROJ_SRC_DIR)/americanmed+
 STDIN_FILENAME = $(PROJ_SRC_DIR)/large.txt
diff --git a/MultiSource/Benchmarks/Olden/bh/args.c b/MultiSource/Benchmarks/Olden/bh/args.c
index 0abbdbced..171cc7178 100644
--- a/MultiSource/Benchmarks/Olden/bh/args.c
+++ b/MultiSource/Benchmarks/Olden/bh/args.c
@@ -1,5 +1,5 @@
 /* For copyright information, see olden_v1.0/COPYRIGHT */
-#include <stdlib_checked.h>
+#include <stdlib.h>
 
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/bisort/args.c b/MultiSource/Benchmarks/Olden/bisort/args.c
index 9304919c1..946ec28dc 100644
--- a/MultiSource/Benchmarks/Olden/bisort/args.c
+++ b/MultiSource/Benchmarks/Olden/bisort/args.c
@@ -1,6 +1,6 @@
 /* For copyright information, see olden_v1.0/COPYRIGHT */
 #include <stdchecked.h>
-#include <stdlib_checked.h>
+#include <stdlib.h>
 
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/bisort/bitonic.c b/MultiSource/Benchmarks/Olden/bisort/bitonic.c
index d48d09062..906c0c832 100644
--- a/MultiSource/Benchmarks/Olden/bisort/bitonic.c
+++ b/MultiSource/Benchmarks/Olden/bisort/bitonic.c
@@ -4,7 +4,7 @@
 /* UP - 0, DOWN - 1 */
 #include "node.h"   /* Node Definition */
 #include "proc.h"   /* Procedure Types/Nums */
-#include <stdio_checked.h>
+#include <stdio.h>
 
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/em3d/util.c b/MultiSource/Benchmarks/Olden/em3d/util.c
index 999da65c3..910691306 100644
--- a/MultiSource/Benchmarks/Olden/em3d/util.c
+++ b/MultiSource/Benchmarks/Olden/em3d/util.c
@@ -1,6 +1,6 @@
 /* For copyright information, see olden_v1.0/COPYRIGHT */
 
-#include <stdlib_checked.h>
+#include <stdlib.h>
 #include "em3d.h"
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/health/args.c b/MultiSource/Benchmarks/Olden/health/args.c
index 56a2d50b4..451d5f048 100644
--- a/MultiSource/Benchmarks/Olden/health/args.c
+++ b/MultiSource/Benchmarks/Olden/health/args.c
@@ -6,8 +6,8 @@
  *****************************************************************/
 
 #include <stdchecked.h>
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "health.h"
 
 void dealwithargs(int argc, array_ptr<nt_array_ptr<char>> argv : count(argc)) {
diff --git a/MultiSource/Benchmarks/Olden/health/health.c b/MultiSource/Benchmarks/Olden/health/health.c
index 11872fe46..dcd8240a6 100644
--- a/MultiSource/Benchmarks/Olden/health/health.c
+++ b/MultiSource/Benchmarks/Olden/health/health.c
@@ -4,8 +4,8 @@
  *  Health.c : Model of the Columbian Health Care System           *
  *******************************************************************/ 
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <math.h>
 #include "health.h"
 #include <assert.h>
diff --git a/MultiSource/Benchmarks/Olden/health/list.c b/MultiSource/Benchmarks/Olden/health/list.c
index 1db46a524..161e22a93 100644
--- a/MultiSource/Benchmarks/Olden/health/list.c
+++ b/MultiSource/Benchmarks/Olden/health/list.c
@@ -6,8 +6,8 @@
  ********************************************************************/
 
 #include <stdchecked.h>
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "health.h"
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/mst/hash.c b/MultiSource/Benchmarks/Olden/mst/hash.c
index 2ef0dc8c1..e618a2264 100644
--- a/MultiSource/Benchmarks/Olden/mst/hash.c
+++ b/MultiSource/Benchmarks/Olden/mst/hash.c
@@ -1,7 +1,7 @@
 /* For copyright information, see olden_v1.0/COPYRIGHT */
 
 #include <stdchecked.h>
-#include <stdlib_checked.h>
+#include <stdlib.h>
 #include "hash.h"
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/perimeter/main.c b/MultiSource/Benchmarks/Olden/perimeter/main.c
index e4e928045..cca7b7af5 100644
--- a/MultiSource/Benchmarks/Olden/perimeter/main.c
+++ b/MultiSource/Benchmarks/Olden/perimeter/main.c
@@ -2,8 +2,8 @@
 
 #include <stdchecked.h>
 #include "perimeter.h"
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #define printf(...) unchecked { printf(__VA_ARGS__); }
 
diff --git a/MultiSource/Benchmarks/Olden/perimeter/maketree.c b/MultiSource/Benchmarks/Olden/perimeter/maketree.c
index 4f28cd2ca..ab89ac7be 100644
--- a/MultiSource/Benchmarks/Olden/perimeter/maketree.c
+++ b/MultiSource/Benchmarks/Olden/perimeter/maketree.c
@@ -2,7 +2,7 @@
 
 #include <stdchecked.h>
 #include "perimeter.h"
-#include <stdlib_checked.h>
+#include <stdlib.h>
 
 #pragma CHECKED_SCOPE ON
 
diff --git a/MultiSource/Benchmarks/Olden/power/build.c b/MultiSource/Benchmarks/Olden/power/build.c
index 5c19c409c..2159d797d 100644
--- a/MultiSource/Benchmarks/Olden/power/build.c
+++ b/MultiSource/Benchmarks/Olden/power/build.c
@@ -10,7 +10,7 @@
  * University of California at Berkeley
  */
 
-#include <stdlib_checked.h>
+#include <stdlib.h>
 #include "power.h"
 
 #pragma CHECKED_SCOPE ON
diff --git a/MultiSource/Benchmarks/Olden/power/compute.c b/MultiSource/Benchmarks/Olden/power/compute.c
index 2245c1a69..1460a24f0 100644
--- a/MultiSource/Benchmarks/Olden/power/compute.c
+++ b/MultiSource/Benchmarks/Olden/power/compute.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <stdlib_checked.h>
+#include <stdlib.h>
 #include "power.h"
 
 #pragma CHECKED_SCOPE ON
diff --git a/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
index bf3b189b8..de9e64d13 100644
--- a/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/archie-client/CMakeLists.txt
@@ -1,6 +1,7 @@
 include(CheckFunctionExists)
 check_function_exists(re_comp HAVE_RE_COMP)
 
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 if(HAVE_RE_COMP)
   if(TARGET_OS STREQUAL "SunOS")
     list(APPEND LDFLAGS -lsocket -lnsl)
diff --git a/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile b/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile
index 700b6b153..2804f7cfd 100644
--- a/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile
@@ -7,6 +7,8 @@ ifdef HAVE_RE_COMP
 PROG = archie
 endif
 
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
 ifeq ($(TARGET_OS),SunOS)
diff --git a/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
index d2ed58541..bea20d97f 100644
--- a/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/cdecl/CMakeLists.txt
@@ -1,4 +1,4 @@
-list(APPEND CFLAGS -std=gnu89)
+list(APPEND CFLAGS -std=gnu89 -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 set(RUN_OPTIONS < testset)
 llvm_multisource(cdecl)
 llvm_test_data(cdecl testset)
diff --git a/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile b/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile
index 2ab08a414..a35c5c722 100644
--- a/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 CFLAGS += -std=gnu89
+CFLAGS += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 
 PROG = cdecl
 STDIN_FILENAME = $(SourceDir)/testset
diff --git a/MultiSource/Benchmarks/Ptrdist/anagram/anagram.c b/MultiSource/Benchmarks/Ptrdist/anagram/anagram.c
index df84cca34..cf9908d0b 100644
--- a/MultiSource/Benchmarks/Ptrdist/anagram/anagram.c
+++ b/MultiSource/Benchmarks/Ptrdist/anagram/anagram.c
@@ -128,9 +128,9 @@
  * prototypes, for those of you who have K&R compilers.
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
-#include <string_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/MultiSource/Benchmarks/Ptrdist/ft/Fheap.c b/MultiSource/Benchmarks/Ptrdist/ft/Fheap.c
index ac245f821..227cd3069 100644
--- a/MultiSource/Benchmarks/Ptrdist/ft/Fheap.c
+++ b/MultiSource/Benchmarks/Ptrdist/ft/Fheap.c
@@ -37,8 +37,8 @@
  */
 
 #include <assert.h>
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "Fheap.h"
 #include "Fstruct.h"
 
diff --git a/MultiSource/Benchmarks/Ptrdist/ft/Fsanity.c b/MultiSource/Benchmarks/Ptrdist/ft/Fsanity.c
index a12005885..a40c80849 100644
--- a/MultiSource/Benchmarks/Ptrdist/ft/Fsanity.c
+++ b/MultiSource/Benchmarks/Ptrdist/ft/Fsanity.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include <stdio_checked.h>
+#include <stdio.h>
 #include "Fheap.h"
 #include "Fstruct.h"
 
diff --git a/MultiSource/Benchmarks/Ptrdist/ft/ft.c b/MultiSource/Benchmarks/Ptrdist/ft/ft.c
index 86cd5397a..0c387d78d 100644
--- a/MultiSource/Benchmarks/Ptrdist/ft/ft.c
+++ b/MultiSource/Benchmarks/Ptrdist/ft/ft.c
@@ -35,8 +35,8 @@
  */
 
 #include <limits.h>
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include <sys/time.h>
diff --git a/MultiSource/Benchmarks/Ptrdist/ft/graph.c b/MultiSource/Benchmarks/Ptrdist/ft/graph.c
index b80763639..8a24e4733 100644
--- a/MultiSource/Benchmarks/Ptrdist/ft/graph.c
+++ b/MultiSource/Benchmarks/Ptrdist/ft/graph.c
@@ -29,8 +29,8 @@
  */
 
 #include <assert.h>
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "graph.h"
 
 #pragma CHECKED_SCOPE ON
diff --git a/MultiSource/Benchmarks/Ptrdist/ft/item.c b/MultiSource/Benchmarks/Ptrdist/ft/item.c
index 7558ae023..630cab7cd 100644
--- a/MultiSource/Benchmarks/Ptrdist/ft/item.c
+++ b/MultiSource/Benchmarks/Ptrdist/ft/item.c
@@ -28,8 +28,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include "item.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/ks/KS-1.c b/MultiSource/Benchmarks/Ptrdist/ks/KS-1.c
index 9c0268a3a..045937c98 100644
--- a/MultiSource/Benchmarks/Ptrdist/ks/KS-1.c
+++ b/MultiSource/Benchmarks/Ptrdist/ks/KS-1.c
@@ -8,9 +8,9 @@
  *	date:		Thursday, February 25, 1993
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
-#include <string_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include "KS.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/ks/KS-2.c b/MultiSource/Benchmarks/Ptrdist/ks/KS-2.c
index 83f99045e..04e05ea6e 100644
--- a/MultiSource/Benchmarks/Ptrdist/ks/KS-2.c
+++ b/MultiSource/Benchmarks/Ptrdist/ks/KS-2.c
@@ -8,9 +8,9 @@
  *	date:		Thursday, February 25, 1993
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
-#include <string_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include "KS.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/assign.c b/MultiSource/Benchmarks/Ptrdist/yacr2/assign.c
index b75aa3f38..d847bbe38 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/assign.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/assign.c
@@ -14,8 +14,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include "types.h"
 #include "assign.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/channel.c b/MultiSource/Benchmarks/Ptrdist/yacr2/channel.c
index 4b42684d5..7ef4d27e5 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/channel.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/channel.c
@@ -14,8 +14,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "types.h"
 #include "channel.h"
 
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/hcg.c b/MultiSource/Benchmarks/Ptrdist/yacr2/hcg.c
index 0153a9f85..28649315a 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/hcg.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/hcg.c
@@ -14,8 +14,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include "types.h"
 #include "hcg.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/main.c b/MultiSource/Benchmarks/Ptrdist/yacr2/main.c
index 15c0ec225..e08c99ecd 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/main.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/main.c
@@ -15,8 +15,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include "option.h"
 #include "channel.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/maze.c b/MultiSource/Benchmarks/Ptrdist/yacr2/maze.c
index 96bb1434a..5f9711e66 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/maze.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/maze.c
@@ -1,7 +1,7 @@
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
-#include <string_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include "channel.h"
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/option.c b/MultiSource/Benchmarks/Ptrdist/yacr2/option.c
index 961d27ece..80fc1e767 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/option.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/option.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include <string_checked.h>
+#include <string.h>
 
 #define OPTION_CODE
 
@@ -16,8 +16,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include "channel.h"
 
 #pragma CHECKED_SCOPE ON
diff --git a/MultiSource/Benchmarks/Ptrdist/yacr2/vcg.c b/MultiSource/Benchmarks/Ptrdist/yacr2/vcg.c
index 5289316c4..00582c99e 100644
--- a/MultiSource/Benchmarks/Ptrdist/yacr2/vcg.c
+++ b/MultiSource/Benchmarks/Ptrdist/yacr2/vcg.c
@@ -15,8 +15,8 @@
  *
  */
 
-#include <stdio_checked.h>
-#include <stdlib_checked.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include "types.h"
 #include "vcg.h"
diff --git a/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
index c9b5e5ca9..af2cab8c4 100644
--- a/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/netbench-url/CMakeLists.txt
@@ -1,3 +1,4 @@
+list(APPEND CFLAGS -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS)
 if(LARGE_PROBLEM_SIZE)
   set(RUN_OPTIONS medium_inputs 1400)
 else()
diff --git a/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile b/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile
index 0709ea4b1..2ec638159 100644
--- a/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile
+++ b/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = netbench-url
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = $(PROJ_SRC_DIR)/medium_inputs 1400
 else