diff --git a/Makefile b/Makefile
index 65eabf9832..a10e5f2b33 100644
--- a/Makefile
+++ b/Makefile
@@ -114,14 +114,17 @@ TOPICHEADER_TEMP_DIR = $(BUILD_DIR)topics_temporary
 GENMSG_PYTHONPATH = $(PX4_BASE)Tools/genmsg/src
 GENCPP_PYTHONPATH = $(PX4_BASE)Tools/gencpp/src
 
-ifeq ($(PX4_TARGET_OS),nuttx)
-OS_DEPS = checksubmodules
-else
-OS_DEPS = 
-endif
+.PHONY: checksubmodules
+checksubmodules:
+	$(Q) ($(PX4_BASE)/Tools/check_submodules.sh)
+
+.PHONY: updatesubmodules
+updatesubmodules:
+	$(Q) (git submodule init)
+	$(Q) (git submodule update)
 
 .PHONY: generateuorbtopicheaders
-generateuorbtopicheaders: $(OS_DEPS)
+generateuorbtopicheaders: checksubmodules
 	@$(ECHO) "Generating uORB topic headers"
 	$(Q) (PYTHONPATH=$(GENMSG_PYTHONPATH):$(GENCPP_PYTHONPATH):$(PYTHONPATH) $(PYTHON) \
 		$(PX4_BASE)Tools/px_generate_uorb_topic_headers.py \
diff --git a/makefiles/firmware_nuttx.mk b/makefiles/firmware_nuttx.mk
index fb97ca4217..77bb2bace0 100644
--- a/makefiles/firmware_nuttx.mk
+++ b/makefiles/firmware_nuttx.mk
@@ -149,12 +149,3 @@ $(NUTTX_SRC): checksubmodules
 $(UAVCAN_DIR):
 	$(Q) (./Tools/check_submodules.sh)
 
-.PHONY: checksubmodules
-checksubmodules:
-	$(Q) ($(PX4_BASE)/Tools/check_submodules.sh)
-
-.PHONY: updatesubmodules
-updatesubmodules:
-	$(Q) (git submodule init)
-	$(Q) (git submodule update)
-