diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 82f1a9dd9..559ce872c 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -74,7 +74,6 @@
 #include <errno.h>
 
 #include "libs/json11/json11.hpp"
-#include "devtools/build/runtime/get_runfiles_dir.h"
 
 YOSYS_NAMESPACE_BEGIN
 
@@ -984,8 +983,7 @@ void init_share_dirname()
 		return;
 	}
 #    ifdef YOSYS_DATDIR
-	proc_share_path = devtools_build::GetRunfilesDir() + "/";
-	proc_share_path += YOSYS_DATDIR "/";
+	proc_share_path = YOSYS_DATDIR "/";
 	if (check_file_exists(proc_share_path, true)) {
 		yosys_share_dirname = proc_share_path;
 		return;
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 5ee5eb75f..99edfb700 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -343,11 +343,6 @@ bool is_absolute_path(std::string filename);
 void remove_directory(std::string dirname);
 std::string escape_filename_spaces(const std::string& filename);
 
-using ys_size_type = int64_t;  // Large enough to deal with large number of data, but also not experiencing unsigned overflow.
-
-// TODO(hzeller): these need to return ys_size_type, but in the course of
-// refactoring, each type will be handled separately (and gets their own GetSize() function). After all
-// size types are converted, this template can be changed to return ys_size_type.
 template<typename T> int GetSize(const T &obj) { return obj.size(); }
 inline int GetSize(RTLIL::Wire *wire);