diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index 47c53d5..9bdb4af 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -41,10 +41,6 @@ CHECK_RELEASE = YES
 -include $(TOP)/../CONFIG_SITE.local
 -include $(TOP)/configure/CONFIG_SITE.local
 
-# Allow internal use of Expert API
-# see ttps://mdavidsaver.github.io/pvxs/details.html#expert-apis
-USR_CPPFLAGS += -DPVXS_ENABLE_EXPERT_API
-
 # MSVC - skip defining min()/max() macros and enable APIs
 USR_CPPFLAGS_WIN32 += -DNOMINMAX -D_WIN32_WINNT=_WIN32_WINNT_VISTA
 
diff --git a/src/Makefile b/src/Makefile
index cc1efae..a118bf7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,6 +10,7 @@ include $(TOP)/configure/CONFIG_PVXS_VERSION
 #=============================
 
 USR_CPPFLAGS += -DPVXS_API_BUILDING
+USR_CPPFLAGS += -DPVXS_ENABLE_EXPERT_API
 
 ifdef T_A
 ifneq ($(CONFIG_LOADED),YES)
diff --git a/src/pvxs/netcommon.h b/src/pvxs/netcommon.h
index 0c072c1..ea86435 100644
--- a/src/pvxs/netcommon.h
+++ b/src/pvxs/netcommon.h
@@ -13,8 +13,6 @@
 namespace pvxs {
 namespace impl {
 
-#ifdef PVXS_EXPERT_API_ENABLED
-
 /** Snapshot of information about a client/server
  *
  * cf. pvxs::server::Server::report()
@@ -47,6 +45,4 @@ struct Report {
 } // namespace impl
 } // namespace pvxs
 
-#endif // PVXS_EXPERT_API_ENABLED
-
 #endif // PVXS_NETCOMMON_H
diff --git a/test/testget.cpp b/test/testget.cpp
index e3a4611..e4c8eea 100644
--- a/test/testget.cpp
+++ b/test/testget.cpp
@@ -3,6 +3,7 @@
  * pvxs is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  */
+#define PVXS_ENABLE_EXPERT_API
 
 #include <atomic>
 
diff --git a/test/testmon.cpp b/test/testmon.cpp
index 801db74..830ac58 100644
--- a/test/testmon.cpp
+++ b/test/testmon.cpp
@@ -3,6 +3,7 @@
  * pvxs is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  */
+#define PVXS_ENABLE_EXPERT_API
 
 #include <atomic>
 
diff --git a/test/testput.cpp b/test/testput.cpp
index 8920880..8687254 100644
--- a/test/testput.cpp
+++ b/test/testput.cpp
@@ -3,6 +3,7 @@
  * pvxs is distributed subject to a Software License Agreement found
  * in file LICENSE that is included with this distribution.
  */
+#define PVXS_ENABLE_EXPERT_API
 
 #include <atomic>