diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 36577c993..104e007b4 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -2470,9 +2470,18 @@ typedef hamlib_port_t port_t;
  * See https://github.com/Hamlib/Hamlib/issues/1445
  */
 // Note: Experimental, and subject to change!!
+#if defined(IN_HAMLIB)
+/* These are for internal use only */
 #define RIGPORT(r) (&r->state.rigport)
 #define PTTPORT(r) (&r->state.pttport)
 #define DCDPORT(r) (&r->state.dcdport)
+#else
+/* Define external unique names */
+/* These will be changed to a function call before release */
+#define HAMLIB_RIGPORT(r) (&r->state.rigport)
+#define HAMLIB_PTTPORT(r) (&r->state.pttport)
+#define HAMLIB_DCDPORT(r) (&r->state.dcdport)
+#endif
 /* Then when the rigport address is stored as a pointer somewhere else(say,
  *  in the rig structure itself), the definition could be changed to
  *  #define RIGPORT(r) r->somewhereelse