Commit patches by cfsworks:

cxx: Fix missing includes masked by composite builds.
misc: Fix typos in comments.
config: Fix missing config forward-declarations.
direct: Adjust Python imports to panda3d.* instead of pandac.*.
display: Split graphicsWindow out into an extension.
framework: Use if/elif/elif/endif instead of ifdef/elif/elif/endif.
ode: Remove erroneous INLINE declarations.
interval: Fix missing import.

direct/src/directnotify/DirectNotify.py

@@ -61,9 +61,7 @@ class DirectNotify:
         """
 
         # We use ConfigVariableString instead of base.config, in case
-        # we're running before ShowBase has finished initializing; and
-        # we import it directly from libpandaexpress, in case we're
-        # running before libpanda.dll is available.
+        # we're running before ShowBase has finished initializing
         from panda3d.core import ConfigVariableString
 
         dconfigParam = ("notify-level-" + categoryName)

direct/src/interval/ProjectileInterval.py

@@ -3,6 +3,7 @@
 __all__ = ['ProjectileInterval']
 
 from pandac.PandaModules import *
+from direct.directnotify.DirectNotifyGlobal import *
 from Interval import Interval
 from direct.showbase.PythonUtil import lerp
 from direct.showbase import PythonUtil

direct/src/showbase/ProfileSession.py

@@ -1,4 +1,4 @@
-from pandac.libpandaexpressModules import TrueClock
+from panda3d.core import TrueClock
 from direct.directnotify.DirectNotifyGlobal import directNotify
 from direct.showbase.PythonUtil import (
     StdoutCapture, _installProfileCustomFuncs,_removeProfileCustomFuncs,

direct/src/showbase/VFSImporter.py

@@ -1,4 +1,4 @@
-from libpandaexpress import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream
+from panda3d.core import Filename, VirtualFileSystem, VirtualFileMountSystem, OFileStream, copyStream
 import sys
 import os
 import marshal

dtool/src/cppparser/cppMakeProperty.h

@@ -18,6 +18,7 @@
 #include "dtoolbase.h"
 
 #include "cppDeclaration.h"
+#include "cppIdentifier.h"
 
 ///////////////////////////////////////////////////////////////////
 //       Class : CPPMakeProperty

dtool/src/interrogate/interfaceMaker.h

@@ -17,6 +17,8 @@
 
 #include "dtoolbase.h"
 
+#include "cppMakeSeq.h"
+
 #include "interrogate_interface.h"
 #include "interrogate_request.h"
 #include "functionWriters.h"

dtool/src/interrogate/interfaceMakerPythonNative.cxx

@@ -17,6 +17,7 @@
 #include "parameterRemapUnchanged.h"
 #include "typeManager.h"
 
+#include "pnotify.h" // For nout
 #include "interrogateDatabase.h"
 #include "interrogateType.h"
 #include "interrogateFunction.h"

dtool/src/interrogate/parameterRemapToString.cxx

@@ -14,6 +14,7 @@
 
 #include "parameterRemapToString.h"
 #include "interrogate.h"
+#include "typeManager.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: ParameterRemapToString::Constructor

dtool/src/interrogatedb/interrogateElement.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "interrogateElement.h"
+#include "interrogateDatabase.h"
 #include "indexRemapper.h"
 #include "interrogate_datafile.h"
 

dtool/src/prc/configDeclaration.cxx

@@ -14,6 +14,7 @@
 
 #include "configDeclaration.h"
 #include "configVariableCore.h"
+#include "config_prc.h"
 #include "pstrtod.h"
 
 

dtool/src/prc/configVariableBase.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "configVariableBase.h"
+#include "config_prc.h"
 
 ConfigVariableBase::Unconstructed *ConfigVariableBase::_unconstructed;
 

dtool/src/prc/nativeNumericData.h

@@ -16,6 +16,7 @@
 #define NATIVENUMERICDATA_H
 
 #include "dtoolbase.h"
+#include "numeric_types.h"
 
 #include <string.h>  // for memcpy()
 

dtool/src/prc/streamReader.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "streamReader.h"
+#include "memoryHook.h"
 
 
 ////////////////////////////////////////////////////////////////////

makepanda/makepanda.py

@@ -3276,6 +3276,7 @@ if (not RUNTIME):
   TargetAdd('libp3display.in', opts=['IMOD:panda3d.core', 'ILIB:libp3display', 'SRCDIR:panda/src/display'])
   TargetAdd('libp3display_igate.obj', input='libp3display.in', opts=["DEPENDENCYONLY"])
   TargetAdd('p3display_graphicsStateGuardian_ext.obj', opts=OPTS, input='graphicsStateGuardian_ext.cxx')
+  TargetAdd('p3display_graphicsWindow_ext.obj', opts=OPTS, input='graphicsWindow_ext.cxx')
 
   if RTDIST and GetTarget() == 'darwin':
     OPTS=['DIR:panda/src/display']
@@ -3551,6 +3552,7 @@ if (not RUNTIME):
   TargetAdd('libpanda.dll', input='p3gobj_internalName_ext.obj')
   TargetAdd('libpanda.dll', input='p3pgraph_ext_composite.obj')
   TargetAdd('libpanda.dll', input='p3display_graphicsStateGuardian_ext.obj')
+  TargetAdd('libpanda.dll', input='p3display_graphicsWindow_ext.obj')
 
   if PkgSkip("FREETYPE")==0:
     TargetAdd('libpanda.dll', input="p3pnmtext_composite1.obj")

panda/src/audiotraits/fmodAudioManager.cxx

@@ -17,6 +17,7 @@
 
 #include "pandabase.h"
 #include "config_audio.h"
+#include "config_fmodAudio.h"
 #include "dcast.h"
 
 #ifdef HAVE_FMODEX //[

panda/src/audiotraits/fmodAudioSound.cxx

@@ -23,10 +23,12 @@
 
 //Panda Headers
 #include "config_audio.h"
+#include "config_fmodAudio.h"
 #include "fmodAudioSound.h"
 #include "string_utils.h"
 #include "subfileInfo.h"
 #include "reMutexHolder.h"
+#include "virtualFileSystem.h"
 
 TypeHandle FmodAudioSound::_type_handle;
 

panda/src/audiotraits/fmodAudioSound.h

@@ -77,6 +77,7 @@
 
 #include "audioSound.h"
 #include "reMutex.h"
+#include "fmodAudioManager.h"
 
 #include <fmod.hpp>
 #include <fmod_errors.h>

panda/src/audiotraits/openalAudioSound.h

@@ -25,6 +25,7 @@
 #include "audioSound.h"
 #include "movieAudioCursor.h"
 #include "trueClock.h"
+#include "openalAudioManager.h"
 
 // OSX uses the OpenAL framework
 #ifdef IS_OSX

panda/src/chan/movingPartMatrix.cxx

@@ -21,6 +21,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "config_chan.h"
 
 // Tell GCC that we'll take care of the instantiation explicitly here.
 #ifdef __GNUC__

panda/src/chan/movingPartScalar.cxx

@@ -19,6 +19,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "config_chan.h"
 
 // Tell GCC that we'll take care of the instantiation explicitly here.
 #ifdef __GNUC__

panda/src/chan/partBundle.cxx

@@ -29,6 +29,7 @@
 #include "bamWriter.h"
 #include "configVariableEnum.h"
 #include "loaderOptions.h"
+#include "bindAnimRequest.h"
 
 #include <algorithm>
 

panda/src/chan/partGroup.cxx

@@ -22,6 +22,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "transformState.h"
 
 #include <algorithm>
 

panda/src/cocoadisplay/cocoaGraphicsWindow.mm

@@ -38,6 +38,7 @@
 #import <AppKit/NSEvent.h>
 #import <AppKit/NSImage.h>
 #import <AppKit/NSScreen.h>
+#import <AppKit/NSText.h>
 #import <OpenGL/OpenGL.h>
 #import <Carbon/Carbon.h>
 

panda/src/cocoadisplay/cocoaPandaApp.h

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #import <AppKit/NSApplication.h>
+#import <AppKit/NSEvent.h>
 
 // This class solely exists so that we can override sendEvent in order
 // to prevent NSApplication from eating certain keyboard events.

panda/src/cocoadisplay/cocoaPandaView.h

@@ -12,7 +12,10 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "graphicsWindow.h"
+
 #import <AppKit/NSView.h>
+#import <AppKit/NSOpenGL.h>
 
 class CocoaGraphicsWindow;
 

panda/src/cocoadisplay/cocoaPandaView.mm

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "config_cocoadisplay.h"
 #import "cocoaPandaView.h"
 #import "cocoaGraphicsWindow.h"
 

panda/src/cocoadisplay/cocoaPandaWindowDelegate.h

@@ -14,6 +14,8 @@
 
 #import <AppKit/NSWindow.h>
 
+#import "cocoaGraphicsWindow.h"
+
 class CocoaGraphicsWindow;
 
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060

panda/src/collide/collisionFloorMesh.cxx

@@ -28,6 +28,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "boundingBox.h"
 #include "boundingPlane.h"
 #include "geom.h"
 #include "geomTriangles.h"

panda/src/collide/collisionHandlerFluidPusher.cxx

@@ -16,6 +16,7 @@
 #include "collisionNode.h"
 #include "collisionEntry.h"
 #include "collisionPolygon.h"
+#include "collisionSphere.h"
 #include "config_collide.h"
 #include "dcast.h"
 

panda/src/collide/collisionParabola.cxx

@@ -22,6 +22,7 @@
 #include "geomLinestrips.h"
 #include "geomVertexWriter.h"
 #include "boundingHexahedron.h"
+#include "boundingSphere.h"
 #include "look_at.h"
 
 PStatCollector CollisionParabola::_volume_pcollector(

panda/src/collide/collisionPlane.cxx

@@ -20,6 +20,7 @@
 #include "collisionLine.h"
 #include "collisionRay.h"
 #include "collisionSegment.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "pointerToArray.h"
 #include "geomNode.h"

panda/src/collide/collisionPolygon.cxx

@@ -19,6 +19,7 @@
 #include "collisionLine.h"
 #include "collisionRay.h"
 #include "collisionSegment.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "cullTraverserData.h"
 #include "boundingBox.h"

panda/src/collide/collisionSegment.cxx

@@ -28,8 +28,10 @@
 #include "bamWriter.h"
 #include "geom.h"
 #include "geomLines.h"
+#include "boundingSphere.h"
 #include "boundingHexahedron.h"
 #include "geomVertexWriter.h"
+#include "look_at.h"
 
 TypeHandle CollisionSegment::_type_handle;
 

panda/src/collide/collisionSphere.cxx

@@ -19,6 +19,7 @@
 #include "collisionSegment.h"
 #include "collisionHandler.h"
 #include "collisionEntry.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "boundingSphere.h"
 #include "datagram.h"

panda/src/collide/collisionTube.cxx

@@ -19,6 +19,7 @@
 #include "collisionSegment.h"
 #include "collisionHandler.h"
 #include "collisionEntry.h"
+#include "collisionParabola.h"
 #include "config_collide.h"
 #include "look_at.h"
 #include "geom.h"

panda/src/display/Sources.pp

@@ -31,6 +31,7 @@
     graphicsStateGuardian_ext.cxx graphicsStateGuardian_ext.h \
     graphicsThreadingModel.I graphicsThreadingModel.h \
     graphicsWindow.I graphicsWindow.h \
+    graphicsWindow_ext.cxx graphicsWindow_ext.h \
     graphicsWindowInputDevice.I  \
     graphicsWindowInputDevice.h \
     graphicsWindowProc.h \

panda/src/display/config_display.cxx

@@ -24,9 +24,6 @@
 #include "graphicsBuffer.h"
 #include "graphicsWindow.h"
 #include "graphicsDevice.h"
-#ifdef HAVE_PYTHON
-#include "pythonGraphicsWindowProc.h"
-#endif
 #include "graphicsWindowProcCallbackData.h"
 #include "nativeWindowHandle.h"
 #include "parasiteBuffer.h"
@@ -493,9 +490,6 @@ init_libdisplay() {
   GraphicsPipe::init_type();
   GraphicsStateGuardian::init_type();
   GraphicsWindow::init_type();
-#ifdef HAVE_PYTHON
-  PythonGraphicsWindowProc::init_type();
-#endif
   GraphicsWindowProcCallbackData::init_type();
   NativeWindowHandle::init_type();
   ParasiteBuffer::init_type();

panda/src/display/displayRegionDrawCallbackData.cxx

@@ -13,7 +13,12 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "displayRegionDrawCallbackData.h"
+
+#include "config_display.h"
 #include "cullResult.h"
+#include "displayRegion.h"
+#include "graphicsOutput.h"
+#include "graphicsStateGuardian.h"
 #include "sceneSetup.h"
 
 TypeHandle DisplayRegionDrawCallbackData::_type_handle;

panda/src/display/drawableRegion.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "drawableRegion.h"
+#include "config_display.h"
 
 
 ////////////////////////////////////////////////////////////////////

panda/src/display/graphicsEngine.cxx

@@ -47,6 +47,7 @@
 #include "config_pgraph.h"
 #include "displayRegionCullCallbackData.h"
 #include "displayRegionDrawCallbackData.h"
+#include "callbackGraphicsWindow.h"
 
 #if defined(WIN32)
   #define WINDOWS_LEAN_AND_MEAN

panda/src/display/graphicsWindow.cxx

@@ -903,54 +903,6 @@ mouse_mode_absolute() {
 
 }
 
-#ifdef HAVE_PYTHON
-
-////////////////////////////////////////////////////////////////////
-//     Function: GraphicsWindow::add_custom_event_handler
-//       Access: Published
-//  Description: Adds a python event handler to be called
-//               when a window event occurs.
-//               
-////////////////////////////////////////////////////////////////////
-void GraphicsWindow::
-add_python_event_handler(PyObject* handler, PyObject* name){
-  PythonGraphicsWindowProc* pgwp = new PythonGraphicsWindowProc(handler, name);
-  _python_window_proc_classes.insert(pgwp);
-  add_window_proc(pgwp);
-}
-
-////////////////////////////////////////////////////////////////////
-//     Function: GraphicsWindow::remove_custom_event_handler
-//       Access: Published
-//  Description: Removes the specified python event handler.
-//               
-////////////////////////////////////////////////////////////////////
-void GraphicsWindow::
-remove_python_event_handler(PyObject* name){
-  list<PythonGraphicsWindowProc*> toRemove;
-  PythonWinProcClasses::iterator iter;
-  for (iter = _python_window_proc_classes.begin(); iter != _python_window_proc_classes.end(); ++iter) {
-    PythonGraphicsWindowProc* pgwp = *iter;
-    if (PyObject_RichCompareBool(pgwp->get_name(), name, Py_EQ) == 1) {
-      toRemove.push_back(pgwp);
-    }
-#if PY_MAJOR_VERSION < 3
-    else if (PyObject_Compare(pgwp->get_name(), name) == 0) {
-      toRemove.push_back(pgwp);
-    }
-#endif
-  }
-  list<PythonGraphicsWindowProc*>::iterator iter2;
-  for (iter2 = toRemove.begin(); iter2 != toRemove.end(); ++iter2) {
-    PythonGraphicsWindowProc* pgwp = *iter2;
-    remove_window_proc(pgwp);
-    _python_window_proc_classes.erase(pgwp);
-    delete pgwp;
-  }
-}
-
-#endif // HAVE_PYTHON
-
 ////////////////////////////////////////////////////////////////////
 //     Function: GraphicsWindow::is_touch_event
 //       Access: Published, Virtual

panda/src/display/graphicsWindow.h

@@ -21,9 +21,6 @@
 #include "graphicsWindowInputDevice.h"
 #include "graphicsWindowProc.h"
 #include "graphicsWindowProcCallbackData.h"
-#ifdef HAVE_PYTHON
-#include "pythonGraphicsWindowProc.h"
-#endif
 #include "windowProperties.h"
 #include "mouseData.h"
 #include "modifierButtons.h"
@@ -94,11 +91,6 @@ PUBLISHED:
   virtual bool move_pointer(int device, int x, int y);
   virtual void close_ime();
 
-#ifdef HAVE_PYTHON
-  void add_python_event_handler(PyObject* handler, PyObject* name);
-  void remove_python_event_handler(PyObject* name);
-#endif
-
 public:
   // No need to publish these.
   bool has_button_event(int device) const;
@@ -169,7 +161,7 @@ private:
   bool _unexposed_draw;
 
 #ifdef HAVE_PYTHON
-  typedef pset<PythonGraphicsWindowProc*> PythonWinProcClasses;
+  typedef pset<GraphicsWindowProc*> PythonWinProcClasses;
   PythonWinProcClasses _python_window_proc_classes;
 #endif
 
@@ -191,6 +183,7 @@ private:
   static TypeHandle _type_handle;
 
   friend class GraphicsEngine;
+  friend class Extension<GraphicsWindow>;
 };
 
 #include "graphicsWindow.I"

panda/src/display/graphicsWindowInputDevice.cxx

@@ -14,6 +14,7 @@
 
 
 #include "graphicsWindowInputDevice.h"
+#include "graphicsWindow.h"
 #include "mouseButton.h"
 #include "keyboardButton.h"
 

panda/src/display/graphicsWindowInputDevice.h

@@ -28,6 +28,8 @@
 #include "lightMutex.h"
 #include "lightMutexHolder.h"
 
+// Forward declarations
+class GraphicsWindow;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : GraphicsWindowInputDevice

panda/src/display/graphicsWindowProcCallbackData.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "graphicsWindowProcCallbackData.h"
+#include "graphicsWindow.h"
 
 TypeHandle GraphicsWindowProcCallbackData::_type_handle;
 

panda/src/display/lru.cxx

@@ -21,6 +21,9 @@
 //#include <windows.h>
 
 #include "lru.h"
+#if ENABLE_MUTEX
+#include "mutexHolder.h"
+#endif
 
 
 static const int HIGH_PRIORITY_SCALE = 4;

panda/src/downloader/identityStream.cxx

@@ -16,6 +16,7 @@
 
 // This module is not compiled if OpenSSL is not available.
 #ifdef HAVE_OPENSSL
+#include "httpChannel.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: IIdentityStream::Destructor

panda/src/downloader/identityStreamBuf.cxx

@@ -16,6 +16,7 @@
 
 // This module is not compiled if OpenSSL is not available.
 #ifdef HAVE_OPENSSL
+#include "httpChannel.h"
 
 #ifndef HAVE_STREAMSIZE
 // Some compilers (notably SGI) don't define this for us

panda/src/egg/eggGroupNode.cxx

@@ -13,11 +13,13 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "eggGroupNode.h"
+#include "eggGroup.h"
 #include "eggCoordinateSystem.h"
 #include "eggData.h"
 #include "eggFilenameNode.h"
 #include "eggExternalReference.h"
 #include "eggPrimitive.h"
+#include "eggPoint.h"
 #include "eggPolygon.h"
 #include "eggCompositePrimitive.h"
 #include "eggMesher.h"
@@ -31,6 +33,7 @@
 #include "config_egg.h"
 
 #include "dSearchPath.h"
+#include "virtualFileSystem.h"
 #include "deg_2_rad.h"
 #include "dcast.h"
 #include "bamCacheRecord.h"

panda/src/egg/eggNode.cxx

@@ -14,6 +14,7 @@
 
 #include "eggNode.h"
 #include "eggGroupNode.h"
+#include "lightMutexHolder.h"
 #include "config_egg.h"
 #include "eggTextureCollection.h"
 #include "dcast.h"

panda/src/egg/eggParameters.h

@@ -17,6 +17,8 @@
 
 #include "pandabase.h"
 
+#include "numeric_types.h"
+
 ////////////////////////////////////////////////////////////////////
 //       Class : EggParameters
 // Description : The values stored in this structure are global

panda/src/egg2pg/eggSaver.h

@@ -18,6 +18,7 @@
 #include "pandabase.h"
 
 #include "luse.h"
+#include "eggData.h"
 #include "eggTextureCollection.h"
 #include "eggMaterialCollection.h"
 

panda/src/event/asyncTaskChain.cxx

@@ -20,6 +20,7 @@
 #include "pStatClient.h"
 #include "pStatTimer.h"
 #include "clockObject.h"
+#include "config_event.h"
 #include <algorithm>
 #include <stdio.h>  // For sprintf/snprintf
 

panda/src/event/asyncTaskSequence.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "asyncTaskSequence.h"
+#include "asyncTaskManager.h"
 
 TypeHandle AsyncTaskSequence::_type_handle;
 

panda/src/event/pythonTask.cxx

@@ -14,6 +14,7 @@
 
 #include "pythonTask.h"
 #include "pnotify.h"
+#include "config_event.h"
 
 #ifdef HAVE_PYTHON
 #include "py_panda.h"  

panda/src/express/password_hash.cxx

@@ -20,6 +20,7 @@
 
 #include "pnotify.h"
 #include "openssl/evp.h"
+#include "memoryHook.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: password_hash

panda/src/express/virtualFileMount.cxx

@@ -14,6 +14,7 @@
 
 #include "virtualFileMount.h"
 #include "virtualFileSimple.h"
+#include "virtualFileSystem.h"
 #include "zStream.h"
 
 TypeHandle VirtualFileMount::_type_handle;

panda/src/express/virtualFileSimple.cxx

@@ -15,6 +15,7 @@
 #include "virtualFileSimple.h"
 #include "virtualFileMount.h"
 #include "virtualFileList.h"
+#include "dcast.h"
 
 TypeHandle VirtualFileSimple::_type_handle;
 

panda/src/ffmpeg/config_ffmpeg.h

@@ -26,6 +26,13 @@
 ConfigureDecl(config_ffmpeg, EXPCL_FFMPEG, EXPTP_FFMPEG);
 NotifyCategoryDecl(ffmpeg, EXPCL_FFMPEG, EXPTP_FFMPEG);
 
+extern ConfigVariableInt ffmpeg_max_readahead_frames;
+extern ConfigVariableBool ffmpeg_show_seek_frames;
+extern ConfigVariableBool ffmpeg_support_seek;
+extern ConfigVariableBool ffmpeg_global_lock;
+extern ConfigVariableEnum<ThreadPriority> ffmpeg_thread_priority;
+extern ConfigVariableInt ffmpeg_read_buffer_size;
+
 extern EXPCL_FFMPEG void init_libffmpeg();
 
 #endif /* CONFIG_FFMPEG_H */

panda/src/ffmpeg/ffmpegAudio.cxx

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "config_ffmpeg.h"
 #include "ffmpegAudio.h"
 #include "ffmpegAudioCursor.h"
 #include "dcast.h"

panda/src/ffmpeg/ffmpegAudioCursor.cxx

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "config_ffmpeg.h"
 #include "ffmpegAudioCursor.h"
 
 #include "ffmpegAudio.h"

panda/src/ffmpeg/ffmpegVideo.cxx

@@ -14,7 +14,7 @@
 
 #include "ffmpegVideo.h"
 #include "ffmpegVideoCursor.h"
-#include "config_movies.h"
+#include "config_ffmpeg.h"
 #include "bamReader.h"
 #include "dcast.h"
 

panda/src/ffmpeg/ffmpegVideoCursor.cxx

@@ -13,7 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "ffmpegVideoCursor.h"
-#include "config_movies.h"
+#include "config_ffmpeg.h"
 #include "pStatCollector.h"
 #include "pStatTimer.h"
 #include "mutexHolder.h"

panda/src/ffmpeg/ffmpegVirtualFile.cxx

@@ -14,7 +14,7 @@
 
 #include "pandabase.h"
 
-#include "config_movies.h"
+#include "config_ffmpeg.h"
 #include "ffmpegVirtualFile.h"
 #include "virtualFileSystem.h"
 

panda/src/framework/config_framework.h

@@ -28,6 +28,7 @@ NotifyCategoryDecl(framework, EXPCL_FRAMEWORK, EXPTP_FRAMEWORK);
 extern ConfigVariableDouble aspect_ratio;
 extern ConfigVariableBool show_frame_rate_meter;
 extern ConfigVariableBool show_scene_graph_analyzer_meter;
+extern ConfigVariableString window_type;
 
 extern ConfigVariableString record_session;
 extern ConfigVariableString playback_session;

panda/src/framework/pandaFramework.cxx

@@ -92,16 +92,16 @@ open_framework(int &argc, char **&argv) {
 #ifdef LINK_ALL_STATIC
   // If we're statically linking, we need to explicitly link with
   // at least one of the available renderers.
-  #ifdef HAVE_GL
+  #if defined(HAVE_GL)
   extern EXPCL_PANDAGL void init_libpandagl();
   init_libpandagl();
-  #elif HAVE_DX9
+  #elif defined(HAVE_DX9)
   extern EXPCL_PANDADX9 void init_libpandadx9();
   init_libpandadx9();
-  #elif HAVE_DX8
+  #elif defined(HAVE_DX8)
   extern EXPCL_PANDADX8 void init_libpandadx8();
   init_libpandadx8();
-  #elif HAVE_TINYDISPLAY
+  #elif defined(HAVE_TINYDISPLAY)
   extern EXPCL_TINYDISPLAY void init_libtinydisplay();
   init_libtinydisplay();
   #endif

panda/src/framework/pandaFramework.h

@@ -16,6 +16,7 @@
 #define PANDAFRAMEWORK_H
 
 #include "pandabase.h"
+#include "config_framework.h"
 
 #include "windowFramework.h"
 

panda/src/gobj/config_gobj.h

@@ -23,6 +23,7 @@
 #include "configVariableDouble.h"
 #include "configVariableFilename.h"
 #include "configVariableString.h"
+#include "configVariableList.h"
 #include "autoTextureScale.h"
 
 NotifyCategoryDecl(gobj, EXPCL_PANDA_GOBJ, EXPTP_PANDA_GOBJ);
@@ -84,6 +85,7 @@ extern EXPCL_PANDA_GOBJ ConfigVariableInt released_ibuffer_cache_size;
 
 extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_near;
 extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_far;
+extern EXPCL_PANDA_GOBJ ConfigVariableDouble lens_far_limit;
 extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_fov;
 extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_iod;
 extern EXPCL_PANDA_GOBJ ConfigVariableDouble default_converge;

panda/src/gobj/geomCacheManager.cxx

@@ -15,6 +15,7 @@
 #include "geomCacheManager.h"
 #include "geomCacheEntry.h"
 #include "lightMutexHolder.h"
+#include "clockObject.h"
 
 GeomCacheManager *GeomCacheManager::_global_ptr = NULL;
 

panda/src/gobj/geomPrimitive.cxx

@@ -14,6 +14,7 @@
 
 #include "geomPrimitive.h"
 #include "geom.h"
+#include "geomPatches.h"
 #include "geomVertexData.h"
 #include "geomVertexArrayFormat.h"
 #include "geomVertexColumn.h"

panda/src/gobj/shader.h

@@ -16,10 +16,12 @@
 #define SHADER_H
 
 #include "pandabase.h"
+#include "config_gobj.h"
 #include "typedWritableReferenceCount.h"
 #include "namable.h"
 #include "graphicsStateGuardianBase.h"
 #include "internalName.h"
+#include "pta_int.h"
 #include "pta_float.h"
 #include "pta_double.h"
 #include "pta_stdfloat.h"

panda/src/gobj/texturePool.cxx

@@ -26,6 +26,7 @@
 #include "configVariableList.h"
 #include "load_dso.h"
 #include "mutexHolder.h"
+#include "dcast.h"
 
 TexturePool *TexturePool::_global_ptr;
 

panda/src/gobj/textureStagePool.cxx

@@ -17,6 +17,7 @@
 #include "config_gobj.h"
 #include "mutexHolder.h"
 #include "configVariableEnum.h"
+#include "string_utils.h"
 
 TextureStagePool *TextureStagePool::_global_ptr = (TextureStagePool *)NULL;
 

panda/src/gobj/vertexBufferContext.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "vertexBufferContext.h"
+#include "config_gobj.h"
 
 TypeHandle VertexBufferContext::_type_handle;
 

panda/src/gobj/vertexDataBlock.h

@@ -17,6 +17,7 @@
 
 #include "pandabase.h"
 #include "simpleAllocator.h"
+#include "vertexDataPage.h"
 #include "referenceCount.h"
 
 class VertexDataPage;

panda/src/gobj/vertexDataBuffer.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "vertexDataBuffer.h"
+#include "config_gobj.h"
 #include "pStatTimer.h"
 
 TypeHandle VertexDataBuffer::_type_handle;

panda/src/gobj/vertexDataPage.cxx

@@ -16,8 +16,11 @@
 #include "configVariableInt.h"
 #include "vertexDataSaveFile.h"
 #include "vertexDataBook.h"
+#include "vertexDataBlock.h"
 #include "pStatTimer.h"
 #include "memoryHook.h"
+#include "config_gobj.h"
+#include <algorithm>
 
 #ifdef HAVE_ZLIB
 #include <zlib.h>

panda/src/gobj/vertexDataSaveFile.cxx

@@ -15,6 +15,7 @@
 #include "vertexDataSaveFile.h"
 #include "mutexHolder.h"
 #include "clockObject.h"
+#include "config_gobj.h"
 
 #ifndef _WIN32
 #include <sys/types.h>

panda/src/grutil/lineSegs.cxx

@@ -20,6 +20,7 @@
 #include "geomPoints.h"
 #include "geomVertexReader.h"
 #include "geomVertexWriter.h"
+#include "colorAttrib.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: LineSegs::Constructor

panda/src/grutil/pfmVizzer.cxx

@@ -21,6 +21,7 @@
 #include "geomTriangles.h"
 #include "geomVertexWriter.h"
 #include "lens.h"
+#include "pnmImage.h"
 #include "config_grutil.h"
 
 ////////////////////////////////////////////////////////////////////

panda/src/grutil/rigidBodyCombiner.cxx

@@ -22,6 +22,7 @@
 #include "geomVertexAnimationSpec.h"
 #include "sceneGraphReducer.h"
 #include "omniBoundingVolume.h"
+#include "cullTraverserData.h"
 
 TypeHandle RigidBodyCombiner::_type_handle;
 

panda/src/linmath/lvecBase2.h

@@ -24,6 +24,7 @@
 #include "checksumHashGenerator.h"
 #include "mathNumbers.h"
 #include "deg_2_rad.h"
+#include "lsimpleMatrix.h"
 
 #include "cmath.h"
 #include "nearly_zero.h"

panda/src/mathutil/boundingLine.cxx

@@ -14,6 +14,7 @@
 
 #include "boundingLine.h"
 #include "boundingSphere.h"
+#include "boundingBox.h"
 #include "config_mathutil.h"
 
 #include <math.h>

panda/src/mathutil/boundingPlane.cxx

@@ -14,6 +14,8 @@
 
 #include "boundingPlane.h"
 #include "boundingSphere.h"
+#include "boundingBox.h"
+#include "boundingHexahedron.h"
 #include "config_mathutil.h"
 
 TypeHandle BoundingPlane::_type_handle;

panda/src/mathutil/boundingVolume.cxx

@@ -16,6 +16,12 @@
 #include "finiteBoundingVolume.h"
 #include "unionBoundingVolume.h"
 #include "intersectionBoundingVolume.h"
+#include "boundingBox.h"
+#include "boundingLine.h"
+#include "boundingPlane.h"
+#include "boundingSphere.h"
+#include "boundingHexahedron.h"
+#include "config_mathutil.h"
 
 #include "indent.h"
 

panda/src/mathutil/fftCompressor.cxx

@@ -25,7 +25,7 @@
 #ifdef HAVE_FFTW
 
 //  hack.....
-// this is a hack to help interigate sort out a macro 
+// this is a hack to help interrogate sort out a macro
 // in the system poll and select definitions 
 //    
 #ifdef howmany

panda/src/mathutil/finiteBoundingVolume.cxx

@@ -14,6 +14,7 @@
 
 #include "finiteBoundingVolume.h"
 #include "boundingBox.h"
+#include "config_mathutil.h"
 
 TypeHandle FiniteBoundingVolume::_type_handle;
 

panda/src/mathutil/randomizer.h

@@ -19,6 +19,7 @@
 #include "mersenne.h"
 
 #include <time.h>
+#include <math.h>
 
 ////////////////////////////////////////////////////////////////////
 //       Class : Randomizer

panda/src/mathutil/triangulator3.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "triangulator3.h"
+#include "look_at_src.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: Triangulator3::Constructor

panda/src/movies/movieTypeRegistry.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "movieTypeRegistry.h"
+#include "string_utils.h"
 #include "config_movies.h"
 #include "config_util.h"
 #include "load_dso.h"

panda/src/movies/wavAudioCursor.cxx

@@ -13,7 +13,9 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "wavAudioCursor.h"
+#include "config_movies.h"
 #include "virtualFileSystem.h"
+#include "wavAudio.h"
 
 // Tables for decompressing mu-law and A-law wav files.
 static PN_int16 mulaw_table[256] = {

panda/src/nativenet/socket_tcp_listen.h

@@ -3,6 +3,7 @@
 
 #include "pandabase.h"
 #include "socket_ip.h"
+#include "socket_tcp.h"
 
 /////////////////////////////////////////////////////////////////////
 // Class : Socket_TCP_Listen

panda/src/nativenet/socket_tcp_ssl.h

@@ -2,6 +2,7 @@
 #define __SOCKET_TCP_SSL_H__ 
 
 #include "pandabase.h"
+#include "config_nativenet.h"
 #include "socket_ip.h"
 #include "numeric_types.h"
 

panda/src/nativenet/socket_udp_outgoing.h

@@ -1,6 +1,9 @@
 #ifndef __SOCKET_UDP_OUTGOING_H__
 #define __SOCKET_UDP_OUTGOING_H__
 
+#include "config_nativenet.h"
+#include "socket_ip.h"
+
 /////////////////////////////////////////////////////////////////////
 // Class : Socket_UDP_Outgoing
 //

panda/src/net/connectionListener.cxx

@@ -12,6 +12,7 @@
 //
 ////////////////////////////////////////////////////////////////////
 
+#include "dcast.h"
 #include "connectionListener.h"
 #include "connection.h"
 #include "connectionManager.h"

panda/src/net/connectionManager.cxx

@@ -18,6 +18,8 @@
 #include "connectionWriter.h"
 #include "netAddress.h"
 #include "config_net.h"
+#include "socket_udp.h"
+#include "socket_tcp_listen.h"
 #include "lightMutexHolder.h"
 #include "trueClock.h"
 

panda/src/net/connectionReader.cxx

@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "connectionReader.h"
+#include "dcast.h"
 #include "connectionManager.h"
 #include "netDatagram.h"
 #include "datagramTCPHeader.h"

panda/src/net/datagramGeneratorNet.h

@@ -22,6 +22,7 @@
 #include "queuedReturn.h"
 #include "pmutex.h"
 #include "conditionVar.h"
+#include "netDatagram.h"
 
 EXPORT_TEMPLATE_CLASS(EXPCL_PANDA_NET, EXPTP_PANDA_NET, QueuedReturn<Datagram>);
 

panda/src/ode/odeBody.cxx

@@ -14,6 +14,7 @@
 
 #include "config_ode.h"
 #include "odeBody.h"
+#include "odeJoint.h"
 
 TypeHandle OdeBody::_type_handle;
 

panda/src/ode/odeGeom.cxx

@@ -14,6 +14,18 @@
 
 #include "config_ode.h"
 #include "odeGeom.h"
+#include "odeSimpleSpace.h"
+#include "odeQuadTreeSpace.h"
+#include "odeHashSpace.h"
+
+#include "odeTriMeshGeom.h"
+#include "odeTriMeshData.h"
+#include "odeBoxGeom.h"
+#include "odeCappedCylinderGeom.h"
+#include "odeCylinderGeom.h"
+#include "odePlaneGeom.h"
+#include "odeRayGeom.h"
+#include "odeSphereGeom.h"
 
 //OdeGeom::GeomSurfaceMap OdeGeom::_geom_surface_map;
 //OdeGeom::GeomCollideIdMap OdeGeom::_geom_collide_id_map;