diff --git a/mk/PX4/config_px4fmu-v2_APM.mk b/mk/PX4/config_px4fmu-v2_APM.mk
index 567b103d83..7a19cf45b3 100644
--- a/mk/PX4/config_px4fmu-v2_APM.mk
+++ b/mk/PX4/config_px4fmu-v2_APM.mk
@@ -7,9 +7,5 @@ MODULES		+= drivers/lsm303d
 MODULES		+= drivers/l3gd20
 MODULES		+= drivers/boards/px4fmu-v2
 MODULES		+= drivers/pwm_input
-
-ifneq ($(wildcard $(SKETCHBOOK)/../uavcan),)  
 MODULES         += modules/uavcan
 MODULES         += lib/mathlib
-#LIBRARIES       += lib/mathlib/CMSIS
-endif
diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk
index ce11e01eec..87a60c5bc9 100644
--- a/mk/px4_targets.mk
+++ b/mk/px4_targets.mk
@@ -34,9 +34,7 @@ PX4_GIT_VERSION   := $(shell cd $(PX4_ROOT) && git rev-parse HEAD | cut -c1-8)
 
 EXTRAFLAGS += -DNUTTX_GIT_VERSION="\"$(NUTTX_GIT_VERSION)\""
 EXTRAFLAGS += -DPX4_GIT_VERSION="\"$(PX4_GIT_VERSION)\""
-ifneq ($(wildcard $(SKETCHBOOK)/modules/uavcan),)
 EXTRAFLAGS += -DUAVCAN=1
-endif
 
 # we have different config files for V1 and V2
 PX4_V1_CONFIG_FILE=$(MK_DIR)/PX4/config_px4fmu-v1_APM.mk
@@ -63,9 +61,7 @@ endif
 ifneq ($(wildcard $(NUTTX_SRC)/..),)
 HASHADDER_FLAGS += --nuttx "$(NUTTX_SRC)/.."
 endif
-ifneq ($(wildcard $(UAVCAN_DIR)),)
 HASHADDER_FLAGS += --uavcan "$(UAVCAN_DIR)"
-endif
 
 .PHONY: module_mk
 module_mk: