diff --git a/Makefile b/Makefile
index 7f96dbc57..5f09c835d 100644
--- a/Makefile
+++ b/Makefile
@@ -803,6 +803,21 @@ endif
 endif
 endif
 
+ifneq ($(USE_NS),)
+OPTIONS_OBJS  += src/namespace.o
+endif
+
+ifneq ($(USE_OT),)
+include addons/ot/Makefile
+endif
+
+ifneq ($(USE_LIBATOMIC),)
+  TARGET_LDFLAGS += -latomic
+endif
+
+#### End of the USE_* options handling, any such option that would be added
+#### below could be silently ignored.
+
 # appends all foo_{C,LD}FLAGS to OPTIONS_{C,LD}FLAGS
 $(collect_opts_flags)
 
@@ -827,18 +842,6 @@ TRACE_COPTS := $(filter-out -O0 -O1 -O2 -pg -finstrument-functions,$(COPTS)) -O3
 COPTS += -finstrument-functions
 endif
 
-ifneq ($(USE_NS),)
-OPTIONS_OBJS  += src/namespace.o
-endif
-
-ifneq ($(USE_OT),)
-include addons/ot/Makefile
-endif
-
-ifneq ($(USE_LIBATOMIC),)
-  TARGET_LDFLAGS += -latomic
-endif
-
 #### Global link options
 # These options are added at the end of the "ld" command line. Use LDFLAGS to
 # add options at the beginning of the "ld" command line if needed.
diff --git a/addons/ot/Makefile b/addons/ot/Makefile
index 2ee74d32c..5bf8d9e8e 100644
--- a/addons/ot/Makefile
+++ b/addons/ot/Makefile
@@ -70,6 +70,4 @@ OPTIONS_OBJS += \
 	addons/ot/src/vars.o
 endif
 
-OPTIONS_CFLAGS  += $(OT_CFLAGS) -Iaddons/ot/include
-OPTIONS_LDFLAGS += $(OT_LDFLAGS)
-OPTIONS_CFLAGS  += $(OT_DEFINE)
+OT_CFLAGS := $(OT_CFLAGS) -Iaddons/ot/include $(OT_DEFINE)