Index: lib/sbin/CreateConfigurationBindings.pl
===================================================================
--- lib/sbin/CreateConfigurationBindings.pl	(revision 4633)
+++ lib/sbin/CreateConfigurationBindings.pl	(working copy)
@@ -90,6 +90,8 @@
           $temp .= $cfg->{"\U$thorn $providedcap\E MAKE_DEFINITION"};
         }
 
+        $temp .=  "HAVE_CAPABILITY_$providedcap = 1\n";
+
         &WriteFile("Capabilities/make.\U$providedcap\E.defn",\$temp);
 
         $temp = '';
@@ -106,6 +108,8 @@
             $temp .=  $lines . "\n";
         }
 
+        $temp .=  "#define HAVE_CAPABILITY_$providedcap 1\n";
+
         &WriteFile("Capabilities/cctki_\U$providedcap\E.h",\$temp);
         $temp = '';
 
@@ -163,7 +167,6 @@
         {
           $defs .= $providedcap . " = 1\n";
           $defs .= "include $bindings_dir/Configuration/Capabilities/make.\U$providedcap\E.defn\n";
-          $incs .= "#define " . $cfg->{"\U$thorn\E OPTIONAL \U$providedcap\E DEFINE"} . " 1\n";
           $incs .= "#include \"../Capabilities/cctki_\U$providedcap\E.h\"\n";
           $deps .= "include $bindings_dir/Configuration/Capabilities/make.\U$providedcap\E.deps\n";
         }
@@ -205,7 +208,7 @@
   $temp = $linkerdirs . "\n" . $linkerlibs . "\n";
   &WriteFile("make.link",\$temp);
 
-  # write cctki_Capabilities.h file to bindings/include
+  # write cctk_Capabilities.h file to bindings/include
   # this file adds the if_i_am_thorn stuff
   $temp = '';
   foreach $thorn (sort keys %thorns)
@@ -218,7 +221,7 @@
       $temp .= "\n";
     }
   }
-  &WriteFile("../include/cctki_Capabilities.h",\$temp);
+  &WriteFile("../include/cctk_Capabilities.h",\$temp);
 }
 
 return 1;
Index: lib/make/make.config.defn.in
===================================================================
--- lib/make/make.config.defn.in	(revision 4633)
+++ lib/make/make.config.defn.in	(working copy)
@@ -141,7 +141,7 @@
 export USE_RANLIB = @USE_RANLIB@
 
 # Exclude some files from the dependency lists
-export DEP_EXCLUDE_FILES = cctk_Functions\.h|CParameterStructNames\.h|cctk_Arguments\.h|definethisthorn\.h|FParameters.h|CParameters\.h
+export DEP_EXCLUDE_FILES = cctk_Functions\.h|CParameterStructNames\.h|cctk_Arguments\.h|definethisthorn\.h|FParameters.h|CParameters\.h|cctk_Capabilities\.h
 
 # Command used to get the working directory
 export GET_WD = @GET_WD@
Index: src/include/cctk.h
===================================================================
--- src/include/cctk.h	(revision 4633)
+++ src/include/cctk.h	(working copy)
@@ -21,6 +21,8 @@
 /* Include the constants */
 #include "cctk_Constants.h"
 
+/* Include definitions provided by capabilities */
+#include "cctk_Capabilities.h"
 
 /* Define some stuff */