diff --git a/make/lo.mk b/make/lo.mk
index 01b23b8e..a326915c 100644
--- a/make/lo.mk
+++ b/make/lo.mk
@@ -36,7 +36,10 @@ $(SO_PREFIX)%.so $(SO_PREFIX)%.dll: %.o $(LOADABLE_OBJS_O)
 	$(CPP) $< $(filter $(CPP_PREFIX)$*%, $(LOADABLE_OBJS_O)) -shared $(LDFLAGS) -o $@
 
 %.cpp: $(TOOLS_DIR)/$(CPP_PREFIX)%.h
-	echo -e "#include \"$<\"\n$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*);\n" > $@
+	echo "#include \"$<\"" > $@.tmp
+	if [ "$(LO_NAMESPACE)" ]; then echo "using namespace $(LO_NAMESPACE);" >> $@.tmp; fi
+	echo "$(LOADABLE_OBJ_HOOK)($(CPP_PREFIX)$*);" >> $@.tmp
+	mv $@.tmp $@
 
 $(BUILD_LIBDIR)/%.so: %.so
 	install -m 755 $< $@