diff --git a/bgpd/bgp_addpath.c b/bgpd/bgp_addpath.c
index 63373cb9a7..0ca4b613ee 100644
--- a/bgpd/bgp_addpath.c
+++ b/bgpd/bgp_addpath.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "bgp_addpath.h"
 #include "bgp_route.h"
 
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index a22d4d0a5a..dc8f6a7357 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -22,6 +22,7 @@
 #include <zebra.h>
 #include <math.h>
 
+#include "printfrr.h"
 #include "prefix.h"
 #include "linklist.h"
 #include "memory.h"
diff --git a/lib/command_py.c b/lib/command_py.c
index 1554af172f..4ec116df33 100644
--- a/lib/command_py.c
+++ b/lib/command_py.c
@@ -22,6 +22,12 @@
  * memory leak or SEGV for things that haven't been well-tested.
  */
 
+/* This file is "exempt" from having
+#include "config.h"
+ * as the first include statement because Python.h also does environment
+ * setup & these trample over each other.
+ */
+
 #include <Python.h>
 #include "structmember.h"
 #include <string.h>
diff --git a/lib/frrlua.c b/lib/frrlua.c
index b7d8eea6e8..26610556dc 100644
--- a/lib/frrlua.c
+++ b/lib/frrlua.c
@@ -20,7 +20,6 @@
  * with FRR; see the file COPYING.  If not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <stdio.h>
 
 #include <zebra.h>
 
diff --git a/lib/id_alloc.c b/lib/id_alloc.c
index 222ba651b4..7c7f2c4689 100644
--- a/lib/id_alloc.c
+++ b/lib/id_alloc.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "id_alloc.h"
 
 #include "log.h"
diff --git a/lib/typerb.c b/lib/typerb.c
index d361e7651e..4c48d6434f 100644
--- a/lib/typerb.c
+++ b/lib/typerb.c
@@ -41,6 +41,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "typerb.h"
 
 #define RB_BLACK	0
diff --git a/lib/typesafe.c b/lib/typesafe.c
index 47a6d0af48..f2ca67b7c6 100644
--- a/lib/typesafe.c
+++ b/lib/typesafe.c
@@ -14,6 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 4ba8d08fe3..266d3ffcf5 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -19,6 +19,11 @@
  * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
  * MA 02110-1301 USA
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "if.h"
 #include "pimd.h"
 #include "pim_iface.h"
diff --git a/tests/lib/test_idalloc.c b/tests/lib/test_idalloc.c
index 3053c1c074..ce1582b1ba 100644
--- a/tests/lib/test_idalloc.c
+++ b/tests/lib/test_idalloc.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "id_alloc.h"
 
 #include <inttypes.h>
diff --git a/tests/lib/test_seqlock.c b/tests/lib/test_seqlock.c
index 6b2b9ed8a5..9cc6f80702 100644
--- a/tests/lib/test_seqlock.c
+++ b/tests/lib/test_seqlock.c
@@ -18,6 +18,10 @@
  * Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
index 1707d3a68b..abe1879c26 100644
--- a/zebra/zebra_dplane.c
+++ b/zebra/zebra_dplane.c
@@ -17,6 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lib/libfrr.h"
 #include "lib/debug.h"
 #include "lib/frratomic.h"