diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 920b27c31..0aec115d9 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -57,6 +57,5 @@ OBJS += passes/cmds/abstract.o
 OBJS += passes/cmds/test_select.o
 OBJS += passes/cmds/timeest.o
 OBJS += passes/cmds/linecoverage.o
-OBJS += passes/cmds/sdc.o
 
-$(eval $(call add_share_file,share/sdc,passes/cmds/stubs.sdc))
+include $(YOSYS_SRC)/passes/cmds/sdc/Makefile.inc
diff --git a/passes/cmds/sdc/Makefile.inc b/passes/cmds/sdc/Makefile.inc
new file mode 100644
index 000000000..1962f622f
--- /dev/null
+++ b/passes/cmds/sdc/Makefile.inc
@@ -0,0 +1,3 @@
+OBJS += passes/cmds/sdc/sdc.o
+
+$(eval $(call add_share_file,share/sdc,passes/cmds/sdc/stubs.sdc))
diff --git a/passes/cmds/sdc.cc b/passes/cmds/sdc/sdc.cc
similarity index 100%
rename from passes/cmds/sdc.cc
rename to passes/cmds/sdc/sdc.cc
diff --git a/passes/cmds/stubs.sdc b/passes/cmds/sdc/stubs.sdc
similarity index 93%
rename from passes/cmds/stubs.sdc
rename to passes/cmds/sdc/stubs.sdc
index 591d4d6cd..247fe0abd 100644
--- a/passes/cmds/stubs.sdc
+++ b/passes/cmds/sdc/stubs.sdc
@@ -13,7 +13,6 @@ stub ys_track_untyped_key
 stub ys_err_key
 stub ys_err_flag
 
-# TODO move to separate file and tie to graph value mode
 proc unknown {args} {
     global sdc_call_index
     global sdc_calls