5 files changed, 12 insertions, 7 deletions

diff --git a/kernel/python_wrappers.cc b/kernel/python_wrappers.cc
index af1f80929..2c27ea47f 100644
--- a/kernel/python_wrappers.cc
+++ b/kernel/python_wrappers.cc
@@ -2783,13 +2783,13 @@ namespace YOSYS_PYTHON {
 	struct Initializer
 	{
 		Initializer() {
-			if(!Yosys::yosys_already_setup())
-			{
+                       if(!Yosys::yosys_already_setup())
+                       {
 				Yosys::log_streams.push_back(&std::cout);
 				Yosys::log_error_stderr = true;
 				Yosys::yosys_setup();
 				Yosys::yosys_banner();
-			}
+                       }
 		}
 
 		Initializer(Initializer const &) {}
diff --git a/kernel/rtlil.cc b/kernel/rtlil.cc
index bcda931d2..93b138071 100644
--- a/kernel/rtlil.cc
+++ b/kernel/rtlil.cc
@@ -3925,14 +3925,12 @@ RTLIL::Process *RTLIL::Process::clone() const
 
 	return new_proc;
 }
+
+#ifdef WITH_PYTHON
 RTLIL::Memory::~Memory()
 {
-#ifdef WITH_PYTHON
 	RTLIL::Memory::get_all_memorys()->erase(hashidx_);
-#endif
 }
-
-#ifdef WITH_PYTHON
 static std::map<unsigned int, RTLIL::Memory*> *all_memorys = new std::map<unsigned int, RTLIL::Memory*>();
 std::map<unsigned int, RTLIL::Memory*> *RTLIL::Memory::get_all_memorys(void)
 {
diff --git a/kernel/rtlil.h b/kernel/rtlil.h
index 89413a166..0e5159be2 100644
--- a/kernel/rtlil.h
+++ b/kernel/rtlil.h
@@ -1175,6 +1175,7 @@ struct RTLIL::Memory : public RTLIL::AttrObject
 	unsigned int hash() const { return hashidx_; }
 
 	Memory();
+	~Memory();
 
 	RTLIL::IdString name;
 	int width, start_offset, size;
diff --git a/kernel/yosys.h b/kernel/yosys.h
index 6ed0f8b20..9f5f056a5 100644
--- a/kernel/yosys.h
+++ b/kernel/yosys.h
@@ -66,7 +66,9 @@
 #include <stdio.h>
 #include <limits.h>
 
+#ifdef WITH_PYTHON
 #include <Python.h>
+#endif
 
 #ifndef _YOSYS_
 #  error It looks like you are trying to build Yosys without the config defines set. \
diff --git a/passes/cmds/plugin.cc b/passes/cmds/plugin.cc
index 1a39140d4..a889397e2 100644
--- a/passes/cmds/plugin.cc
+++ b/passes/cmds/plugin.cc
@@ -44,7 +44,11 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
 	if (filename.find('/') == std::string::npos)
 		filename = "./" + filename;
 
+	#ifdef WITH_PYTHON
 	if (!loaded_plugins.count(filename) && !loaded_python_plugins.count(filename)) {
+	#else
+	if (!loaded_plugins.count(filename)) {
+	#endif
 
 		#ifdef WITH_PYTHON
 		if(boost::algorithm::ends_with(filename, ".py"))