diff --git a/panda/src/chan/movingPartBase.h b/panda/src/chan/movingPartBase.h
index a0a1ac6f66..ba54a24a89 100644
--- a/panda/src/chan/movingPartBase.h
+++ b/panda/src/chan/movingPartBase.h
@@ -19,7 +19,7 @@
 #ifndef MOVINGPARTBASE_H
 #define MOVINGPARTBASE_H
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "partGroup.h"
 #include "partBundle.h"
diff --git a/panda/src/chancfg/chanlayout.h b/panda/src/chancfg/chanlayout.h
index 820723fdbb..bac830ec38 100644
--- a/panda/src/chancfg/chanlayout.h
+++ b/panda/src/chancfg/chanlayout.h
@@ -19,7 +19,7 @@
 #ifndef __CHANLAYOUT_H__
 #define __CHANLAYOUT_H__
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "pmap.h"
 #include "pvector.h"
diff --git a/panda/src/chancfg/chanparse.h b/panda/src/chancfg/chanparse.h
index e7739e3a0b..b93545f841 100644
--- a/panda/src/chancfg/chanparse.h
+++ b/panda/src/chancfg/chanparse.h
@@ -19,7 +19,7 @@
 #ifndef __CHANPARSE_H__
 #define __CHANPARSE_H__
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include <string>
 
diff --git a/panda/src/chancfg/chansetup.h b/panda/src/chancfg/chansetup.h
index f1941c5c84..a9cbd929f4 100644
--- a/panda/src/chancfg/chansetup.h
+++ b/panda/src/chancfg/chansetup.h
@@ -19,7 +19,7 @@
 #ifndef __CHANSETUP_H__
 #define __CHANSETUP_H__
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include <vector_string.h>
 
diff --git a/panda/src/chancfg/chanviewport.h b/panda/src/chancfg/chanviewport.h
index bef114d25c..4c5bc1acae 100644
--- a/panda/src/chancfg/chanviewport.h
+++ b/panda/src/chancfg/chanviewport.h
@@ -24,20 +24,20 @@ class EXPCL_PANDA ChanViewport {
 private:
   float _left, _right, _bottom, _top;
 
-  INLINE ChanViewport(void);
+  INLINE ChanViewport();
 public:
   INLINE ChanViewport(float, float, float, float);
   INLINE ChanViewport(const ChanViewport&);
-  INLINE ~ChanViewport(void);
+  INLINE ~ChanViewport();
   INLINE ChanViewport& operator=(const ChanViewport&);
 
-  INLINE float left(void) const;
-  INLINE float right(void) const;
-  INLINE float bottom(void) const;
-  INLINE float top(void) const;
+  INLINE float left() const;
+  INLINE float right() const;
+  INLINE float bottom() const;
+  INLINE float top() const;
 };
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "chanviewport.I"
 
diff --git a/panda/src/chancfg/chanwindow.h b/panda/src/chancfg/chanwindow.h
index 0a3d234def..440f23061a 100644
--- a/panda/src/chancfg/chanwindow.h
+++ b/panda/src/chancfg/chanwindow.h
@@ -19,7 +19,7 @@
 #ifndef __CHANWINDOW_H__
 #define __CHANWINDOW_H__
 
-#include <pandabase.h>
+#include "pandabase.h"
 
 #include "pmap.h"
 #include "pvector.h"
@@ -35,26 +35,26 @@ private:
   SetupSyms _setups;
   PTA(int) _camera_group;
 public:
-  INLINE WindowItem(void);
+  INLINE WindowItem();
   INLINE WindowItem(const bool, const bool, const int, const std::string&,
                     const SetupSyms&, const int, const int, const bool,
                     const bool, PTA(int) );
   INLINE WindowItem(const WindowItem&);
-  INLINE ~WindowItem(void);
+  INLINE ~WindowItem();
 
   INLINE WindowItem& operator=(const WindowItem&);
 
-  INLINE bool getHWChans(void) const;
-  INLINE bool getDVR(void) const;
-  INLINE bool getBorder(void) const;
-  INLINE bool getCursor(void) const;
-  INLINE int getChanOffset(void) const;
-  INLINE int getSizeX(void) const;
-  INLINE int getSizeY(void) const;
-  INLINE std::string getLayout(void) const;
-  INLINE SetupSyms getSetups(void) const;
+  INLINE bool getHWChans() const;
+  INLINE bool getDVR() const;
+  INLINE bool getBorder() const;
+  INLINE bool getCursor() const;
+  INLINE int getChanOffset() const;
+  INLINE int getSizeX() const;
+  INLINE int getSizeY() const;
+  INLINE std::string getLayout() const;
+  INLINE SetupSyms getSetups() const;
   INLINE int getCameraGroup(int display_region) const;
-  INLINE int getNumCameraGroups(void) const;
+  INLINE int getNumCameraGroups() const;
 };
 
 typedef pmap<std::string, WindowItem> WindowType;
diff --git a/panda/src/char/characterSlider.h b/panda/src/char/characterSlider.h
index 7c4fa84b3b..071cd42e36 100644
--- a/panda/src/char/characterSlider.h
+++ b/panda/src/char/characterSlider.h
@@ -19,9 +19,9 @@
 #ifndef CHARACTERSLIDER_H
 #define CHARACTERSLIDER_H
 
-#include <pandabase.h>
+#include "pandabase.h"
 
-#include <movingPartScalar.h>
+#include "movingPartScalar.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CharacterSlider
@@ -40,7 +40,7 @@ public:
 
   virtual PartGroup *make_copy() const;
 
-  static void register_with_read_factory(void);
+  static void register_with_read_factory();
 
   static TypedWritable *make_CharacterSlider(const FactoryParams &params);
 
diff --git a/panda/src/char/computedVerticesMorph.h b/panda/src/char/computedVerticesMorph.h
index 36d5b0e905..9b5e9f6ec0 100644
--- a/panda/src/char/computedVerticesMorph.h
+++ b/panda/src/char/computedVerticesMorph.h
@@ -19,10 +19,10 @@
 #ifndef COMPUTEDVERTICESMORPH_H
 #define COMPUTEDVERTICESMORPH_H
 
-#include <pandabase.h>
-#include <vector_typedWritable.h>
+#include "pandabase.h"
+#include "vector_typedWritable.h"
 
-#include <luse.h>
+#include "luse.h"
 
 class CharacterSlider;
 class BamReader;
@@ -42,7 +42,7 @@ public:
   typedef LVector2f VecType;
 
   INLINE ComputedVerticesMorphValue2(int index, const VecType &mvector);
-  INLINE ComputedVerticesMorphValue2(void);
+  INLINE ComputedVerticesMorphValue2();
 
   ushort _index;
   VecType _vector;
@@ -63,7 +63,7 @@ public:
   typedef LVector3f VecType;
 
   INLINE ComputedVerticesMorphValue3(int index, const VecType &mvector);
-  INLINE ComputedVerticesMorphValue3(void);
+  INLINE ComputedVerticesMorphValue3();
 
   ushort _index;
   VecType _vector;
@@ -84,7 +84,7 @@ public:
   typedef LVector4f VecType;
 
   INLINE ComputedVerticesMorphValue4(int index, const VecType &mvector);
-  INLINE ComputedVerticesMorphValue4(void);
+  INLINE ComputedVerticesMorphValue4();
 
   ushort _index;
   VecType _vector;
diff --git a/panda/src/char/config_char.h b/panda/src/char/config_char.h
index 37b297afc5..0ca93181e7 100644
--- a/panda/src/char/config_char.h
+++ b/panda/src/char/config_char.h
@@ -19,8 +19,8 @@
 #ifndef CONFIG_CHAR_H
 #define CONFIG_CHAR_H
 
-#include <pandabase.h>
-#include <notifyCategoryProxy.h>
+#include "pandabase.h"
+#include "notifyCategoryProxy.h"
 
 // CPPParser can't handle token-pasting to a keyword.
 #ifndef CPPPARSER