Moved header files into an openmm subdirectory

platforms/brook/tests/TestBrookPeriodicTorsionForce.cpp

@@ -35,10 +35,10 @@
 
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
-#include "OpenMMContext.h"
-#include "PeriodicTorsionForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/PeriodicTorsionForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include <vector>
 
 #define PI_M               3.141592653589

platforms/brook/tests/TestBrookRBTorsionForce.cpp

@@ -36,10 +36,10 @@
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
 #include "ReferencePlatform.h"
-#include "OpenMMContext.h"
-#include "RBTorsionForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/RBTorsionForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include <vector>
 
 #define PI_M               3.141592653589

platforms/brook/tests/TestBrookVerletIntegrator.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 "VerletIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/CMMotionRemover.h"
+#include "openmm/System.h"
+#include "openmm/VerletIntegrator.h"
 #include "../src/sfmt/SFMT.h"
 
 #define PI_M               3.141592653589

platforms/brook/tests/TstBrookGBSAOBCForce.cpp

@@ -40,10 +40,10 @@
 #include "../../../tests/AssertionUtilities.h"
 #include "BrookPlatform.h"
 #include "ReferencePlatform.h"
-#include "OpenMMContext.h"
-#include "GBSAOBCForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
+#include "openmm/GBSAOBCForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include "../src/sfmt/SFMT.h"
 #include "../../reference/src/SimTKUtilities/SimTKOpenMMRealType.h"
 

platforms/cuda/include/CudaKernelFactory.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "KernelFactory.h"
+#include "openmm/KernelFactory.h"
 
 namespace OpenMM {
 

platforms/cuda/include/CudaPlatform.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "Platform.h"
+#include "openmm/Platform.h"
 #include "CudaStreamFactory.h"
 
 class _gpuContext;

platforms/cuda/include/CudaStreamFactory.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "StreamFactory.h"
+#include "openmm/StreamFactory.h"
 
 namespace OpenMM {
 

platforms/cuda/src/CudaKernelFactory.cpp

@@ -31,7 +31,7 @@
 
 #include "CudaKernelFactory.h"
 #include "CudaKernels.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 
 using namespace OpenMM;
 

platforms/cuda/src/CudaKernels.cpp

@@ -29,13 +29,12 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "OpenMMContext.h"
-
 #include "CudaKernels.h"
 #include "CudaStreamImpl.h"
-#include "LangevinIntegrator.h"
+#include "openmm/LangevinIntegrator.h"
+#include "openmm/OpenMMContext.h"
 #include "ReferencePlatform.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 #include "kernels/gputypes.h"
 #include "kernels/cudaKernels.h"
 #include <cmath>

platforms/cuda/src/CudaKernels.h

@@ -33,9 +33,9 @@
  * -------------------------------------------------------------------------- */
 
 #include "CudaPlatform.h"
-#include "kernels.h"
+#include "openmm/kernels.h"
 #include "kernels/gputypes.h"
-#include "System.h"
+#include "openmm/System.h"
 
 class CudaAndersenThermostat;
 class CudaBrownianDynamics;

platforms/cuda/src/CudaPlatform.cpp

@@ -32,10 +32,10 @@
 #include "CudaPlatform.h"
 #include "CudaKernelFactory.h"
 #include "CudaKernels.h"
-#include "PluginInitializer.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/PluginInitializer.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 #include "kernels/gputypes.h"
-#include "System.h"
+#include "openmm/System.h"
 
 using namespace OpenMM;
 

platforms/cuda/src/CudaStreamFactory.cpp

@@ -32,8 +32,8 @@
 #include "CudaPlatform.h"
 #include "CudaStreamFactory.h"
 #include "CudaStreamImpl.h"
-#include "OpenMMException.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/OpenMMException.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 #include "kernels/gputypes.h"
 
 using namespace OpenMM;

platforms/cuda/src/CudaStreamImpl.h

@@ -32,7 +32,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "StreamImpl.h"
+#include "openmm/StreamImpl.h"
 #include "kernels/gputypes.h"
 
 namespace OpenMM {

platforms/cuda/src/kernels/gpu.cpp

@@ -51,7 +51,7 @@ using namespace std;
 #include "gputypes.h"
 #include "cudaKernels.h"
 #include "hilbert.h"
-#include "OpenMMException.h"
+#include "openmm/OpenMMException.h"
 
 using OpenMM::OpenMMException;
 

platforms/cuda/tests/TestCudaAndersenThermostat.cpp

@@ -34,12 +34,12 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "AndersenThermostat.h"
-#include "OpenMMContext.h"
+#include "openmm/AndersenThermostat.h"
+#include "openmm/OpenMMContext.h"
 #include "CudaPlatform.h"
-#include "NonbondedForce.h"
-#include "System.h"
-#include "VerletIntegrator.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/System.h"
+#include "openmm/VerletIntegrator.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "../src/sfmt/SFMT.h"
 #include <iostream>

platforms/cuda/tests/TestCudaBrownianIntegrator.cpp

@@ -29,7 +29,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
-#include "System.h"
+#include "openmm/System.h"
 
 
 /**
@@ -37,12 +37,12 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "OpenMMContext.h"
+#include "openmm/OpenMMContext.h"
 #include "CudaPlatform.h"
-#include "HarmonicBondForce.h"
-#include "NonbondedForce.h"
-#include "System.h"
-#include "BrownianIntegrator.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/System.h"
+#include "openmm/BrownianIntegrator.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "../src/sfmt/SFMT.h"
 #include <iostream>

platforms/cuda/tests/TestCudaCMMotionRemover.cpp

@@ -34,14 +34,14 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "CMMotionRemover.h"
-#include "OpenMMContext.h"
+#include "openmm/CMMotionRemover.h"
+#include "openmm/OpenMMContext.h"
 #include "CudaPlatform.h"
-#include "HarmonicBondForce.h"
-#include "NonbondedForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
-#include "VerletIntegrator.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
+#include "openmm/VerletIntegrator.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "../src/sfmt/SFMT.h"
 #include <iostream>

platforms/cuda/tests/TestCudaEwald.cpp

@@ -34,15 +34,15 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "OpenMMContext.h"
+#include "openmm/OpenMMContext.h"
 #include "CudaPlatform.h"
 #include "ReferencePlatform.h"
-#include "HarmonicBondForce.h"
-#include "NonbondedForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
-#include "VerletIntegrator.h"
-#include "internal/OpenMMContextImpl.h"
+#include "openmm/HarmonicBondForce.h"
+#include "openmm/NonbondedForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
+#include "openmm/VerletIntegrator.h"
+#include "openmm/internal/OpenMMContextImpl.h"
 #include "kernels/gputypes.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "../src/sfmt/SFMT.h"

platforms/cuda/tests/TestCudaGBSAOBCForce.cpp

@@ -34,15 +34,15 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "OpenMMContext.h"
+#include "openmm/OpenMMContext.h"
 #include "CudaPlatform.h"
 #include "ReferencePlatform.h"
-#include "GBSAOBCForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/GBSAOBCForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include "../src/sfmt/SFMT.h"
-#include "NonbondedForce.h"
+#include "openmm/NonbondedForce.h"
 #include <iostream>
 #include <vector>
 

platforms/cuda/tests/TestCudaHarmonicAngleForce.cpp

@@ -34,11 +34,11 @@
  */
 
 #include "../../../tests/AssertionUtilities.h"
-#include "OpenMMContext.h"
+#include "openmm/OpenMMContext.h"
 #include "CudaPlatform.h"
-#include "HarmonicAngleForce.h"
-#include "System.h"
-#include "LangevinIntegrator.h"
+#include "openmm/HarmonicAngleForce.h"
+#include "openmm/System.h"
+#include "openmm/LangevinIntegrator.h"
 #include "../src/SimTKUtilities/SimTKOpenMMRealType.h"
 #include <iostream>
 #include <vector>