diff --git a/avt/Database/Formats/avtFileFormat.h b/avt/Database/Formats/avtFileFormat.h
index c5315724be00a949c256b0193202cb7beb3b5d5f..88ad2357c1478c26c2a02158d2328d263172dd65 100644
--- a/avt/Database/Formats/avtFileFormat.h
+++ b/avt/Database/Formats/avtFileFormat.h
@@ -44,7 +44,7 @@
 #define AVT_FILE_FORMAT_H
 
 #include <database_exports.h>
-
+#include <visitstream.h>
 // For NULL
 #include <stdlib.h>
 
diff --git a/databases/CEAucd/vtkCEAucdReader.h b/databases/CEAucd/vtkCEAucdReader.h
index 727dc2545d9ab1f299908fd5ee86ce14a77e9212..a953fb05a4770045e1006f23bb961fc707c8c7b1 100644
--- a/databases/CEAucd/vtkCEAucdReader.h
+++ b/databases/CEAucd/vtkCEAucdReader.h
@@ -33,8 +33,8 @@
 #ifndef __vtkCEAucdReader_h
 #define __vtkCEAucdReader_h
 
+#include <visitstream.h>
 #include <vtkUnstructuredGridAlgorithm.h>
-#include <fstream>
 #include <vector>
 
 class vtkIntArray;
diff --git a/databases/CTRL/avtCTRLFileFormat.h b/databases/CTRL/avtCTRLFileFormat.h
index 3fd5348d824231ed2224ac5cf93e8ae02a3bc1bf..5e38f9a7495308687f0004c3ad28b373ccaea8fe 100644
--- a/databases/CTRL/avtCTRLFileFormat.h
+++ b/databases/CTRL/avtCTRLFileFormat.h
@@ -44,7 +44,6 @@
 #define AVT_CTRL_FILE_FORMAT_H
 
 #include <avtSTSDFileFormat.h>
-#include <visitstream.h>
 #include <string>
 #include <vector>
 
diff --git a/databases/Fluent/avtFluentFileFormat.h b/databases/Fluent/avtFluentFileFormat.h
index 81766804b12e6f36927a4f65a040793353836753..57bbc5b1167a699419a7f2893d479bfccb477d5f 100644
--- a/databases/Fluent/avtFluentFileFormat.h
+++ b/databases/Fluent/avtFluentFileFormat.h
@@ -10,7 +10,6 @@
 #include <map>
 
 // Fluent plugin
-#include <visitstream.h>
 #include <stdlib.h>
 #include <sstream>
 
diff --git a/databases/OVERFLOW/avtOVERFLOWFileFormat.h b/databases/OVERFLOW/avtOVERFLOWFileFormat.h
index 23f4043afa3e4450c177b6110c41bca00409e834..9c1771f77fe1a2ba02c5a74e2b9f9b66d9974eb0 100644
--- a/databases/OVERFLOW/avtOVERFLOWFileFormat.h
+++ b/databases/OVERFLOW/avtOVERFLOWFileFormat.h
@@ -47,7 +47,6 @@
 
 #include <vector>
 #include <map>
-#include <visitstream.h>
 
 // ****************************************************************************
 //  Class: avtOVERFLOWFileFormat
diff --git a/databases/Tecplot/avtTecplotFileFormat.h b/databases/Tecplot/avtTecplotFileFormat.h
index d7306cfd9bd570aacd3d7b73216763208b211418..75b61b50685207dc617c3bdb4e38dd56a24435d8 100644
--- a/databases/Tecplot/avtTecplotFileFormat.h
+++ b/databases/Tecplot/avtTecplotFileFormat.h
@@ -47,7 +47,6 @@
 
 #include <vector>
 #include <map>
-#include <visitstream.h>
 #include <ExpressionList.h>
 #include <DBOptionsAttributes.h>
 
diff --git a/databases/VASP/avtOUTCARFileFormat.h b/databases/VASP/avtOUTCARFileFormat.h
index 7b119c10279011de6dd1159f75cc4d08b17f02cf..078b586c2415d8f3b575f0ea1b85874eb5cad6ac 100644
--- a/databases/VASP/avtOUTCARFileFormat.h
+++ b/databases/VASP/avtOUTCARFileFormat.h
@@ -41,7 +41,6 @@
 
 #include <avtFileFormatInterface.h>
 #include <avtMTSDFileFormat.h>
-#include <visitstream.h>
 #include <string>
 #include <vector>