Includes: quotes by angle brackets (#61)

.github/issue_template.md

@@ -39,5 +39,5 @@ You might select multiple topics, delete the rest:
 **GPU model** (`nvidia-smi`):
 **Caffe version**: Default from OpenPose or custom version.
 **OpenCV version**: installed with `apt-get install libopencv-dev` or OpenCV 2.X or OpenCV 3.X.
-Generation mode (only for Ubuntu): Makefile + Makefile.config or CMake.
+Generation mode (only for Ubuntu): Makefile + Makefile.config (default) or CMake.
 Compiler (`gcc --version` on Ubuntu):

3rdparty/windows/getCaffe3rdparty.bat

@@ -6,8 +6,8 @@ SET WGET_EXE=wget\wget.exe
 
 :: Download temporary zip
 echo ----- Downloading Caffe -----
-SET CAFEE_FOLDER=caffe\
-SET ZIP_NAME=caffe3rdparty_2017_07_11.zip
+SET CAFEE_FOLDER=caffe3rdparty\
+SET ZIP_NAME=caffe3rdparty_2017_07_14.zip
 SET ZIP_FULL_PATH=%CAFEE_FOLDER%%ZIP_NAME%
 %WGET_EXE% -c http://posefs1.perception.cs.cmu.edu/OpenPose/3rdparty/windows/%ZIP_NAME% -P %CAFEE_FOLDER%
 echo:

doc/release_notes.md

@@ -89,6 +89,7 @@ OpenPose Library - Release Notes
     2. OpenPose is now completely portable across Windows 10 computers (with Nvidia graphic card).
     3. Added OpenPose 1.0.1 portable demo.
     4. Removed Python and some unnecessary boost dependencies on the VS project.
+    5. Replaced all double quotes by angle brackets in include statements (issue #61).
 2. Main bugs fixed:
     1. Pycaffe can now be imported from Python.
     2. Fixed `Tutorial/Wrapper` VS linking errors.

include/openpose/core/common.hpp

 #ifndef OPENPOSE_CORE_COMMON_HPP
 #define OPENPOSE_CORE_COMMON_HPP
 
-#include "rectangle.hpp"
-#include "array.hpp"
-#include "macros.hpp"
-#include "point.hpp"
+// Std library most used classes
+#include <array>
+#include <memory> // std::shared_ptr
+#include <string>
+#include <vector>
+// OpenPose most used classes
+#include <openpose/core/array.hpp>
+#include <openpose/core/point.hpp>
+#include <openpose/core/rectangle.hpp>
+#include <openpose/utilities/errorAndLog.hpp>
+#include <openpose/utilities/profiler.hpp>
+// Macros at the end, otherwise circular dependency with array, point & rectangle
+#include <openpose/core/macros.hpp>
 
 #endif // OPENPOSE_CORE_COMMON_HPP

include/openpose/core/cvMatToOpInput.hpp

@@ -2,9 +2,8 @@
 #define OPENPOSE_CORE_CV_MAT_TO_OP_INPUT_HPP
 
 #include <utility> // std::pair
-#include <vector>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/cvMatToOpOutput.hpp

 #ifndef OPENPOSE_CORE_CV_MAT_TO_OP_OUTPUT_HPP
 #define OPENPOSE_CORE_CV_MAT_TO_OP_OUTPUT_HPP
 
-#include <vector>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/datum.hpp

 #ifndef OPENPOSE_CORE_DATUM_HPP
 #define OPENPOSE_CORE_DATUM_HPP
 
-#include <array>
-#include <memory> // std::shared_ptr
-#include <string>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/headers.hpp

@@ -2,27 +2,27 @@
 #define OPENPOSE_CORE_HEADERS_HPP
 
 // core module
-#include "array.hpp"
-#include "common.hpp"
-#include "cvMatToOpInput.hpp"
-#include "cvMatToOpOutput.hpp"
-#include "datum.hpp"
-#include "enumClasses.hpp"
-#include "keypointScaler.hpp"
-#include "macros.hpp"
-#include "net.hpp"
-#include "netCaffe.hpp"
-#include "nmsBase.hpp"
-#include "nmsCaffe.hpp"
-#include "opOutputToCvMat.hpp"
-#include "point.hpp"
-#include "rectangle.hpp"
-#include "renderer.hpp"
-#include "resizeAndMergeBase.hpp"
-#include "resizeAndMergeCaffe.hpp"
-#include "wCvMatToOpInput.hpp"
-#include "wCvMatToOpOutput.hpp"
-#include "wKeypointScaler.hpp"
-#include "wOpOutputToCvMat.hpp"
+#include <openpose/core/array.hpp>
+#include <openpose/core/common.hpp>
+#include <openpose/core/cvMatToOpInput.hpp>
+#include <openpose/core/cvMatToOpOutput.hpp>
+#include <openpose/core/datum.hpp>
+#include <openpose/core/enumClasses.hpp>
+#include <openpose/core/keypointScaler.hpp>
+#include <openpose/core/macros.hpp>
+#include <openpose/core/net.hpp>
+#include <openpose/core/netCaffe.hpp>
+#include <openpose/core/nmsBase.hpp>
+#include <openpose/core/nmsCaffe.hpp>
+#include <openpose/core/opOutputToCvMat.hpp>
+#include <openpose/core/point.hpp>
+#include <openpose/core/rectangle.hpp>
+#include <openpose/core/renderer.hpp>
+#include <openpose/core/resizeAndMergeBase.hpp>
+#include <openpose/core/resizeAndMergeCaffe.hpp>
+#include <openpose/core/wCvMatToOpInput.hpp>
+#include <openpose/core/wCvMatToOpOutput.hpp>
+#include <openpose/core/wKeypointScaler.hpp>
+#include <openpose/core/wOpOutputToCvMat.hpp>
 
 #endif // OPENPOSE_CORE_HEADERS_HPP

include/openpose/core/keypointScaler.hpp

 #ifndef OPENPOSE_CORE_KEYPOINT_SCALER_HPP
 #define OPENPOSE_CORE_KEYPOINT_SCALER_HPP
 
-#include <vector>
-#include "common.hpp"
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/core/enumClasses.hpp>
 
 namespace op
 {

include/openpose/core/macros.hpp

-#ifndef OPENPOSE_UTILITIES_MACROS_HPP
-#define OPENPOSE_UTILITIES_MACROS_HPP
+#ifndef OPENPOSE_CORE_MACROS_HPP
+#define OPENPOSE_CORE_MACROS_HPP
 
 #ifndef _WIN32
     #define OP_API
@@ -47,6 +47,5 @@
 #include <openpose/core/datum.hpp>
 #include <openpose/core/point.hpp>
 #include <openpose/core/rectangle.hpp>
-#include <openpose/core/macros.hpp>
 
-#endif // OPENPOSE_UTILITIES_MACROS_HPP
+#endif // OPENPOSE_CORE_MACROS_HPP

include/openpose/core/maximumBase.hpp

 #ifndef OPENPOSE_CORE_MAXIMUM_BASE_HPP
 #define OPENPOSE_CORE_MAXIMUM_BASE_HPP
 
-#include <array>
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/maximumCaffe.hpp

@@ -2,9 +2,8 @@
 #ifndef OPENPOSE_CORE_MAXIMUM_CAFFE_HPP
 #define OPENPOSE_CORE_MAXIMUM_CAFFE_HPP
 
-#include <array>
 #include <caffe/blob.hpp>
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/net.hpp

 #ifndef OPENPOSE_CORE_NET_HPP
 #define OPENPOSE_CORE_NET_HPP
 
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/netCaffe.hpp

@@ -2,12 +2,9 @@
 #ifndef OPENPOSE_CORE_NET_CAFFE_HPP
 #define OPENPOSE_CORE_NET_CAFFE_HPP
 
-#include <array>
-#include <memory> // std::shared_ptr
-#include <string>
 #include <caffe/net.hpp>
-#include "common.hpp"
-#include "net.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/core/net.hpp>
 
 namespace op
 {

include/openpose/core/nmsBase.hpp

 #ifndef OPENPOSE_CORE_NMS_BASE_HPP
 #define OPENPOSE_CORE_NMS_BASE_HPP
 
-#include <array>
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/nmsCaffe.hpp

@@ -2,9 +2,8 @@
 #ifndef OPENPOSE_CORE_NMS_CAFFE_HPP
 #define OPENPOSE_CORE_NMS_CAFFE_HPP
 
-#include <array>
 #include <caffe/blob.hpp>
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/opOutputToCvMat.hpp

@@ -2,7 +2,7 @@
 #define OPENPOSE_CORE_OP_OUTPUT_TO_CV_MAT_HPP
 
 #include <opencv2/core/core.hpp> // cv::Mat
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/rectangle.hpp

@@ -2,7 +2,7 @@
 #define OPENPOSE_CORE_RECTANGLE_HPP
 
 #include <string>
-#include "point.hpp"
+#include <openpose/core/point.hpp>
 
 namespace op
 {

include/openpose/core/renderer.hpp

@@ -3,8 +3,7 @@
 
 #include <atomic>
 #include <tuple>
-#include <memory> // std::shared_ptr
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/resizeAndMergeBase.hpp

 #ifndef OPENPOSE_CORE_RESIZE_AND_MERGE_BASE_HPP
 #define OPENPOSE_CORE_RESIZE_AND_MERGE_BASE_HPP
 
-#include <array>
-#include <vector>
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/resizeAndMergeCaffe.hpp

@@ -2,10 +2,8 @@
 #ifndef OPENPOSE_CORE_RESIZE_AND_MERGE_CAFFE_HPP
 #define OPENPOSE_CORE_RESIZE_AND_MERGE_CAFFE_HPP
 
-#include <array>
-#include <vector>
 #include <caffe/blob.hpp>
-#include "common.hpp"
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/core/wCvMatToOpInput.hpp

 #ifndef OPENPOSE_CORE_W_CV_MAT_TO_OP_INPUT_HPP
 #define OPENPOSE_CORE_W_CV_MAT_TO_OP_INPUT_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/core/cvMatToOpInput.hpp>
 #include <openpose/thread/worker.hpp>
-#include "cvMatToOpInput.hpp"
 
 namespace op
 {
@@ -29,11 +29,8 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/openCv.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/core/wCvMatToOpOutput.hpp

 #ifndef OPENPOSE_CORE_W_CV_MAT_TO_OP_OUTPUT_HPP
 #define OPENPOSE_CORE_W_CV_MAT_TO_OP_OUTPUT_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/core/cvMatToOpOutput.hpp>
 #include <openpose/thread/worker.hpp>
-#include "cvMatToOpOutput.hpp"
 
 namespace op
 {
@@ -29,11 +29,8 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/openCv.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/core/wKeypointScaler.hpp

 #ifndef OPENPOSE_CORE_W_KEYPOINT_SCALER_HPP
 #define OPENPOSE_CORE_W_KEYPOINT_SCALER_HPP
 
+#include <openpose/core/common.hpp>
+#include <openpose/core/keypointScaler.hpp>
 #include <openpose/thread/worker.hpp>
-#include "keypointScaler.hpp"
 
 namespace op
 {
@@ -26,10 +27,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/core/wOpOutputToCvMat.hpp

 #ifndef OPENPOSE_CORE_W_OP_OUTPUT_TO_CV_MAT_HPP
 #define OPENPOSE_CORE_W_OP_OUTPUT_TO_CV_MAT_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/core/opOutputToCvMat.hpp>
 #include <openpose/thread/worker.hpp>
-#include "opOutputToCvMat.hpp"
 
 namespace op
 {
@@ -29,11 +29,7 @@ namespace op
 
 
 // Implementation
-#include <vector>
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/experimental/headers.hpp

@@ -2,6 +2,6 @@
 #define OPENPOSE_EXPERIMENTAL_HEADERS_HPP
 
 // producer module
-// #include "producer/headers.hpp"
+// #include <openpose/experimental/producer/headers.hpp>
 
 #endif // OPENPOSE_EXPERIMENTAL_HEADERS_HPP

include/openpose/experimental/producer/headers.hpp

@@ -2,6 +2,6 @@
 #define OPENPOSE_EXPERIMENTAL_PRODUCER_HEADERS_HPP
 
 // producer module
-// #include "wPoseLoader.hpp"
+// #include <openpose/experimental/producer/wPoseLoader.hpp>
 
 #endif // OPENPOSE_EXPERIMENTAL_PRODUCER_HEADERS_HPP

include/openpose/face/faceDetector.hpp

 #ifndef OPENPOSE_FACE_FACE_DETECTOR_HPP
 #define OPENPOSE_FACE_FACE_DETECTOR_HPP
 
-#include <vector>
-#include <openpose/core/array.hpp>
-#include <openpose/core/rectangle.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/pose/enumClasses.hpp>
-#include <openpose/core/macros.hpp>
 
 namespace op
 {

include/openpose/face/faceExtractor.hpp

 #ifndef OPENPOSE_FACE_FACE_EXTRACTOR_HPP
 #define OPENPOSE_FACE_FACE_EXTRACTOR_HPP
 
-#include <array>
 #include <atomic>
-#include <memory> // std::shared_ptr
 #include <thread>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/array.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/maximumCaffe.hpp>
 #include <openpose/core/net.hpp>
-#include <openpose/core/rectangle.hpp>
 #include <openpose/core/resizeAndMergeCaffe.hpp>
-#include <openpose/core/macros.hpp>
 
 namespace op
 {

include/openpose/face/faceRenderer.hpp

 #ifndef OPENPOSE_FACE_FACE_RENDERER_HPP
 #define OPENPOSE_FACE_FACE_RENDERER_HPP
 
-#include <openpose/core/array.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/enumClasses.hpp>
-#include <openpose/core/point.hpp>
 #include <openpose/core/renderer.hpp>
+#include <openpose/face/faceParameters.hpp>
 #include <openpose/thread/worker.hpp>
-#include <openpose/core/macros.hpp>
-#include "faceParameters.hpp"
 
 namespace op
 {

include/openpose/face/headers.hpp

@@ -2,13 +2,13 @@
 #define OPENPOSE_FACE_HEADERS_HPP
 
 // face module
-#include "faceDetector.hpp"
-#include "faceExtractor.hpp"
-#include "faceParameters.hpp"
-#include "faceRenderer.hpp"
-#include "renderFace.hpp"
-#include "wFaceDetector.hpp"
-#include "wFaceExtractor.hpp"
-#include "wFaceRenderer.hpp"
+#include <openpose/face/faceDetector.hpp>
+#include <openpose/face/faceExtractor.hpp>
+#include <openpose/face/faceParameters.hpp>
+#include <openpose/face/faceRenderer.hpp>
+#include <openpose/face/renderFace.hpp>
+#include <openpose/face/wFaceDetector.hpp>
+#include <openpose/face/wFaceExtractor.hpp>
+#include <openpose/face/wFaceRenderer.hpp>
 
 #endif // OPENPOSE_FACE_HEADERS_HPP

include/openpose/face/renderFace.hpp

 #ifndef OPENPOSE_FACE_RENDER_FACE_HPP
 #define OPENPOSE_FACE_RENDER_FACE_HPP
 
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "faceParameters.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/face/faceParameters.hpp>
 
 namespace op
 {

include/openpose/face/wFaceDetector.hpp

 #ifndef OPENPOSE_FACE_W_FACE_EXTRACTOR_HPP
 #define OPENPOSE_FACE_W_FACE_EXTRACTOR_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/face/faceRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "faceRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/face/wFaceExtractor.hpp

 #ifndef OPENPOSE_FACE_W_FACE_DETECTOR_HPP
 #define OPENPOSE_FACE_W_FACE_DETECTOR_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/face/faceRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "faceRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/face/wFaceRenderer.hpp

 #ifndef OPENPOSE_FACE_W_FACE_RENDERER_HPP
 #define OPENPOSE_FACE_W_FACE_RENDERER_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/face/faceRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "faceRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/cocoJsonSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_POSE_JSON_COCO_SAVER_HPP
 #define OPENPOSE_FILESTREAM_POSE_JSON_COCO_SAVER_HPP
 
-#include <string>
-#include <openpose/core/array.hpp>
-#include <openpose/core/macros.hpp>
-#include "jsonOfstream.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/jsonOfstream.hpp>
 
 namespace op
 {

include/openpose/filestream/fileSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_DATA_SAVER_HPP
 #define OPENPOSE_FILESTREAM_DATA_SAVER_HPP
 
-#include <string>
-#include <openpose/core/macros.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/utilities/string.hpp>
 
 namespace op

include/openpose/filestream/fileStream.hpp

 #ifndef OPENPOSE_FILESTREAM_FILE_STREAM_HPP
 #define OPENPOSE_FILESTREAM_FILE_STREAM_HPP
 
-#include <array>
-#include <string>
-#include <vector>
 #include <opencv2/core/core.hpp> // cv::Mat
 #include <opencv2/highgui/highgui.hpp> // CV_LOAD_IMAGE_ANYDEPTH, CV_IMWRITE_PNG_COMPRESSION
-#include <openpose/core/array.hpp>
-#include <openpose/core/rectangle.hpp>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/enumClasses.hpp>
 
 namespace op
 {

include/openpose/filestream/headers.hpp

@@ -2,23 +2,23 @@
 #define OPENPOSE_FILESTREAM_HEADERS_HPP
 
 // fileStream module
-#include "cocoJsonSaver.hpp"
-#include "enumClasses.hpp"
-#include "fileSaver.hpp"
-#include "fileStream.hpp"
-#include "heatMapSaver.hpp"
-#include "imageSaver.hpp"
-#include "jsonOfstream.hpp"
-#include "keypointJsonSaver.hpp"
-#include "keypointSaver.hpp"
-#include "videoSaver.hpp"
-#include "wCocoJsonSaver.hpp"
-#include "wFaceSaver.hpp"
-#include "wHandSaver.hpp"
-#include "wImageSaver.hpp"
-#include "wHeatMapSaver.hpp"
-#include "wKeypointJsonSaver.hpp"
-#include "wPoseSaver.hpp"
-#include "wVideoSaver.hpp"
+#include <openpose/fileStream/cocoJsonSaver.hpp>
+#include <openpose/fileStream/enumClasses.hpp>
+#include <openpose/fileStream/fileSaver.hpp>
+#include <openpose/fileStream/fileStream.hpp>
+#include <openpose/fileStream/heatMapSaver.hpp>
+#include <openpose/fileStream/imageSaver.hpp>
+#include <openpose/fileStream/jsonOfstream.hpp>
+#include <openpose/fileStream/keypointJsonSaver.hpp>
+#include <openpose/fileStream/keypointSaver.hpp>
+#include <openpose/fileStream/videoSaver.hpp>
+#include <openpose/fileStream/wCocoJsonSaver.hpp>
+#include <openpose/fileStream/wFaceSaver.hpp>
+#include <openpose/fileStream/wHandSaver.hpp>
+#include <openpose/fileStream/wImageSaver.hpp>
+#include <openpose/fileStream/wHeatMapSaver.hpp>
+#include <openpose/fileStream/wKeypointJsonSaver.hpp>
+#include <openpose/fileStream/wPoseSaver.hpp>
+#include <openpose/fileStream/wVideoSaver.hpp>
 
 #endif // OPENPOSE_FILESTREAM_HEADERS_HPP

include/openpose/filestream/heatMapSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_HEAT_MAP_SAVER_HPP
 #define OPENPOSE_FILESTREAM_HEAT_MAP_SAVER_HPP
 
-#include <string>
-#include <vector>
-#include <openpose/core/macros.hpp>
-#include "fileSaver.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/fileSaver.hpp>
 
 namespace op
 {

include/openpose/filestream/imageSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_IMAGE_SAVER_HPP
 #define OPENPOSE_FILESTREAM_IMAGE_SAVER_HPP
 
-#include <string>
-#include <vector>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/macros.hpp>
-#include "fileSaver.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/fileSaver.hpp>
 
 namespace op
 {

include/openpose/filestream/jsonOfstream.hpp

@@ -2,8 +2,7 @@
 #define OPENPOSE_FILESTREAM_JSON_OFSTREAM_HPP
 
 #include <fstream> // std::ofstream
-#include <string>
-#include <openpose/core/macros.hpp>
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/filestream/keypointJsonSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_KEYPOINT_JSON_SAVER_HPP
 #define OPENPOSE_FILESTREAM_KEYPOINT_JSON_SAVER_HPP
 
-#include <string>
-#include <vector>
-#include <openpose/core/array.hpp>
-#include <openpose/core/macros.hpp>
-#include "fileSaver.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/fileSaver.hpp>
 
 namespace op
 {

include/openpose/filestream/keypointSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_KEYPOINT_SAVER_HPP
 #define OPENPOSE_FILESTREAM_KEYPOINT_SAVER_HPP
 
-#include <openpose/core/array.hpp>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
-#include "fileSaver.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/enumClasses.hpp>
+#include <openpose/fileStream/fileSaver.hpp>
 
 namespace op
 {

include/openpose/filestream/videoSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_VIDEO_SAVER_HPP
 #define OPENPOSE_FILESTREAM_VIDEO_SAVER_HPP
 
-#include <vector>
 #include <opencv2/core/core.hpp> // cv::Mat
 #include <opencv2/highgui/highgui.hpp> // cv::VideoWriter
-#include <openpose/core/macros.hpp>
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/filestream/wCocoJsonSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_COCO_JSON_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_COCO_JSON_SAVER_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
 #include <openpose/filestream/cocoJsonSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
 
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wFaceSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_FACE_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_FACE_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/enumClasses.hpp>
+#include <openpose/fileStream/keypointSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "enumClasses.hpp"
-#include "keypointSaver.hpp"
 
 namespace op
 {
@@ -31,10 +30,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wHandSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_HAND_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_HAND_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/enumClasses.hpp>
+#include <openpose/fileStream/keypointSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "enumClasses.hpp"
-#include "keypointSaver.hpp"
 
 namespace op
 {
@@ -31,10 +30,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wHeatMapSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_HEAT_MAP_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_HEAT_MAP_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/heatMapSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "heatMapSaver.hpp"
 
 namespace op
 {
@@ -30,11 +29,7 @@ namespace op
 
 
 // Implementation
-#include <vector>
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wImageSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_IMAGE_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_IMAGE_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/imageSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "imageSaver.hpp"
 
 namespace op
 {
@@ -30,11 +29,7 @@ namespace op
 
 
 // Implementation
-#include <vector>
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wKeypointJsonSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_KEYPOINT_JSON_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_KEYPOINT_JSON_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/keypointJsonSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "keypointJsonSaver.hpp"
 
 namespace op
 {
@@ -30,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wPoseSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_POSE_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_POSE_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/enumClasses.hpp>
+#include <openpose/fileStream/keypointSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "enumClasses.hpp"
-#include "keypointSaver.hpp"
 
 namespace op
 {
@@ -31,10 +30,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/filestream/wVideoSaver.hpp

 #ifndef OPENPOSE_FILESTREAM_W_VIDEO_SAVER_HPP
 #define OPENPOSE_FILESTREAM_W_VIDEO_SAVER_HPP
 
-#include <memory> // std::shared_ptr
-#include <string>
-#include <vector>
+#include <openpose/core/common.hpp>
+#include <openpose/fileStream/videoSaver.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "videoSaver.hpp"
 
 namespace op
 {
@@ -31,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/gui/frameDisplayer.hpp

 #ifndef OPENPOSE_GUI_FRAMES_DISPLAY_HPP
 #define OPENPOSE_GUI_FRAMES_DISPLAY_HPP
 
-#include <string>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/gui/enumClasses.hpp>
 
 namespace op
 {

include/openpose/gui/gui.hpp

@@ -2,14 +2,12 @@
 #define OPENPOSE_GUI_GUI_HPP
 
 #include <atomic>
-#include <memory> // std::shared_ptr
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/point.hpp>
+#include <openpose/core/common.hpp>
+#include <openpose/gui/enumClasses.hpp>
+#include <openpose/gui/frameDisplayer.hpp>
 #include <openpose/pose/poseExtractor.hpp>
 #include <openpose/pose/poseRenderer.hpp>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
-#include "frameDisplayer.hpp"
 
 namespace op
 {

include/openpose/gui/guiInfoAdder.hpp

@@ -3,9 +3,7 @@
 
 #include <queue>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
+#include <openpose/core/common.hpp>
 
 namespace op
 {

include/openpose/gui/headers.hpp

@@ -2,11 +2,11 @@
 #define OPENPOSE_GUI_HEADERS_HPP
 
 // gui module
-#include "enumClasses.hpp"
-#include "frameDisplayer.hpp"
-#include "gui.hpp"
-#include "guiInfoAdder.hpp"
-#include "wGui.hpp"
-#include "wGuiInfoAdder.hpp"
+#include <openpose/gui/enumClasses.hpp>
+#include <openpose/gui/frameDisplayer.hpp>
+#include <openpose/gui/gui.hpp>
+#include <openpose/gui/guiInfoAdder.hpp>
+#include <openpose/gui/wGui.hpp>
+#include <openpose/gui/wGuiInfoAdder.hpp>
 
 #endif // OPENPOSE_GUI_HEADERS_HPP

include/openpose/gui/wGui.hpp

 #ifndef OPENPOSE_GUI_W_GUI_HPP
 #define OPENPOSE_GUI_W_GUI_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/gui/enumClasses.hpp>
+#include <openpose/gui/gui.hpp>
 #include <openpose/thread/workerConsumer.hpp>
-#include "enumClasses.hpp"
-#include "gui.hpp"
 
 namespace op
 {
@@ -30,10 +30,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/gui/wGuiInfoAdder.hpp

 #ifndef OPENPOSE_GUI_W_ADD_GUI_INFO_HPP
 #define OPENPOSE_GUI_W_ADD_GUI_INFO_HPP
 
-#include "guiInfoAdder.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/gui/guiInfoAdder.hpp>
 #include <openpose/thread/worker.hpp>
 
 namespace op
@@ -28,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/hand/handDetector.hpp

 #ifndef OPENPOSE_HAND_HAND_DETECTOR_HPP
 #define OPENPOSE_HAND_HAND_DETECTOR_HPP
 
-#include <array>
 #include <mutex>
-#include <vector>
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include <openpose/core/rectangle.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/pose/enumClasses.hpp>
-#include <openpose/core/macros.hpp>
 
 namespace op
 {

include/openpose/hand/handDetectorFromTxt.hpp

 #ifndef OPENPOSE_HAND_HAND_DETECTOR_FROM_TXT_HPP
 #define OPENPOSE_HAND_HAND_DETECTOR_FROM_TXT_HPP
 
-#include <array>
-#include <string>
-#include <vector>
-#include <openpose/core/array.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/pose/enumClasses.hpp>
-#include <openpose/core/macros.hpp>
 
 namespace op
 {

include/openpose/hand/handExtractor.hpp

 #ifndef OPENPOSE_HAND_HAND_EXTRACTOR_HPP
 #define OPENPOSE_HAND_HAND_EXTRACTOR_HPP
 
-#include <array>
 #include <atomic>
-#include <memory> // std::shared_ptr
 #include <thread>
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/maximumCaffe.hpp>
 #include <openpose/core/net.hpp>
-#include <openpose/core/rectangle.hpp>
 #include <openpose/core/resizeAndMergeCaffe.hpp>
-#include <openpose/core/macros.hpp>
 
 namespace op
 {

include/openpose/hand/handRenderer.hpp

 #ifndef OPENPOSE_HAND_HAND_RENDERER_HPP
 #define OPENPOSE_HAND_HAND_RENDERER_HPP
 
-#include <array>
-#include <openpose/core/array.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/enumClasses.hpp>
-#include <openpose/core/point.hpp>
 #include <openpose/core/renderer.hpp>
+#include <openpose/hand/handParameters.hpp>
 #include <openpose/thread/worker.hpp>
-#include <openpose/core/macros.hpp>
-#include "handParameters.hpp"
 
 namespace op
 {

include/openpose/hand/headers.hpp

@@ -2,17 +2,17 @@
 #define OPENPOSE_HAND_HEADERS_HPP
 
 // hand module
-#include "handDetector.hpp"
-#include "handDetectorFromTxt.hpp"
-#include "handExtractor.hpp"
-#include "handParameters.hpp"
-#include "handRenderer.hpp"
-#include "renderHand.hpp"
-#include "wHandDetector.hpp"
-#include "wHandDetectorFromTxt.hpp"
-#include "wHandDetectorTracking.hpp"
-#include "wHandDetectorUpdate.hpp"
-#include "wHandExtractor.hpp"
-#include "wHandRenderer.hpp"
+#include <openpose/hand/handDetector.hpp>
+#include <openpose/hand/handDetectorFromTxt.hpp>
+#include <openpose/hand/handExtractor.hpp>
+#include <openpose/hand/handParameters.hpp>
+#include <openpose/hand/handRenderer.hpp>
+#include <openpose/hand/renderHand.hpp>
+#include <openpose/hand/wHandDetector.hpp>
+#include <openpose/hand/wHandDetectorFromTxt.hpp>
+#include <openpose/hand/wHandDetectorTracking.hpp>
+#include <openpose/hand/wHandDetectorUpdate.hpp>
+#include <openpose/hand/wHandExtractor.hpp>
+#include <openpose/hand/wHandRenderer.hpp>
 
 #endif // OPENPOSE_HAND_HEADERS_HPP

include/openpose/hand/renderHand.hpp

 #ifndef OPENPOSE_HAND_GPU_HAND_RENDER_HPP
 #define OPENPOSE_HAND_GPU_HAND_RENDER_HPP
 
-#include <array>
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "handParameters.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handParameters.hpp>
 
 namespace op
 {

include/openpose/hand/wHandDetector.hpp

 #ifndef OPENPOSE_HAND_W_HAND_DETECTOR_HPP
 #define OPENPOSE_HAND_W_HAND_DETECTOR_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handDetector.hpp>
 #include <openpose/thread/worker.hpp>
-#include "handDetector.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/hand/wHandDetectorFromTxt.hpp

 #ifndef OPENPOSE_HAND_W_HAND_DETECTOR_FROM_JSON_HPP
 #define OPENPOSE_HAND_W_HAND_DETECTOR_FROM_JSON_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handDetectorFromTxt.hpp>
 #include <openpose/thread/worker.hpp>
-#include "handDetectorFromTxt.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/hand/wHandDetectorTracking.hpp

 #ifndef OPENPOSE_HAND_W_HAND_DETECTOR_TRACKING_HPP
 #define OPENPOSE_HAND_W_HAND_DETECTOR_TRACKING_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "handRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/hand/wHandDetectorUpdate.hpp

 #ifndef OPENPOSE_HAND_W_HAND_DETECTOR_UPDATE_HPP
 #define OPENPOSE_HAND_W_HAND_DETECTOR_UPDATE_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "handRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/hand/wHandExtractor.hpp

 #ifndef OPENPOSE_HAND_W_HAND_EXTRACTOR_HPP
 #define OPENPOSE_HAND_W_HAND_EXTRACTOR_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "handRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/hand/wHandRenderer.hpp

 #ifndef OPENPOSE_HAND_W_HAND_RENDERER_HPP
 #define OPENPOSE_HAND_W_HAND_RENDERER_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/hand/handRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "handRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/headers.hpp

@@ -2,33 +2,36 @@
 #define OPENPOSE_HEADERS_HPP
 
 // core module
-#include "core/headers.hpp"
+#include <openpose/core/headers.hpp>
 
 // experimental module
-#include "experimental/headers.hpp"
+#include <openpose/experimental/headers.hpp>
 
 // face module
-#include "face/headers.hpp"
+#include <openpose/face/headers.hpp>
 
 // filestream module
-#include "filestream/headers.hpp"
+#include <openpose/filestream/headers.hpp>
 
 // gui module
-#include "gui/headers.hpp"
+#include <openpose/gui/headers.hpp>
+
+// hand module
+#include <openpose/hand/headers.hpp>
 
 // pose module
-#include "pose/headers.hpp"
+#include <openpose/pose/headers.hpp>
 
 // producer module
-#include "producer/headers.hpp"
+#include <openpose/producer/headers.hpp>
 
 // threading module
-#include "thread/headers.hpp"
+#include <openpose/thread/headers.hpp>
 
 // utilities module
-#include "utilities/headers.hpp"
+#include <openpose/utilities/headers.hpp>
 
 // wrapper module
-#include "wrapper/headers.hpp"
+#include <openpose/wrapper/headers.hpp>
 
 #endif // OPENPOSE_HEADERS_HPP

include/openpose/pose/bodyPartConnectorBase.hpp

 #ifndef OPENPOSE_POSE_BODY_PARTS_CONNECTOR_HPP
 #define OPENPOSE_POSE_BODY_PARTS_CONNECTOR_HPP
 
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/pose/enumClasses.hpp>
 
 namespace op
 {

include/openpose/pose/bodyPartConnectorCaffe.hpp

@@ -2,12 +2,9 @@
 #ifndef OPENPOSE_POSE_BODY_PART_CONNECTOR_CAFFE_HPP
 #define OPENPOSE_POSE_BODY_PART_CONNECTOR_CAFFE_HPP
 
-#include <array>
 #include <caffe/blob.hpp>
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/pose/enumClasses.hpp>
 
 namespace op
 {

include/openpose/pose/headers.hpp

@@ -2,15 +2,15 @@
 #define OPENPOSE_POSE_HEADERS_HPP
 
 // pose module
-#include "bodyPartConnectorBase.hpp"
-#include "bodyPartConnectorCaffe.hpp"
-#include "enumClasses.hpp"
-#include "poseExtractor.hpp"
-#include "poseExtractorCaffe.hpp"
-#include "poseRenderer.hpp"
-#include "poseParameters.hpp"
-#include "renderPose.hpp"
-#include "wPoseExtractor.hpp"
-#include "wPoseRenderer.hpp"
+#include <openpose/pose/bodyPartConnectorBase.hpp>
+#include <openpose/pose/bodyPartConnectorCaffe.hpp>
+#include <openpose/pose/enumClasses.hpp>
+#include <openpose/pose/poseExtractor.hpp>
+#include <openpose/pose/poseExtractorCaffe.hpp>
+#include <openpose/pose/poseRenderer.hpp>
+#include <openpose/pose/poseParameters.hpp>
+#include <openpose/pose/renderPose.hpp>
+#include <openpose/pose/wPoseExtractor.hpp>
+#include <openpose/pose/wPoseRenderer.hpp>
 
 #endif // OPENPOSE_POSE_HEADERS_HPP

include/openpose/pose/poseExtractor.hpp

 #ifndef OPENPOSE_POSE_POSE_EXTRACTOR_HPP
 #define OPENPOSE_POSE_POSE_EXTRACTOR_HPP
 
-#include <array>
 #include <atomic>
 #include <thread>
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/enumClasses.hpp>
-#include <openpose/core/macros.hpp>
-#include "poseParameters.hpp"
+#include <openpose/pose/poseParameters.hpp>
 
 namespace op
 {

include/openpose/pose/poseExtractorCaffe.hpp

@@ -2,17 +2,14 @@
 #ifndef OPENPOSE_POSE_POSE_EXTRACTOR_CAFFE_HPP
 #define OPENPOSE_POSE_POSE_EXTRACTOR_CAFFE_HPP
 
-#include <memory> // std::shared_ptr
 #include <caffe/blob.hpp>
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/net.hpp>
 #include <openpose/core/nmsCaffe.hpp>
 #include <openpose/core/resizeAndMergeCaffe.hpp>
-#include <openpose/core/macros.hpp>
-#include "bodyPartConnectorCaffe.hpp"
-#include "enumClasses.hpp"
-#include "poseExtractor.hpp"
+#include <openpose/pose/bodyPartConnectorCaffe.hpp>
+#include <openpose/pose/enumClasses.hpp>
+#include <openpose/pose/poseExtractor.hpp>
 
 namespace op
 {

include/openpose/pose/poseParameters.hpp

 #ifndef OPENPOSE_POSE_POSE_PARAMETERS_HPP
 #define OPENPOSE_POSE_POSE_PARAMETERS_HPP
 
-#include <array>
 #include <map>
-#include <vector>
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/pose/enumClasses.hpp>
 
 namespace op
 {

include/openpose/pose/poseRenderer.hpp

 #ifndef OPENPOSE_POSE_POSE_RENDERER_HPP
 #define OPENPOSE_POSE_POSE_RENDERER_HPP
 
-#include <memory> // std::shared_ptr
-#include <openpose/core/array.hpp>
+#include <openpose/core/common.hpp>
 #include <openpose/core/enumClasses.hpp>
-#include <openpose/core/point.hpp>
 #include <openpose/core/renderer.hpp>
-#include <openpose/core/macros.hpp>
-#include "poseExtractor.hpp"
-#include "poseParameters.hpp"
+#include <openpose/pose/enumClasses.hpp>
+#include <openpose/pose/poseExtractor.hpp>
+#include <openpose/pose/poseParameters.hpp>
 
 namespace op
 {

include/openpose/pose/renderPose.hpp

@@ -2,10 +2,9 @@
 #define OPENPOSE_POSE_RENDER_POSE_HPP
 
 #include <opencv2/core/core.hpp> // cv::Mat
-#include <openpose/core/array.hpp>
-#include <openpose/core/point.hpp>
-#include "enumClasses.hpp"
-#include "poseParameters.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/pose/enumClasses.hpp>
+#include <openpose/pose/poseParameters.hpp>
 
 namespace op
 {

include/openpose/pose/wPoseExtractor.hpp

 #ifndef OPENPOSE_POSE_W_POSE_EXTRACTOR_HPP
 #define OPENPOSE_POSE_W_POSE_EXTRACTOR_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/pose/poseExtractor.hpp>
 #include <openpose/thread/worker.hpp>
-#include "poseExtractor.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/pose/wPoseRenderer.hpp

 #ifndef OPENPOSE_POSE_W_POSE_RENDERER_HPP
 #define OPENPOSE_POSE_W_POSE_RENDERER_HPP
 
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/pose/poseRenderer.hpp>
 #include <openpose/thread/worker.hpp>
-#include "poseRenderer.hpp"
 
 namespace op
 {
@@ -29,10 +29,7 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 #include <openpose/utilities/pointerContainer.hpp>
-#include <openpose/utilities/profiler.hpp>
 namespace op
 {
     template<typename TDatums>

include/openpose/producer/datumProducer.hpp

@@ -3,11 +3,10 @@
 
 #include <atomic>
 #include <limits> // std::numeric_limits
-#include <memory> // std::shared_ptr
 #include <tuple>
+#include <openpose/core/common.hpp>
 #include <openpose/core/datum.hpp>
 #include <openpose/producer/producer.hpp>
-#include <openpose/core/macros.hpp>
 
 namespace op
 {
@@ -39,8 +38,7 @@ namespace op
 
 
 // Implementation
-#include "openpose/utilities/errorAndLog.hpp"
-#include "openpose/producer/datumProducer.hpp"
+#include <openpose/producer/datumProducer.hpp>
 namespace op
 {
     template<typename TDatumsNoPtr>

include/openpose/producer/headers.hpp

@@ -2,13 +2,13 @@
 #define OPENPOSE_PRODUCER_HEADERS_HPP
 
 // producer module
-#include "datumProducer.hpp"
-#include "enumClasses.hpp"
-#include "producer.hpp"
-#include "imageDirectoryReader.hpp"
-#include "videoCaptureReader.hpp"
-#include "videoReader.hpp"
-#include "webcamReader.hpp"
-#include "wDatumProducer.hpp"
+#include <openpose/producer/datumProducer.hpp>
+#include <openpose/producer/enumClasses.hpp>
+#include <openpose/producer/producer.hpp>
+#include <openpose/producer/imageDirectoryReader.hpp>
+#include <openpose/producer/videoCaptureReader.hpp>
+#include <openpose/producer/videoReader.hpp>
+#include <openpose/producer/webcamReader.hpp>
+#include <openpose/producer/wDatumProducer.hpp>
 
 #endif // OPENPOSE_PRODUCER_HEADERS_HPP

include/openpose/producer/imageDirectoryReader.hpp

 #ifndef OPENPOSE_PRODUCER_IMAGE_DIRECTORY_READER_HPP
 #define OPENPOSE_PRODUCER_IMAGE_DIRECTORY_READER_HPP
 
-#include <string>
-#include <vector>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "producer.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/producer/producer.hpp>
 
 namespace op
 {

include/openpose/producer/producer.hpp

 #ifndef OPENPOSE_PRODUCER_PRODUCER_HPP
 #define OPENPOSE_PRODUCER_PRODUCER_HPP
 
-#include <array>
 #include <chrono>
 #include <opencv2/core/core.hpp> // cv::Mat
 #include <opencv2/highgui/highgui.hpp> // capProperties of OpenCV
-#include <openpose/core/macros.hpp>
-#include "enumClasses.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/producer/enumClasses.hpp>
 
 namespace op
 {

include/openpose/producer/videoCaptureReader.hpp

 #ifndef OPENPOSE_PRODUCER_VIDEO_CAPTURE_READER_HPP
 #define OPENPOSE_PRODUCER_VIDEO_CAPTURE_READER_HPP
 
-#include <string>
 #include <opencv2/core/core.hpp> // cv::Mat
 #include <opencv2/highgui/highgui.hpp> // cv::VideoCapture
-#include <openpose/core/macros.hpp>
-#include "producer.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/producer/producer.hpp>
 
 namespace op
 {

include/openpose/producer/videoReader.hpp

 #ifndef OPENPOSE_PRODUCER_VIDEO_READER_HPP
 #define OPENPOSE_PRODUCER_VIDEO_READER_HPP
 
-#include <openpose/core/macros.hpp>
-#include "videoCaptureReader.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/producer/videoCaptureReader.hpp>
 
 namespace op
 {

include/openpose/producer/wDatumProducer.hpp

@@ -2,9 +2,9 @@
 #define OPENPOSE_PRODUCER_W_DATUM_PRODUCER_HPP
 
 #include <limits> // std::numeric_limits
-#include <memory> // std::shared_ptr
+#include <openpose/core/common.hpp>
+#include <openpose/producer/datumProducer.hpp>
 #include <openpose/thread/workerProducer.hpp>
-#include "datumProducer.hpp"
 
 namespace op
 {
@@ -30,10 +30,6 @@ namespace op
 
 
 // Implementation
-#include <vector>
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
-#include <openpose/utilities/profiler.hpp>
 #include <openpose/core/datum.hpp>
 namespace op
 {

include/openpose/producer/webcamReader.hpp

@@ -4,9 +4,8 @@
 #include <atomic>
 #include <mutex>
 #include <thread>
-#include <openpose/core/point.hpp>
-#include <openpose/core/macros.hpp>
-#include "videoCaptureReader.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/producer/videoCaptureReader.hpp>
 
 namespace op
 {

include/openpose/thread/headers.hpp

@@ -2,21 +2,21 @@
 #define OPENPOSE_THREAD_HEADERS_HPP
 
 // thread module
-#include "enumClasses.hpp"
-#include "priorityQueue.hpp"
-#include "queue.hpp"
-#include "queueBase.hpp"
-#include "subThread.hpp"
-#include "subThreadNoQueue.hpp"
-#include "subThreadQueueIn.hpp"
-#include "subThreadQueueInOut.hpp"
-#include "subThreadQueueOut.hpp"
-#include "thread.hpp"
-#include "threadManager.hpp"
-#include "worker.hpp"
-#include "workerProducer.hpp"
-#include "workerConsumer.hpp"
-#include "wIdGenerator.hpp"
-#include "wQueueOrderer.hpp"
+#include <openpose/thread/enumClasses.hpp>
+#include <openpose/thread/priorityQueue.hpp>
+#include <openpose/thread/queue.hpp>
+#include <openpose/thread/queueBase.hpp>
+#include <openpose/thread/subThread.hpp>
+#include <openpose/thread/subThreadNoQueue.hpp>
+#include <openpose/thread/subThreadQueueIn.hpp>
+#include <openpose/thread/subThreadQueueInOut.hpp>
+#include <openpose/thread/subThreadQueueOut.hpp>
+#include <openpose/thread/thread.hpp>
+#include <openpose/thread/threadManager.hpp>
+#include <openpose/thread/worker.hpp>
+#include <openpose/thread/workerProducer.hpp>
+#include <openpose/thread/workerConsumer.hpp>
+#include <openpose/thread/wIdGenerator.hpp>
+#include <openpose/thread/wQueueOrderer.hpp>
 
 #endif // OPENPOSE_THREAD_HEADERS_HPP

include/openpose/thread/priorityQueue.hpp

@@ -2,8 +2,8 @@
 #define OPENPOSE_THREAD_PRIORITY_QUEUE_HPP 
 
 #include <queue> // std::priority_queue
-#include <openpose/core/macros.hpp>
-#include "queueBase.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/queueBase.hpp>
 
 namespace op
 {
@@ -28,7 +28,6 @@ namespace op
 
 // Implementation
 #include <type_traits> // std::is_same
-#include <openpose/utilities/errorAndLog.hpp>
 namespace op
 {
     template<typename TDatums, typename TQueue>

include/openpose/thread/queue.hpp

@@ -2,8 +2,8 @@
 #define OPENPOSE_THREAD_QUEUE_HPP 
 
 #include <queue> // std::queue
-#include <openpose/core/macros.hpp>
-#include "queueBase.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/queueBase.hpp>
 
 namespace op
 {
@@ -28,9 +28,6 @@ namespace op
 
 // Implementation
 #include <type_traits> // std::is_same
-#include <vector>
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TQueue>

include/openpose/thread/queueBase.hpp

 #ifndef OPENPOSE_THREAD_QUEUE_BASE_HPP
 #define OPENPOSE_THREAD_QUEUE_BASE_HPP
 
-#include <queue> // std::queue & std::priority_queue
 #include <condition_variable>
 #include <mutex>
-#include <openpose/core/macros.hpp>
+#include <queue> // std::queue & std::priority_queue
+#include <openpose/core/common.hpp>
 
 namespace op
 {
@@ -88,12 +88,8 @@ namespace op
 
 
 // Implementation
-#include <memory> // std::shared_ptr
-#include <vector>
 #include <openpose/core/datum.hpp>
-#include <openpose/utilities/errorAndLog.hpp>
 #include <openpose/utilities/fastMath.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TQueue>

include/openpose/thread/subThread.hpp

 #ifndef OPENPOSE_THREAD_SUB_THREAD_HPP
 #define OPENPOSE_THREAD_SUB_THREAD_HPP
 
-#include <vector>
-#include <openpose/core/macros.hpp>
-#include "worker.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/worker.hpp>
 
 namespace op
 {
@@ -40,8 +39,6 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TWorker>

include/openpose/thread/subThreadNoQueue.hpp

 #ifndef OPENPOSE_THREAD_THREAD_NO_QUEUE_HPP
 #define OPENPOSE_THREAD_THREAD_NO_QUEUE_HPP
 
-#include <vector>
-#include "thread.hpp"
-#include "worker.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/thread.hpp>
+#include <openpose/thread/worker.hpp>
 
 namespace op
 {
@@ -24,8 +24,6 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TWorker>

include/openpose/thread/subThreadQueueIn.hpp

 #ifndef OPENPOSE_THREAD_THREAD_QUEUE_IN_HPP
 #define OPENPOSE_THREAD_THREAD_QUEUE_IN_HPP
 
-#include <memory> // std::shared_ptr
-#include <vector>
-#include "thread.hpp"
-#include "queue.hpp"
-#include "worker.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/queue.hpp>
+#include <openpose/thread/thread.hpp>
+#include <openpose/thread/worker.hpp>
 
 namespace op
 {
@@ -29,8 +28,6 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TWorker, typename TQueue>

include/openpose/thread/subThreadQueueInOut.hpp

 #ifndef OPENPOSE_THREAD_THREAD_QUEUE_IN_OUT_HPP
 #define OPENPOSE_THREAD_THREAD_QUEUE_IN_OUT_HPP
 
-#include <memory> // std::shared_ptr
-#include <vector>
-#include "thread.hpp"
-#include "queue.hpp"
-#include "worker.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/queue.hpp>
+#include <openpose/thread/thread.hpp>
+#include <openpose/thread/worker.hpp>
 
 namespace op
 {
@@ -30,8 +29,6 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TWorker, typename TQueue>

include/openpose/thread/subThreadQueueOut.hpp

 #ifndef OPENPOSE_THREAD_THREAD_QUEUE_OUT_HPP
 #define OPENPOSE_THREAD_THREAD_QUEUE_OUT_HPP
 
-#include <memory> // std::shared_ptr
-#include <vector>
-#include "thread.hpp"
-#include "queue.hpp"
-#include "worker.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/queue.hpp>
+#include <openpose/thread/thread.hpp>
+#include <openpose/thread/worker.hpp>
 
 namespace op
 {
@@ -29,8 +28,6 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
-#include <openpose/core/macros.hpp>
 namespace op
 {
     template<typename TDatums, typename TWorker, typename TQueue>

include/openpose/thread/thread.hpp

@@ -2,12 +2,10 @@
 #define OPENPOSE_THREAD_THREAD_HPP
 
 #include <atomic>
-#include <memory>   // std::shared_ptr
 #include <thread>
-#include <vector>
-#include <openpose/core/macros.hpp>
-#include "subThread.hpp"
-#include "worker.hpp"
+#include <openpose/core/common.hpp>
+#include <openpose/thread/subThread.hpp>
+#include <openpose/thread/worker.hpp>
 
 namespace op
 {
@@ -63,7 +61,6 @@ namespace op
 
 
 // Implementation
-#include <openpose/utilities/errorAndLog.hpp>
 namespace op
 {
     template<typename TDatums, typename TWorker>