diff --git a/lib/clixon/clixon_debug.h b/lib/clixon/clixon_debug.h
index b6e19d55..3c8e5a69 100644
--- a/lib/clixon/clixon_debug.h
+++ b/lib/clixon/clixon_debug.h
@@ -40,6 +40,8 @@
 #ifndef _CLIXON_DEBUG_H_
 #define _CLIXON_DEBUG_H_
 
+#include "clixon_xml.h"			/* for cxobj */
+
 /*
  * Constants
  */
diff --git a/lib/clixon/clixon_err.h b/lib/clixon/clixon_err.h
index 8a7c0968..68715549 100644
--- a/lib/clixon/clixon_err.h
+++ b/lib/clixon/clixon_err.h
@@ -43,6 +43,8 @@
 #ifndef _CLIXON_ERR_H_
 #define _CLIXON_ERR_H_
 
+#include "clixon_xml.h"			/* for cxobj */
+
 /*
  * Constants
  */
diff --git a/lib/clixon/clixon_log.h b/lib/clixon/clixon_log.h
index 0bfe7e07..a80c57c5 100644
--- a/lib/clixon/clixon_log.h
+++ b/lib/clixon/clixon_log.h
@@ -40,6 +40,8 @@
 #ifndef _CLIXON_LOG_H_
 #define _CLIXON_LOG_H_
 
+#include "clixon_xml.h"			/* for cxobj */
+
 /*
  * Constants
  */
diff --git a/lib/clixon/clixon_xml.h b/lib/clixon/clixon_xml.h
index 2aced51e..8538d749 100644
--- a/lib/clixon/clixon_xml.h
+++ b/lib/clixon/clixon_xml.h
@@ -43,6 +43,8 @@
 #ifndef _CLIXON_XML_H
 #define _CLIXON_XML_H
 
+#include "clixon_yang.h"			/* for yang_stmt */
+
 /*
  * Constants
  */