diff --git a/contrib/src/ai/aiBehaviors.cxx b/contrib/src/ai/aiBehaviors.cxx
index 1ace436e5b..62f577241b 100644
--- a/contrib/src/ai/aiBehaviors.cxx
+++ b/contrib/src/ai/aiBehaviors.cxx
@@ -13,6 +13,17 @@
 
 #include "aiBehaviors.h"
 
+#include "arrival.h"
+#include "evade.h"
+#include "flee.h"
+#include "flock.h"
+#include "obstacleAvoidance.h"
+#include "pathFind.h"
+#include "pathFollow.h"
+#include "pursue.h"
+#include "seek.h"
+#include "wander.h"
+
 using std::cout;
 using std::endl;
 using std::string;
diff --git a/contrib/src/ai/aiGlobals.h b/contrib/src/ai/aiGlobals.h
index 1d8e8a9c41..f068bd4594 100644
--- a/contrib/src/ai/aiGlobals.h
+++ b/contrib/src/ai/aiGlobals.h
@@ -15,7 +15,6 @@
 #define _AI_GLOBALS_H
 
 #include "config_ai.h"
-#include "pandaFramework.h"
 #include "textNode.h"
 #include "pandaSystem.h"
 
diff --git a/contrib/src/ai/arrival.cxx b/contrib/src/ai/arrival.cxx
index 966a6b2611..3ce0f706da 100644
--- a/contrib/src/ai/arrival.cxx
+++ b/contrib/src/ai/arrival.cxx
@@ -13,6 +13,9 @@
 
 #include "arrival.h"
 
+#include "pursue.h"
+#include "seek.h"
+
 Arrival::Arrival(AICharacter *ai_ch, double distance) {
   _ai_char = ai_ch;
 
diff --git a/contrib/src/ai/obstacleAvoidance.cxx b/contrib/src/ai/obstacleAvoidance.cxx
index 87ce79026b..42c301e033 100644
--- a/contrib/src/ai/obstacleAvoidance.cxx
+++ b/contrib/src/ai/obstacleAvoidance.cxx
@@ -13,6 +13,8 @@
 
 #include "obstacleAvoidance.h"
 
+#include "aiWorld.h"
+
 ObstacleAvoidance::
 ObstacleAvoidance(AICharacter *ai_char, float feeler_length) {
   _ai_char = ai_char;
diff --git a/contrib/src/ai/pathFind.cxx b/contrib/src/ai/pathFind.cxx
index ee58f4940d..5813c9d503 100644
--- a/contrib/src/ai/pathFind.cxx
+++ b/contrib/src/ai/pathFind.cxx
@@ -13,6 +13,8 @@
 
 #include "pathFind.h"
 
+#include "pathFollow.h"
+
 using std::cout;
 using std::endl;
 using std::string;
diff --git a/contrib/src/ai/pathFollow.cxx b/contrib/src/ai/pathFollow.cxx
index dd7720e318..942d7c7daa 100644
--- a/contrib/src/ai/pathFollow.cxx
+++ b/contrib/src/ai/pathFollow.cxx
@@ -1,6 +1,20 @@
+/**
+ * PANDA 3D SOFTWARE
+ * Copyright (c) Carnegie Mellon University.  All rights reserved.
+ *
+ * All use of this software is subject to the terms of the revised BSD
+ * license.  You should have received a copy of this license along
+ * with this source code in a file named "LICENSE."
+ *
+ * @file pathFind.cxx
+ * @author Deepak, John, Navin
+ * @date 2009-10-24
+ */
 
 #include "pathFollow.h"
 
+#include "pathFind.h"
+
 PathFollow::PathFollow(AICharacter *ai_ch, float follow_wt) {
     _follow_weight = follow_wt;
   _curr_path_waypoint = -1;
diff --git a/contrib/src/rplight/shadowAtlas.h b/contrib/src/rplight/shadowAtlas.h
index e3f0958a50..d6296e7658 100644
--- a/contrib/src/rplight/shadowAtlas.h
+++ b/contrib/src/rplight/shadowAtlas.h
@@ -28,7 +28,7 @@
 #define SHADOWATLAS_H
 
 #include "pandabase.h"
-#include "lvecBase4.h"
+#include "luse.h"
 
 NotifyCategoryDecl(shadowatlas, EXPORT_CLASS, EXPORT_TEMPL);