From 32a1cc3efdad7953af1805b245f2a0292698633a Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Thu, 31 Jul 2014 23:30:18 +0200
Subject: [PATCH] Renamed modwalker.h to modtools.h

---
 kernel/{modwalker.h => modtools.h} |  4 ++--
 passes/memory/memory_share.cc      | 11 ++++++-----
 passes/sat/share.cc                | 11 ++++++-----
 3 files changed, 14 insertions(+), 12 deletions(-)
 rename kernel/{modwalker.h => modtools.h} (99%)

diff --git a/kernel/modwalker.h b/kernel/modtools.h
similarity index 99%
rename from kernel/modwalker.h
rename to kernel/modtools.h
index 09f815b83..06e96246f 100644
--- a/kernel/modwalker.h
+++ b/kernel/modtools.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef MODWALKER_H
-#define MODWALKER_H
+#ifndef MODTOOLS_H
+#define MODTOOLS_H
 
 #include "kernel/sigtools.h"
 #include "kernel/celltypes.h"
diff --git a/passes/memory/memory_share.cc b/passes/memory/memory_share.cc
index b6e7cc835..fde6ea007 100644
--- a/passes/memory/memory_share.cc
+++ b/passes/memory/memory_share.cc
@@ -17,13 +17,12 @@
  *
  */
 
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include "kernel/satgen.h"
 #include "kernel/sigtools.h"
-#include "kernel/modwalker.h"
-#include "kernel/register.h"
-#include "kernel/log.h"
-#include <algorithm>
+#include "kernel/modtools.h"
+
+PRIVATE_NAMESPACE_BEGIN
 
 static bool memcells_cmp(RTLIL::Cell *a, RTLIL::Cell *b)
 {
@@ -742,3 +741,5 @@ struct MemorySharePass : public Pass {
 	}
 } MemorySharePass;
 
+PRIVATE_NAMESPACE_END
+
diff --git a/passes/sat/share.cc b/passes/sat/share.cc
index 1041227ed..ea7a9f631 100644
--- a/passes/sat/share.cc
+++ b/passes/sat/share.cc
@@ -17,13 +17,12 @@
  *
  */
 
-#include "kernel/rtlil.h"
+#include "kernel/yosys.h"
 #include "kernel/satgen.h"
 #include "kernel/sigtools.h"
-#include "kernel/modwalker.h"
-#include "kernel/register.h"
-#include "kernel/log.h"
-#include <algorithm>
+#include "kernel/modtools.h"
+
+PRIVATE_NAMESPACE_BEGIN
 
 struct ShareWorkerConfig
 {
@@ -967,3 +966,5 @@ struct SharePass : public Pass {
 	}
 } SharePass;
 
+PRIVATE_NAMESPACE_END
+
-- 
2.30.2