1 files changed, 11 insertions, 13 deletions
diff --git a/src/rebuild.h b/src/rebuild.h
index f1255c6..8e0c78a 100644
--- a/src/rebuild.h
+++ b/src/rebuild.h
@@ -5,32 +5,30 @@
 
 #include <vector>
 #include <array>
+#include <string>
+#include <functional>
 
-#include "libctor.h"
-
-class Settings;
+#include "ctor.h"
 
 struct BuildConfigurationEntry
 {
-	const char* file;
-	BuildConfigurations (*cb)(const Settings&);
+	std::string file;
+	std::function<ctor::build_configurations (const ctor::settings&)> cb;
 };
 
+std::vector<BuildConfigurationEntry>& getConfigFileList();
+
 struct ExternalConfigurationEntry
 {
-	const char* file;
-	ExternalConfigurations (*cb)(const Settings&);
+	std::string file;
+	std::function<ctor::external_configurations (const ctor::settings&)> cb;
 };
 
-extern std::array<BuildConfigurationEntry, 1024> configFiles;
-extern std::size_t numConfigFiles;
-
-extern std::array<ExternalConfigurationEntry, 1024> externalConfigFiles;
-extern std::size_t numExternalConfigFiles;
+std::vector<ExternalConfigurationEntry>& getExternalConfigFileList();
 
 int reg(const char* location);
 int unreg(const char* location);
 
 //! Returns true of recompilation was needed.
-bool recompileCheck(const Settings& settings, int argc, char* argv[],
+bool recompileCheck(const ctor::settings& settings, int argc, char* argv[],
                     bool relaunch_allowed = true);