diff --git a/panda/src/linmath/compose_matrix.h b/panda/src/linmath/compose_matrix.h
index 6cf258f922..4cd917f2ea 100644
--- a/panda/src/linmath/compose_matrix.h
+++ b/panda/src/linmath/compose_matrix.h
@@ -35,7 +35,7 @@
 #include <pandabase.h>
 #include <math.h>
 #include "lmatrix.h"
-#include "luse.h"
+#include "lvector3.h"
 
 #include "fltnames.h"
 #include "compose_matrix_src.h"
diff --git a/panda/src/linmath/lquaternion.h b/panda/src/linmath/lquaternion.h
index 67bb739652..f4eff0edc7 100644
--- a/panda/src/linmath/lquaternion.h
+++ b/panda/src/linmath/lquaternion.h
@@ -25,6 +25,7 @@
 #include "nearly_zero.h"
 #include "cmath.h"
 #include "deg_2_rad.h"
+#include "compose_matrix.h"
 
 #include <notify.h>
 
diff --git a/panda/src/linmath/lquaternion_src.cxx b/panda/src/linmath/lquaternion_src.cxx
index 982afe0368..89a9fdb21d 100644
--- a/panda/src/linmath/lquaternion_src.cxx
+++ b/panda/src/linmath/lquaternion_src.cxx
@@ -17,7 +17,8 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "config_linmath.h"
-#include "compose_matrix_src.h"
+#include "lmatrix.h"
+#include "luse.h"
 
 TypeHandle FLOATNAME(LQuaternion)::_type_handle;