diff --git a/src/osgPlugins/txp/ReaderWriterTXP.h b/src/osgPlugins/txp/ReaderWriterTXP.h
index a0c8e95bc..efefb42af 100644
--- a/src/osgPlugins/txp/ReaderWriterTXP.h
+++ b/src/osgPlugins/txp/ReaderWriterTXP.h
@@ -26,7 +26,7 @@
 #ifndef READER_WRITER_TXP_H
 #define READER_WRITER_TXP_H
 
-#include <trpage_sys.h>
+#include "trpage_sys.h"
 #include <osg/Object>
 #include <osg/Node>
 
diff --git a/src/osgPlugins/txp/TerrapageNode.h b/src/osgPlugins/txp/TerrapageNode.h
index bf16c5e73..9d726b149 100644
--- a/src/osgPlugins/txp/TerrapageNode.h
+++ b/src/osgPlugins/txp/TerrapageNode.h
@@ -6,7 +6,7 @@
 #include <osg/Node>
 #include <osg/BoundingBox>
 
-#include <trPagePageManager.h>
+#include "trPagePageManager.h"
 
 namespace txp
 {
diff --git a/src/osgPlugins/txp/TrPageArchive.cpp b/src/osgPlugins/txp/TrPageArchive.cpp
index 84dd4b751..cbfa08c40 100644
--- a/src/osgPlugins/txp/TrPageArchive.cpp
+++ b/src/osgPlugins/txp/TrPageArchive.cpp
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <TrPageArchive.h>
-#include <TrPageParser.h>
+#include "TrPageArchive.h"
+#include "TrPageParser.h"
 
 #include <osg/AlphaFunc>
 #include <osg/Group>
@@ -23,11 +23,11 @@
 #include <osgDB/WriteFile>
 #include <osgDB/FileNameUtils>
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
-#include <trpage_write.h>
-#include <trpage_scene.h>
-#include <trpage_managers.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
+#include "trpage_write.h"
+#include "trpage_scene.h"
+#include "trpage_managers.h"
 
 
 using namespace txp;
diff --git a/src/osgPlugins/txp/TrPageArchive.h b/src/osgPlugins/txp/TrPageArchive.h
index de038f626..c9b6a52ee 100644
--- a/src/osgPlugins/txp/TrPageArchive.h
+++ b/src/osgPlugins/txp/TrPageArchive.h
@@ -25,11 +25,11 @@
 
 
 
-#include <trpage_sys.h>
-#include <trpage_read.h>
-#include <trpage_managers.h>
+#include "trpage_sys.h"
+#include "trpage_read.h"
+#include "trpage_managers.h"
 
-#include <TrPageParser.h>
+#include "TrPageParser.h"
 
 #include <string>
 #include <vector>
diff --git a/src/osgPlugins/txp/TrPageParser.cpp b/src/osgPlugins/txp/TrPageParser.cpp
index 8270b91c4..43f71bddd 100644
--- a/src/osgPlugins/txp/TrPageParser.cpp
+++ b/src/osgPlugins/txp/TrPageParser.cpp
@@ -19,7 +19,7 @@
 * All Rights Reserved.
 *
 *****************************************************************************/
-#include <trpage_sys.h>
+#include "trpage_sys.h"
 #include <osg/AlphaFunc>
 #include <osg/Group>
 #include <osg/Material>
@@ -35,8 +35,8 @@
 #include <osg/Notify>
 
 
-#include <TrPageParser.h>
-#include <TrPageArchive.h>
+#include "TrPageParser.h"
+#include "TrPageArchive.h"
 /*
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/osgPlugins/txp/TrPageParser.h b/src/osgPlugins/txp/TrPageParser.h
index 2a3f7f4ee..2739f83bb 100644
--- a/src/osgPlugins/txp/TrPageParser.h
+++ b/src/osgPlugins/txp/TrPageParser.h
@@ -31,7 +31,7 @@
 #include <osg/Group>
 #include <osg/StateSet>
 #include <vector>
-#include <trpage_read.h>
+#include "trpage_read.h"
 
 namespace txp
 {
diff --git a/src/osgPlugins/txp/trPagePageManager.cpp b/src/osgPlugins/txp/trPagePageManager.cpp
index 0b0640367..f192383d0 100644
--- a/src/osgPlugins/txp/trPagePageManager.cpp
+++ b/src/osgPlugins/txp/trPagePageManager.cpp
@@ -9,9 +9,9 @@
 #include <pthread.h>
 #endif
 
-#include <TrPageArchive.h>
-#include <trPagePageManager.h>
-#include <trpage_print.h>
+#include "TrPageArchive.h"
+#include "trPagePageManager.h"
+#include "trpage_print.h"
 
 #include <osg/Group>
 #include <osg/Object>
diff --git a/src/osgPlugins/txp/trPagePageManager.h b/src/osgPlugins/txp/trPagePageManager.h
index d9f12c990..4b7b18406 100644
--- a/src/osgPlugins/txp/trPagePageManager.h
+++ b/src/osgPlugins/txp/trPagePageManager.h
@@ -27,13 +27,13 @@
 #include <osg/Object>
 #include <osg/Node>
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
-#include <trpage_write.h>
-#include <trpage_scene.h>
-#include <trpage_managers.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
+#include "trpage_write.h"
+#include "trpage_scene.h"
+#include "trpage_managers.h"
 #include <WaitBlock.h>
-#include <TrPageArchive.h>
+#include "TrPageArchive.h"
 
 namespace txp
 {
diff --git a/src/osgPlugins/txp/trpage_basic.cpp b/src/osgPlugins/txp/trpage_basic.cpp
index d90140f67..dee17e4c5 100644
--- a/src/osgPlugins/txp/trpage_basic.cpp
+++ b/src/osgPlugins/txp/trpage_basic.cpp
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <trpage_io.h>
+#include "trpage_io.h"
 
 /* Checkable
     This is just a class that checks validity.
diff --git a/src/osgPlugins/txp/trpage_compat.cpp b/src/osgPlugins/txp/trpage_compat.cpp
index 44392b993..ff1161553 100644
--- a/src/osgPlugins/txp/trpage_compat.cpp
+++ b/src/osgPlugins/txp/trpage_compat.cpp
@@ -24,9 +24,9 @@
    
  */
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
-#include <trpage_compat.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
+#include "trpage_compat.h"
 
 /* Old short Material definition from 1.0.
     {secret}
diff --git a/src/osgPlugins/txp/trpage_geom.cpp b/src/osgPlugins/txp/trpage_geom.cpp
index 0a0cdfe94..37faa7bda 100644
--- a/src/osgPlugins/txp/trpage_geom.cpp
+++ b/src/osgPlugins/txp/trpage_geom.cpp
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 #include <osg/Vec3>
 
diff --git a/src/osgPlugins/txp/trpage_geom.h b/src/osgPlugins/txp/trpage_geom.h
index f67c4f9bf..952dd744a 100644
--- a/src/osgPlugins/txp/trpage_geom.h
+++ b/src/osgPlugins/txp/trpage_geom.h
@@ -21,10 +21,10 @@
     These are the objects that get read from and written to archives.
     */
 
-#include <trpage_sys.h>
+#include "trpage_sys.h"
 
-#include <trpage_io.h>
-#include <trpage_swap.h>
+#include "trpage_io.h"
+#include "trpage_swap.h"
 
 // Forward declarations
 
diff --git a/src/osgPlugins/txp/trpage_header.cpp b/src/osgPlugins/txp/trpage_header.cpp
index d8eefce81..9382f591b 100644
--- a/src/osgPlugins/txp/trpage_header.cpp
+++ b/src/osgPlugins/txp/trpage_header.cpp
@@ -23,8 +23,8 @@
      to the header definition.
      */
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 /* Write Header class
     Fill it in and write it out.
diff --git a/src/osgPlugins/txp/trpage_io.h b/src/osgPlugins/txp/trpage_io.h
index 036bf401d..31eef9725 100644
--- a/src/osgPlugins/txp/trpage_io.h
+++ b/src/osgPlugins/txp/trpage_io.h
@@ -20,7 +20,7 @@
     Token definitions and basic classes.
   */
 
-#include <trpage_sys.h>
+#include "trpage_sys.h"
 
 // Macros we may need
 #ifndef MIN
diff --git a/src/osgPlugins/txp/trpage_light.cpp b/src/osgPlugins/txp/trpage_light.cpp
index fc40865e6..b360e331d 100644
--- a/src/osgPlugins/txp/trpage_light.cpp
+++ b/src/osgPlugins/txp/trpage_light.cpp
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 #if defined(_WIN32)
 #define ALIGNMENT_WORKAROUND    false
diff --git a/src/osgPlugins/txp/trpage_main.cpp b/src/osgPlugins/txp/trpage_main.cpp
index 3e5f47ebf..a139b3257 100644
--- a/src/osgPlugins/txp/trpage_main.cpp
+++ b/src/osgPlugins/txp/trpage_main.cpp
@@ -26,6 +26,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <trdll.h>
+#include "trdll.h"
 
 TXDUMMY_DLL_MAIN
diff --git a/src/osgPlugins/txp/trpage_managers.cpp b/src/osgPlugins/txp/trpage_managers.cpp
index d8fac3030..96eec2ca3 100644
--- a/src/osgPlugins/txp/trpage_managers.cpp
+++ b/src/osgPlugins/txp/trpage_managers.cpp
@@ -17,11 +17,11 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <trpage_sys.h>
-#include <trpage_geom.h>
-#include <trpage_read.h>
-#include <trpage_print.h>
-#include <trpage_managers.h>
+#include "trpage_sys.h"
+#include "trpage_geom.h"
+#include "trpage_read.h"
+#include "trpage_print.h"
+#include "trpage_managers.h"
 
 /* Managed Tile class.
 	Check the header file for details.
diff --git a/src/osgPlugins/txp/trpage_material.cpp b/src/osgPlugins/txp/trpage_material.cpp
index 123bd6294..10091eaf4 100644
--- a/src/osgPlugins/txp/trpage_material.cpp
+++ b/src/osgPlugins/txp/trpage_material.cpp
@@ -23,8 +23,8 @@
     You should only modify this code if you want to add data to these classes.
     */
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 /* Write Material Table class
     Keeps track of the materials that have been added.
diff --git a/src/osgPlugins/txp/trpage_model.cpp b/src/osgPlugins/txp/trpage_model.cpp
index 054c15cf5..3b1d9fe35 100644
--- a/src/osgPlugins/txp/trpage_model.cpp
+++ b/src/osgPlugins/txp/trpage_model.cpp
@@ -22,8 +22,8 @@
     You should only modify this code if you want to add data to these classes.
     */
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 /* Write Model class
     Represents a model reference.
diff --git a/src/osgPlugins/txp/trpage_nodes.cpp b/src/osgPlugins/txp/trpage_nodes.cpp
index 1a63cb319..0a34ea001 100644
--- a/src/osgPlugins/txp/trpage_nodes.cpp
+++ b/src/osgPlugins/txp/trpage_nodes.cpp
@@ -24,8 +24,8 @@
      of these classes.
      */
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 /* Write Group
     Basic group.
diff --git a/src/osgPlugins/txp/trpage_parse.cpp b/src/osgPlugins/txp/trpage_parse.cpp
index ba9058e19..91fec2661 100644
--- a/src/osgPlugins/txp/trpage_parse.cpp
+++ b/src/osgPlugins/txp/trpage_parse.cpp
@@ -30,7 +30,7 @@
      for the rest of the tokens that you want.
      */
 
-#include <trpage_read.h>
+#include "trpage_read.h"
 
 /* ***************************
     Paging token callback structure
diff --git a/src/osgPlugins/txp/trpage_pparse.cpp b/src/osgPlugins/txp/trpage_pparse.cpp
index a64a0dfb7..7ac09fbb7 100644
--- a/src/osgPlugins/txp/trpage_pparse.cpp
+++ b/src/osgPlugins/txp/trpage_pparse.cpp
@@ -22,8 +22,8 @@
     archive for the purpose of printing it out.
  */
 
-#include <trpage_print.h>
-#include <trpage_scene.h>
+#include "trpage_print.h"
+#include "trpage_scene.h"
 
 /* Set up the callbacks for the scene graph parser.
     In our case this is just one read helper with
diff --git a/src/osgPlugins/txp/trpage_print.cpp b/src/osgPlugins/txp/trpage_print.cpp
index 3b8929230..45f204d9b 100644
--- a/src/osgPlugins/txp/trpage_print.cpp
+++ b/src/osgPlugins/txp/trpage_print.cpp
@@ -23,7 +23,7 @@
     within a TerraPage archive.
  */
 
-#include <trpage_print.h>
+#include "trpage_print.h"
 
 /* ******************************************
    Print Buffer implementation
diff --git a/src/osgPlugins/txp/trpage_print.h b/src/osgPlugins/txp/trpage_print.h
index 48fef4346..4f93645b7 100644
--- a/src/osgPlugins/txp/trpage_print.h
+++ b/src/osgPlugins/txp/trpage_print.h
@@ -16,7 +16,7 @@
 #ifndef trpage_print_h_
 #define trpage_print_h_
 
-#include <trpage_read.h>
+#include "trpage_read.h"
 
 /* Print Buffer for TerraPage.  Subclasses of this object
     are used to print out to stdout or disk (or whatever).
diff --git a/src/osgPlugins/txp/trpage_range.cpp b/src/osgPlugins/txp/trpage_range.cpp
index 50a36013d..9ee86a58d 100644
--- a/src/osgPlugins/txp/trpage_range.cpp
+++ b/src/osgPlugins/txp/trpage_range.cpp
@@ -22,8 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 /* *******************
     Range Methods
diff --git a/src/osgPlugins/txp/trpage_rarchive.cpp b/src/osgPlugins/txp/trpage_rarchive.cpp
index d600f55c7..e4c70da5f 100644
--- a/src/osgPlugins/txp/trpage_rarchive.cpp
+++ b/src/osgPlugins/txp/trpage_rarchive.cpp
@@ -22,8 +22,8 @@
     The Read Archive is used to read a paging archive from disk.
     */
 
-#include <trpage_read.h>
-#include <trpage_compat.h>
+#include "trpage_read.h"
+#include "trpage_compat.h"
 
 // Constructor
 trpgr_Archive::trpgr_Archive()
diff --git a/src/osgPlugins/txp/trpage_read.h b/src/osgPlugins/txp/trpage_read.h
index c81fece7b..8231d0ac0 100644
--- a/src/osgPlugins/txp/trpage_read.h
+++ b/src/osgPlugins/txp/trpage_read.h
@@ -21,9 +21,9 @@
     Classes used to represent read objects for paging files.
     */
 
-#include <trpage_sys.h>
+#include "trpage_sys.h"
 
-#include <trpage_geom.h>
+#include "trpage_geom.h"
 
 /* Callback base class
     Called when a given token is found.
diff --git a/src/osgPlugins/txp/trpage_readbuf.cpp b/src/osgPlugins/txp/trpage_readbuf.cpp
index 46f59158d..0308c6a03 100644
--- a/src/osgPlugins/txp/trpage_readbuf.cpp
+++ b/src/osgPlugins/txp/trpage_readbuf.cpp
@@ -28,8 +28,8 @@
      implement a trpgDiskReadBuffer as a subclass of trpgReadBuffer.
      */
 
-#include <trpage_io.h>
-#include <trpage_swap.h>
+#include "trpage_io.h"
+#include "trpage_swap.h"
 
 /* **********************
    Read buffer base class functions
diff --git a/src/osgPlugins/txp/trpage_scene.cpp b/src/osgPlugins/txp/trpage_scene.cpp
index 3edfb4541..cd22c70fa 100644
--- a/src/osgPlugins/txp/trpage_scene.cpp
+++ b/src/osgPlugins/txp/trpage_scene.cpp
@@ -34,8 +34,8 @@
       to read into a scene graph.  You'll need to replace the helpers, primarily.
     */
 
-#include <trpage_read.h>
-#include <trpage_scene.h>
+#include "trpage_read.h"
+#include "trpage_scene.h"
 
 /*  ****************
     MBR Calculation and handling
diff --git a/src/osgPlugins/txp/trpage_scene.h b/src/osgPlugins/txp/trpage_scene.h
index 264b70ed6..6d2e9b598 100644
--- a/src/osgPlugins/txp/trpage_scene.h
+++ b/src/osgPlugins/txp/trpage_scene.h
@@ -26,7 +26,7 @@
      for how to read TerraPage format into your own scene graph.
    */
 
-#include <trpage_geom.h>
+#include "trpage_geom.h"
 
 /*
     {group:Demonstration Scene Graph}
diff --git a/src/osgPlugins/txp/trpage_swap.cpp b/src/osgPlugins/txp/trpage_swap.cpp
index be72293ed..3c25dd8f4 100644
--- a/src/osgPlugins/txp/trpage_swap.cpp
+++ b/src/osgPlugins/txp/trpage_swap.cpp
@@ -20,7 +20,7 @@
     Byte swapping utility functions.
     */
 
-#include <trpage_swap.h>
+#include "trpage_swap.h"
 
 /*
 ** func:    swap_two( in, out )
diff --git a/src/osgPlugins/txp/trpage_swap.h b/src/osgPlugins/txp/trpage_swap.h
index 4eefcb255..a42e84aaf 100644
--- a/src/osgPlugins/txp/trpage_swap.h
+++ b/src/osgPlugins/txp/trpage_swap.h
@@ -20,9 +20,9 @@
     Byte swapping utility functions.
   */
 
-#include <trpage_sys.h>
+#include "trpage_sys.h"
 
-#include <trpage_io.h>
+#include "trpage_io.h"
 
 // Byte swap and return a short
 // {group:Byte Ordering Utilities}
diff --git a/src/osgPlugins/txp/trpage_sys.h b/src/osgPlugins/txp/trpage_sys.h
index 10f1fb92a..bd0ac2a18 100644
--- a/src/osgPlugins/txp/trpage_sys.h
+++ b/src/osgPlugins/txp/trpage_sys.h
@@ -101,7 +101,7 @@ typedef int64 trpgllong;
 
 // These are used to export classes from a DLL
 // Definitely Windows specific
-#include <trpage_ident.h>
-#include <trdll.h>
+#include "trpage_ident.h"
+#include "trdll.h"
 
 #endif
diff --git a/src/osgPlugins/txp/trpage_tile.cpp b/src/osgPlugins/txp/trpage_tile.cpp
index 994595353..a4533aac8 100644
--- a/src/osgPlugins/txp/trpage_tile.cpp
+++ b/src/osgPlugins/txp/trpage_tile.cpp
@@ -23,8 +23,8 @@
      the front of an archive) or the Tile Header (at the beginning of each tile).
      */
 
-#include <trpage_geom.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_read.h"
 
 /* Write Tile Table
     Keeps track of tiles written to disk.
diff --git a/src/osgPlugins/txp/trpage_util.cpp b/src/osgPlugins/txp/trpage_util.cpp
index 772679565..a8aae8f68 100644
--- a/src/osgPlugins/txp/trpage_util.cpp
+++ b/src/osgPlugins/txp/trpage_util.cpp
@@ -13,7 +13,7 @@
    ************************
    */
 
-#include <trpage_util.h>
+#include "trpage_util.h"
 
 /* trpage_util.cpp
 	This source file implements various utility routines for paging archive
diff --git a/src/osgPlugins/txp/trpage_util.h b/src/osgPlugins/txp/trpage_util.h
index f213bee2c..22368ae60 100644
--- a/src/osgPlugins/txp/trpage_util.h
+++ b/src/osgPlugins/txp/trpage_util.h
@@ -20,9 +20,9 @@
 #ifndef trpage_util_h_
 #define trpage_util_h_
 #include <stdlib.h>
-#include <trpage_read.h>
-#include <trpage_write.h>
-#include <trpage_scene.h>
+#include "trpage_read.h"
+#include "trpage_write.h"
+#include "trpage_scene.h"
 
 TX_EXDECL class TX_CLDECL trpgUtil {
 public:
diff --git a/src/osgPlugins/txp/trpage_warchive.cpp b/src/osgPlugins/txp/trpage_warchive.cpp
index 8790fd685..f24563587 100644
--- a/src/osgPlugins/txp/trpage_warchive.cpp
+++ b/src/osgPlugins/txp/trpage_warchive.cpp
@@ -28,10 +28,10 @@
      again, subclass and override if you need to change them.
     */
 
-#include <trpage_geom.h>
-#include <trpage_write.h>
-#include <trpage_compat.h>
-#include <trpage_read.h>
+#include "trpage_geom.h"
+#include "trpage_write.h"
+#include "trpage_compat.h"
+#include "trpage_read.h"
 
 // Constructor
 trpgwArchive::trpgwArchive(trpgEndian inNess,TileMode inTileMode,int inVersion)
diff --git a/src/osgPlugins/txp/trpage_write.h b/src/osgPlugins/txp/trpage_write.h
index e7e81f25e..9e3c1e9a5 100644
--- a/src/osgPlugins/txp/trpage_write.h
+++ b/src/osgPlugins/txp/trpage_write.h
@@ -21,9 +21,9 @@
     Classes that are used to write paging archives.
     */
 
-#include <trpage_sys.h>
-#include <trpage_io.h>
-#include <trpage_swap.h>
+#include "trpage_sys.h"
+#include "trpage_io.h"
+#include "trpage_swap.h"
 
 /* Geometry Stats
     Used with a Geometry Helper to keep track of what go built.
diff --git a/src/osgPlugins/txp/trpage_writebuf.cpp b/src/osgPlugins/txp/trpage_writebuf.cpp
index 6e5a728c4..33cf5eb11 100644
--- a/src/osgPlugins/txp/trpage_writebuf.cpp
+++ b/src/osgPlugins/txp/trpage_writebuf.cpp
@@ -29,8 +29,8 @@
      is required.
      */
 
-#include <trpage_io.h>
-#include <trpage_swap.h>
+#include "trpage_io.h"
+#include "trpage_swap.h"
 
 /* **********************
    Memory Write Buffer functions