Moved header files into an openmm subdirectory

platforms/brook/src/BrookLangevinDynamics.cpp

@@ -32,7 +32,7 @@
 #include <sstream>
 #include "BrookLangevinDynamics.h"
 #include "BrookPlatform.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "BrookStreamImpl.h"
 #include "kernels/kshakeh.h"
 #include "kernels/kupdatesd.h"

platforms/brook/src/BrookNonBonded.cpp

@@ -33,7 +33,7 @@
 #include "BrookNonBonded.h"
 #include "BrookPlatform.h"
 #include "BrookStreamFactory.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 //#include "kernels/invmap.h"
 #include "kernels/kforce.h"
 

platforms/brook/src/BrookPlatform.cpp

@@ -32,9 +32,9 @@
 #include "BrookPlatform.h"
 #include "BrookKernelFactory.h"
 #include "OpenMMBrookInterface.h"
-#include "internal/OpenMMContextImpl.h"
-#include "OpenMMException.h"
-#include "kernels.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/kernels.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include <brook/brook.hpp>
 #include <stdlib.h>

platforms/brook/src/BrookRandomNumberGenerator.cpp

@@ -32,7 +32,7 @@
 #include <sstream>
 #include "BrookRandomNumberGenerator.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMUtilities.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "kernels/kupdatesd.h"
 
 using namespace OpenMM;

platforms/brook/src/BrookRemoveCMMotionKernel.cpp

@@ -29,8 +29,8 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "internal/OpenMMContextImpl.h"
-#include "System.h"
+#include "openmm/internal/OpenMMContextImpl.h"
+#include "openmm/System.h"
 #include "BrookRemoveCMMotionKernel.h"
 #include "BrookStreamInternal.h"
 

platforms/brook/src/BrookRemoveCMMotionKernel.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "kernels.h"
+#include "openmm/kernels.h"
 #include "OpenMMBrookInterface.h"
 #include "BrookVelocityCenterOfMassRemoval.h"
 

platforms/brook/src/BrookShakeAlgorithm.h

@@ -39,7 +39,7 @@
 #include "BrookFloatStreamInternal.h"
 #include "BrookPlatform.h"
 #include "BrookCommon.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 
 namespace OpenMM {
 

platforms/brook/src/BrookStreamFactory.cpp

@@ -30,10 +30,10 @@
  * -------------------------------------------------------------------------- */
 
 #include <sstream>
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "BrookStreamFactory.h"
 #include "BrookStreamImpl.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 #include "OpenMMBrookInterface.h"
 
 using namespace OpenMM;

platforms/brook/src/BrookStreamImpl.cpp

@@ -30,7 +30,7 @@
  * -------------------------------------------------------------------------- */
 
 #include <sstream>
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "BrookStreamImpl.h"
 
 using namespace OpenMM;

platforms/brook/src/BrookStreamImpl.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "StreamImpl.h"
+#include "openmm/StreamImpl.h"
 #include "BrookFloatStreamInternal.h"
 #include "BrookIntStreamInternal.h"
 

platforms/brook/src/BrookStreamInternal.cpp

@@ -30,7 +30,7 @@
  * -------------------------------------------------------------------------- */
 
 #include <sstream>
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "BrookStreamInternal.h"
 
 #ifdef _WIN32

platforms/brook/src/BrookVelocityCenterOfMassRemoval.cpp

@@ -32,7 +32,7 @@
 #include <sstream>
 #include "BrookVelocityCenterOfMassRemoval.h"
 #include "BrookPlatform.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "BrookStreamImpl.h"
 #include "kernels/kcom.h"
 

platforms/brook/src/BrookVerletDynamics.cpp

@@ -32,7 +32,7 @@
 #include <sstream>
 #include "BrookVerletDynamics.h"
 #include "BrookPlatform.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include "BrookStreamImpl.h"
 #include "kernels/kshakeh.h"
 #include "kernels/kupdatemd.h"

platforms/brook/src/OpenMMBrookInterface.cpp

@@ -31,12 +31,12 @@
 
 #include <cmath>
 #include <limits>
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 #include <sstream>
 
-#include "LangevinIntegrator.h"
+#include "openmm/LangevinIntegrator.h"
 #include "ReferencePlatform.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 
 #include "BrookStreamImpl.h"
 #include "OpenMMBrookInterface.h"

platforms/brook/src/OpenMMBrookInterface.h

@@ -32,15 +32,15 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "kernels.h"
+#include "openmm/kernels.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "BrookBondParameters.h"
 #include "BrookBonded.h"
 #include "BrookNonBonded.h"
 #include "BrookGbsa.h"
-#include "NonbondedForce.h"
-#include "OpenMMContext.h"
-#include "System.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/System.h"
 
 namespace OpenMM {
 

platforms/brook/tests/TestBrookAngleBondForce.cpp

@@ -37,10 +37,10 @@
 
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
-#include "OpenMMContext.h"
-#include "HarmonicAngleForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/HarmonicAngleForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 
 #define PI_M               3.141592653589
 

platforms/brook/tests/TestBrookCMMotionRemover.cpp

@@ -37,12 +37,12 @@
 
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
-#include "OpenMMContext.h"
-#include "HarmonicBondForce.h"
-#include "NonbondedForce.h"
-#include "System.h"
-#include "VerletIntegrator.h"
-#include "CMMotionRemover.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/System.h"
+#include "openmm/VerletIntegrator.h"
+#include "openmm/CMMotionRemover.h"
 
 #include "../src/sfmt/SFMT.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"

platforms/brook/tests/TestBrookHarmonicBondForce.cpp

@@ -35,10 +35,10 @@
 
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
-#include "OpenMMContext.h"
-#include "HarmonicBondForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include <vector>
 
 using namespace OpenMM;

platforms/brook/tests/TestBrookLangevinIntegrator.cpp

@@ -38,12 +38,12 @@
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
 #include "ReferencePlatform.h"
-#include "OpenMMContext.h"
-#include "HarmonicBondForce.h"
-#include "NonBondedForce.h"
-#include "CMMotionRemover.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/NonBondedForce.h"
+#include "openmm/CMMotionRemover.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include "../src/sfmt/SFMT.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"
 

platforms/brook/tests/TestBrookNonbondedForce.cpp

@@ -37,11 +37,11 @@
 
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
-#include "OpenMMContext.h"
-#include "NonbondedForce.h"
-#include "HarmonicBondForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 
 #define PI_M               3.141592653589