Merge branch 'upstream' into fork

platforms/reference/src/ReferenceKernels.h → platforms/reference/include/ReferenceKernels.h

@@ -34,8 +34,8 @@
 
 #include "ReferencePlatform.h"
 #include "openmm/kernels.h"
-#include "SimTKUtilities/SimTKOpenMMRealType.h"
-#include "SimTKReference/ReferenceNeighborList.h"
+#include "SimTKOpenMMRealType.h"
+#include "ReferenceNeighborList.h"
 #include "lepton/ExpressionProgram.h"
 
 class CpuObc;

platforms/reference/src/SimTKReference/ReferenceLincsAlgorithm.h → platforms/reference/include/ReferenceLincsAlgorithm.h

@@ -25,7 +25,7 @@
 #define __ReferenceLincsAlgorithm_H__
 
 #include "ReferenceConstraintAlgorithm.h"
-#include "../SimTKUtilities/SimTKOpenMMRealType.h"
+#include "SimTKOpenMMRealType.h"
 #include <vector>
 
 // ---------------------------------------------------------------------------------------

platforms/reference/src/SimTKReference/ReferenceMonteCarloBarostat.h → platforms/reference/include/ReferenceMonteCarloBarostat.h

@@ -25,7 +25,7 @@
 #ifndef __ReferenceMonteCarloBarostat_H__
 #define __ReferenceMonteCarloBarostat_H__
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 #include <utility>
 #include <vector>
 

platforms/reference/src/SimTKReference/ReferenceNeighborList.h → platforms/reference/include/ReferenceNeighborList.h

 #ifndef OPENMM_REFERENCE_NEIGHBORLIST_H_
 #define OPENMM_REFERENCE_NEIGHBORLIST_H_
 
-#include "../SimTKUtilities/RealVec.h"
+#include "RealVec.h"
 #include "openmm/internal/windowsExport.h"
 #include <set>
 #include <vector>

platforms/reference/src/SimTKReference/ReferencePairIxn.h → platforms/reference/include/ReferencePairIxn.h

@@ -25,7 +25,7 @@
 #ifndef __ReferencePairIxn_H__
 #define __ReferencePairIxn_H__
 
-#include "../../../../openmmapi/include/openmm/internal/windowsExport.h"
+#include "openmm/internal/windowsExport.h"
 
 // ---------------------------------------------------------------------------------------
 

platforms/reference/src/SimTKReference/ReferenceVirtualSites.h → platforms/reference/include/ReferenceVirtualSites.h

@@ -33,7 +33,7 @@
 #define __ReferenceVirtualSites_H__
 
 #include "openmm/System.h"
-#include "../SimTKUtilities/RealVec.h"
+#include "RealVec.h"
 #include <vector>
 
 class OPENMM_EXPORT ReferenceVirtualSites {

platforms/reference/src/SimTKReference/fftpack.h → platforms/reference/include/fftpack.h

@@ -14,7 +14,7 @@
 * drop a line to lindahl@cbr.su.se and let me know about it!
 */
 
-#include "../SimTKUtilities/SimTKOpenMMCommon.h"
+#include "SimTKOpenMMCommon.h"
 
 #ifndef _FFTPACK_H_
 #define _FFTPACK_H_