3 files changed, 4 insertions, 8 deletions
diff --git a/dev/BuildKit/IManifestBuilder.h b/dev/BuildKit/IManifestBuilder.h
index bb1881d..1dd8bce 100644
--- a/dev/BuildKit/IManifestBuilder.h
+++ b/dev/BuildKit/IManifestBuilder.h
@@ -25,7 +25,7 @@ class IManifestBuilder {
   /// @param arg_val filename path.
   /// @retval true succeeded.
   /// @retval false failed.
-  virtual bool BuildTarget(int arg_sz, const char* arg_val, const bool dry_run = false) = 0;
+  virtual bool BuildTarget(const std::string& arg, const bool dry_run = false) = 0;
   virtual const char* BuildSystem() = 0;
 };
 }  // namespace NeBuild
 \ No newline at end of file
diff --git a/dev/BuildKit/Imports.h b/dev/BuildKit/Imports.h
index b365dca..9260c1e 100644
--- a/dev/BuildKit/Imports.h
+++ b/dev/BuildKit/Imports.h
@@ -13,11 +13,7 @@
 #include <sstream>
 #include <string>
 #include <thread>
-
-extern "C" {
-#include <assert.h>
-}
-
-#include <rang.h>
+#include <cassert>
+#include <rang/rang.h>
 
 #endif  // NEBUILD_INCLUDES_H
diff --git a/dev/BuildKit/JSONManifestBuilder.h b/dev/BuildKit/JSONManifestBuilder.h
index dd81e8c..b853ccf 100644
--- a/dev/BuildKit/JSONManifestBuilder.h
+++ b/dev/BuildKit/JSONManifestBuilder.h
@@ -27,7 +27,7 @@ class JSONManifestBuilder final NEBUILD_MANIFEST_BUILDER {
   /// @param arg_val filename path.
   /// @retval true build succeeded.
   /// @retval false failed to build.
-  bool BuildTarget(int arg_sz, const char* arg_val, const bool dry_run = false) override;
+  bool BuildTarget(const std::string& arg_val, const bool dry_run = false) override;
   const char* BuildSystem() override;
 };
 }  // namespace NeBuild
 \ No newline at end of file