namespace in include guards

Former-commit-id: b74d5ef92812aea4722828667800b29f044ed889

include/igl/anttweakbar/ReAntTweakBar.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_REANTTWEAKBAR_H
-#define IGL_REANTTWEAKBAR_H
+#ifndef IGL_ANTTWEAKBAR_REANTTWEAKBAR_H
+#define IGL_ANTTWEAKBAR_REANTTWEAKBAR_H
 #include "../igl_inline.h"
 // ReAntTweakBar is a minimal wrapper for the AntTweakBar library that allows
 // "bars" to be saved and load from disk. Changing your existing app that uses

include/igl/anttweakbar/cocoa_key_to_anttweakbar_key.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
-#define IGL_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
+#ifndef IGL_ANTTWEAKBAR_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
+#define IGL_ANTTWEAKBAR_COCOA_KEY_TO_ANTTWEAKBAR_KEY_H
 #include "../igl_inline.h"
 
 

include/igl/bbw/bbw.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef BBW_H
-#define BBW_H
+#ifndef IGL_BBW_BBW_H
+#define IGL_BBW_BBW_H
 #include "../igl_inline.h"
 
 #include <Eigen/Dense>

include/igl/boolean/MeshBooleanType.h

@@ -1,5 +1,5 @@
-#ifndef MESH_BOOLEAN_TYPE_H
-#define MESH_BOOLEAN_TYPE_H
+#ifndef IGL_BOOLEAN_MESH_BOOLEAN_TYPE_H
+#define IGL_BOOLEAN_MESH_BOOLEAN_TYPE_H
 
 namespace igl
 {

include/igl/boolean/from_cork_mesh.h

@@ -1,5 +1,5 @@
-#ifndef IGL_FROM_CORK_MESH_H
-#define IGL_FROM_CORK_MESH_H
+#ifndef IGL_BOOLEAN_FROM_CORK_MESH_H
+#define IGL_BOOLEAN_FROM_CORK_MESH_H
 #ifndef IGL_NO_CORK
 #include <igl/igl_inline.h>
 #include <cork.h>

include/igl/boolean/mesh_boolean.h

@@ -1,5 +1,5 @@
-#ifndef MESH_BOOLEAN_H
-#define MESH_BOOLEAN_H
+#ifndef IGL_BOOLEAN_MESH_BOOLEAN_H
+#define IGL_BOOLEAN_MESH_BOOLEAN_H
 
 #include <igl/igl_inline.h>
 #include "MeshBooleanType.h"

include/igl/boolean/mesh_boolean_cork.h

@@ -1,5 +1,5 @@
-#ifndef MESH_BOOLEAN_CORK_H
-#define MESH_BOOLEAN_CORK_H
+#ifndef IGL_BOOLEAN_MESH_BOOLEAN_CORK_H
+#define IGL_BOOLEAN_MESH_BOOLEAN_CORK_H
 #ifndef IGL_NO_CORK
 #include "MeshBooleanType.h"
 #include <igl/igl_inline.h>

include/igl/boolean/to_cork_mesh.h

@@ -1,5 +1,5 @@
-#ifndef IGL_TO_CORK_MESH_H
-#define IGL_TO_CORK_MESH_H
+#ifndef IGL_BOOLEAN_TO_CORK_MESH_H
+#define IGL_BOOLEAN_TO_CORK_MESH_H
 #ifndef IGL_NO_CORK
 #include <igl/igl_inline.h>
 #include <cork.h>

include/igl/cgal/RemeshSelfIntersectionsParam.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_REMESH_SELF_INTERSECTIONS_PARAM_H
-#define IGL_REMESH_SELF_INTERSECTIONS_PARAM_H
+#ifndef IGL_CGAL_REMESH_SELF_INTERSECTIONS_PARAM_H
+#define IGL_CGAL_REMESH_SELF_INTERSECTIONS_PARAM_H
 
 namespace igl
 {

include/igl/cgal/SelfIntersectMesh.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_SELFINTERSECTMESH_H
-#define IGL_SELFINTERSECTMESH_H
+#ifndef IGL_CGAL_SELFINTERSECTMESH_H
+#define IGL_CGAL_SELFINTERSECTMESH_H
 
 #include "CGAL_includes.hpp"
 #include "RemeshSelfIntersectionsParam.h"

include/igl/cgal/complex_to_mesh.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_COMPLEX_TO_MESH_H
-#define IGL_COMPLEX_TO_MESH_H
+#ifndef IGL_CGAL_COMPLEX_TO_MESH_H
+#define IGL_CGAL_COMPLEX_TO_MESH_H
 #include "../igl_inline.h"
 
 #include <Eigen/Dense>

include/igl/cgal/intersect_other.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_INTERSECT_OTHER_H
-#define IGL_INTERSECT_OTHER_H
+#ifndef IGL_CGAL_INTERSECT_OTHER_H
+#define IGL_CGAL_INTERSECT_OTHER_H
 #include <igl/igl_inline.h>
 
 #include <Eigen/Dense>

include/igl/cgal/mesh_to_cgal_triangle_list.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MESH_TO_CGAL_TRIANGLE_LIST_H
-#define IGL_MESH_TO_CGAL_TRIANGLE_LIST_H
+#ifndef IGL_CGAL_MESH_TO_CGAL_TRIANGLE_LIST_H
+#define IGL_CGAL_MESH_TO_CGAL_TRIANGLE_LIST_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 #include "CGAL_includes.hpp"

include/igl/cgal/mesh_to_polyhedron.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MESH_TO_POLYHEDRON_H
-#define IGL_MESH_TO_POLYHEDRON_H
+#ifndef IGL_CGAL_MESH_TO_POLYHEDRON_H
+#define IGL_CGAL_MESH_TO_POLYHEDRON_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 

include/igl/cgal/order_facets_around_edges.h

@@ -1,5 +1,5 @@
-#ifndef ORDER_FACETS_AROUND_EDGES
-#define ORDER_FACETS_AROUND_EDGES
+#ifndef IGL_CGAL_ORDER_FACETS_AROUND_EDGES_H
+#define IGL_CGAL_ORDER_FACETS_AROUND_EDGES_H
 
 #include "../igl_inline.h"
 #include <Eigen/Core>

include/igl/cgal/outer_hull.h

@@ -1,5 +1,5 @@
-#ifndef IGL_OUTER_HULL_H
-#define IGL_OUTER_HULL_H
+#ifndef IGL_CGAL_OUTER_HULL_H
+#define IGL_CGAL_OUTER_HULL_H
 #include "../igl_inline.h"
 #include <Eigen/Core>
 namespace igl

include/igl/cgal/peel_outer_hull_layers.h

@@ -1,5 +1,5 @@
-#ifndef IGL_PEEL_OUTER_HULL_LAYERS_H
-#define IGL_PEEL_OUTER_HULL_LAYERS_H
+#ifndef IGL_CGAL_PEEL_OUTER_HULL_LAYERS_H
+#define IGL_CGAL_PEEL_OUTER_HULL_LAYERS_H
 #include "../igl_inline.h"
 #include <Eigen/Core>
 namespace igl

include/igl/cgal/polyhedron_to_mesh.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_POLYHEDRON_TO_MESH_H
-#define IGL_POLYHEDRON_TO_MESH_H
+#ifndef IGL_CGAL_POLYHEDRON_TO_MESH_H
+#define IGL_CGAL_POLYHEDRON_TO_MESH_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 

include/igl/cgal/remesh_self_intersections.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_REMESH_SELF_INTERSECTIONS_H
-#define IGL_REMESH_SELF_INTERSECTIONS_H
+#ifndef IGL_CGAL_REMESH_SELF_INTERSECTIONS_H
+#define IGL_CGAL_REMESH_SELF_INTERSECTIONS_H
 #include <igl/igl_inline.h>
 #include "RemeshSelfIntersectionsParam.h"
 

include/igl/cgal/signed_distance_isosurface.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_SIGNED_DISTANCE_ISOSURFACE_H
-#define IGL_SIGNED_DISTANCE_ISOSURFACE_H
+#ifndef IGL_CGAL_SIGNED_DISTANCE_ISOSURFACE_H
+#define IGL_CGAL_SIGNED_DISTANCE_ISOSURFACE_H
 #include "../igl_inline.h"
 #include "../signed_distance.h"
 #include <Eigen/Core>

include/igl/comiso/frame_field.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_FRAMEFIELD_H
-#define IGL_FRAMEFIELD_H
+#ifndef IGL_COMISO_FRAMEFIELD_H
+#define IGL_COMISO_FRAMEFIELD_H
 
 #include <igl/igl_inline.h>
 #include <Eigen/Dense>

include/igl/comiso/miq.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MIQ_H
-#define IGL_MIQ_H
+#ifndef IGL_COMISO_MIQ_H
+#define IGL_COMISO_MIQ_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 #include <vector>

include/igl/comiso/nrosy.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_NROSY_H
-#define IGL_NROSY_H
+#ifndef IGL_COMISO_NROSY_H
+#define IGL_COMISO_NROSY_H
 
 #include <iostream>
 #include <Eigen/Core>

include/igl/embree/EmbreeIntersector.h

@@ -13,8 +13,8 @@
 // * For Embree2.2
 // * Uncomment #define __USE_RAY_MASK__ in platform.h to enable masking
 
-#ifndef IGL_EMBREE_INTERSECTOR_H
-#define IGL_EMBREE_INTERSECTOR_H
+#ifndef IGL_EMBREE_EMBREE_INTERSECTOR_H
+#define IGL_EMBREE_EMBREE_INTERSECTOR_H
 
 #include "Hit.h"
 #include <Eigen/Geometry>

include/igl/embree/Embree_convenience.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_EMBREE_CONVENIENCE_H
-#define IGL_EMBREE_CONVENIENCE_H
+#ifndef IGL_EMBREE_EMBREE_CONVENIENCE_H
+#define IGL_EMBREE_EMBREE_CONVENIENCE_H
 
 #undef interface
 #undef near

include/igl/embree/Hit.h

@@ -6,8 +6,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_HIT_H
-#define IGL_HIT_H
+#ifndef IGL_EMBREE_HIT_H
+#define IGL_EMBREE_HIT_H
 
 namespace igl
 {

include/igl/embree/ambient_occlusion.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_AMBIENT_OCCLUSION_H
-#define IGL_AMBIENT_OCCLUSION_H
+#ifndef IGL_EMBREE_AMBIENT_OCCLUSION_H
+#define IGL_EMBREE_AMBIENT_OCCLUSION_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 namespace igl

include/igl/embree/bone_heat.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_BONE_HEAT_H
-#define IGL_BONE_HEAT_H
+#ifndef IGL_EMBREE_BONE_HEAT_H
+#define IGL_EMBREE_BONE_HEAT_H
 #include "../igl_inline.h"
 #include <Eigen/Core>
 

include/igl/embree/bone_visible.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_BONE_VISIBLE_H
-#define IGL_BONE_VISIBLE_H
+#ifndef IGL_EMBREE_BONE_VISIBLE_H
+#define IGL_EMBREE_BONE_VISIBLE_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 #include "EmbreeIntersector.h"

include/igl/embree/line_mesh_intersection.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_LINE_MESH_INTERSECTION_H
-#define IGL_LINE_MESH_INTERSECTION_H
+#ifndef IGL_EMBREE_LINE_MESH_INTERSECTION_H
+#define IGL_EMBREE_LINE_MESH_INTERSECTION_H
 #include <igl/igl_inline.h>
 
 #include <Eigen/Dense>

include/igl/embree/reorient_facets_raycast.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_REORIENT_FACETS_RAYCAST_H
-#define IGL_REORIENT_FACETS_RAYCAST_H
+#ifndef IGL_EMBREE_REORIENT_FACETS_RAYCAST_H
+#define IGL_EMBREE_REORIENT_FACETS_RAYCAST_H
 #include "../igl_inline.h"
 #include <Eigen/Core>
 namespace igl

include/igl/embree/unproject_in_mesh.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_UNPROJECT_IN_MESH
-#define IGL_UNPROJECT_IN_MESH
+#ifndef IGL_EMBREE_UNPROJECT_IN_MESH
+#define IGL_EMBREE_UNPROJECT_IN_MESH
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 

include/igl/embree/unproject_onto_mesh.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_UNPROJECT_ONTO_MESH
-#define IGL_UNPROJECT_ONTO_MESH
+#ifndef IGL_EMBREE_UNPROJECT_ONTO_MESH_H
+#define IGL_EMBREE_UNPROJECT_ONTO_MESH_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 

include/igl/lim/lim.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_COMPUTE_LIM_H
-#define IGL_COMPUTE_LIM_H
+#ifndef IGL_LIM_LIM_H
+#define IGL_LIM_LIM_H
 #include <igl/igl_inline.h>
 #include <Eigen/Core>
 #include <Eigen/Sparse>

include/igl/matlab/MatlabWorkspace.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_WRITE_MATLAB_WORKSPACE
-#define IGL_WRITE_MATLAB_WORKSPACE
+#ifndef IGL_MATLAB_MATLAB_WORKSPACE_H
+#define IGL_MATLAB_MATLAB_WORKSPACE_H
 
 #include <Eigen/Dense>
 #include <Eigen/Sparse>

include/igl/matlab/MexStream.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MEX_STREAM_H
-#define IGL_MEX_STREAM_H
+#ifndef IGL_MATLAB_MEX_STREAM_H
+#define IGL_MATLAB_MEX_STREAM_H
 #include <iostream>
 namespace igl
 {

include/igl/matlab/matlabinterface.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MATLAB_INTERFACE_H
-#define IGL_MATLAB_INTERFACE_H
+#ifndef IGL_MATLAB_MATLAB_INTERFACE_H
+#define IGL_MATLAB_MATLAB_INTERFACE_H
 #include "../igl_inline.h"
 // WARNING: These functions require matlab installed
 // Additional header folder required:

include/igl/matlab/mexErrMsgTxt.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MEXERRMSGTXT_H
-#define IGL_MEXERRMSGTXT_H
+#ifndef IGL_MATLAB_MEXERRMSGTXT_H
+#define IGL_MATLAB_MEXERRMSGTXT_H
 #include "../igl_inline.h"
 namespace igl
 {

include/igl/matlab/parse_rhs.h

@@ -1,5 +1,5 @@
-#ifndef IGL_PARSE_RHS_H
-#define IGL_PARSE_RHS_H
+#ifndef IGL_MATLAB_PARSE_RHS_H
+#define IGL_MATLAB_PARSE_RHS_H
 #include <igl/igl_inline.h>
 #include <mex.h>
 #include <Eigen/Dense>

include/igl/matlab/prepare_lhs.h

@@ -1,5 +1,5 @@
-#ifndef IGL_PREPARE_LHS_H
-#define IGL_PREPARE_LHS_H
+#ifndef IGL_MATLAB_PREPARE_LHS_H
+#define IGL_MATLAB_PREPARE_LHS_H
 #include <igl/igl_inline.h>
 #include <mex.h>
 #include <Eigen/Dense>

include/igl/mosek/mosek_guarded.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MOSEK_GUARDED_H
-#define IGL_MOSEK_GUARDED_H
+#ifndef IGL_MOSEK_MOSEK_GUARDED_H
+#define IGL_MOSEK_MOSEK_GUARDED_H
 #include "../igl_inline.h"
 
 #include "mosek.h"

include/igl/mosek/mosek_linprog.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MOSEK_LINPROG_H
-#define IGL_MOSEK_LINPROG_H
+#ifndef IGL_MOSEK_MOSEK_LINPROG_H
+#define IGL_MOSEK_MOSEK_LINPROG_H
 #include "../igl_inline.h"
 #include <Eigen/Core>
 #include <Eigen/Sparse>

include/igl/mosek/mosek_quadprog.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MOSEK_QUADPROG_H
-#define IGL_MOSEK_QUADPROG_H
+#ifndef IGL_MOSEK_MOSEK_QUADPROG_H
+#define IGL_MOSEK_MOSEK_QUADPROG_H
 #include "../igl_inline.h"
 #include <vector>
 #include <map>

include/igl/png/render_to_png.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_RENDER_TO_PNG_H
-#define IGL_RENDER_TO_PNG_H
+#ifndef IGL_PNG_RENDER_TO_PNG_H
+#define IGL_PNG_RENDER_TO_PNG_H
 #include <igl/igl_inline.h>
 
 #include <string>

include/igl/png/render_to_png_async.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_RENDER_TO_PNG_ASYNC_H
-#define IGL_RENDER_TO_PNG_ASYNC_H
+#ifndef IGL_PNG_RENDER_TO_PNG_ASYNC_H
+#define IGL_PNG_RENDER_TO_PNG_ASYNC_H
 #include <igl/igl_inline.h>
 #include <thread>
 //#include <boost/thread/thread.hpp>

include/igl/png/texture_from_file.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_TEXTURE_FROM_FILE_H
-#define IGL_TEXTURE_FROM_FILE_H
+#ifndef IGL_PNG_TEXTURE_FROM_FILE_H
+#define IGL_PNG_TEXTURE_FROM_FILE_H
 #ifndef IGL_NO_OPENGL
 #include "../igl_inline.h"
 
@@ -18,9 +18,9 @@ namespace igl
 {
   namespace png
   {
-    // Read an image from an image file and use it as a texture. Officially, only
-    // .tga and .png are supported. Any filetype read by ImageMagick's `convert`
-    // will work via an unsafe system call.
+    // Read an image from an image file and use it as a texture. Officially,
+    // only .tga and .png are supported. Any filetype read by ImageMagick's
+    // `convert` will work via an unsafe system call.
     //
     // Input:
     //  filename  path to image file

include/igl/png/texture_from_png.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_TEXTURE_FROM_PNG_H
-#define IGL_TEXTURE_FROM_PNG_H
+#ifndef IGL_PNG_TEXTURE_FROM_PNG_H
+#define IGL_PNG_TEXTURE_FROM_PNG_H
 #include "../igl_inline.h"
 #include <Eigen/Core>
 #include <string>

include/igl/tetgen/cdt.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_CDT_H
-#define IGL_CDT_H
+#ifndef IGL_TETGEN_CDT_H
+#define IGL_TETGEN_CDT_H
 #include "../igl_inline.h"
 
 #include <Eigen/Core>

include/igl/tetgen/mesh_to_tetgenio.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MESH_TO_TETGENIO_H
-#define IGL_MESH_TO_TETGENIO_H
+#ifndef IGL_TETGEN_MESH_TO_TETGENIO_H
+#define IGL_TETGEN_MESH_TO_TETGENIO_H
 #include "../igl_inline.h"
 
 #define TETLIBRARY 

include/igl/tetgen/mesh_with_skeleton.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_MESH_WITH_SKELETON_H
-#define IGL_MESH_WITH_SKELETON_H
+#ifndef IGL_TETGEN_MESH_WITH_SKELETON_H
+#define IGL_TETGEN_MESH_WITH_SKELETON_H
 #include "../igl_inline.h"
 #include <Eigen/Dense>
 #include <string>

include/igl/tetgen/read_into_tetgenio.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_READ_INTO_TETGENIO_H
-#define IGL_READ_INTO_TETGENIO_H
+#ifndef IGL_TETGEN_READ_INTO_TETGENIO_H
+#define IGL_TETGEN_READ_INTO_TETGENIO_H
 #include "../igl_inline.h"
 
 #include <string>

include/igl/tetgen/tetgenio_to_tetmesh.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_TETGENIO_TO_TETMESH_H
-#define IGL_TETGENIO_TO_TETMESH_H
+#ifndef IGL_TETGEN_TETGENIO_TO_TETMESH_H
+#define IGL_TETGEN_TETGENIO_TO_TETMESH_H
 #include "../igl_inline.h"
 
 #define TETLIBRARY 

include/igl/tetgen/tetrahedralize.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_TETRAHEDRALIZE_H
-#define IGL_TETRAHEDRALIZE_H
+#ifndef IGL_TETGEN_TETRAHEDRALIZE_H
+#define IGL_TETGEN_TETRAHEDRALIZE_H
 #include "../igl_inline.h"
 
 #include <vector>

include/igl/triangle/triangulate.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_TRIANGULATE_H
-#define IGL_TRIANGULATE_H
+#ifndef IGL_TRIANGLE_TRIANGULATE_H
+#define IGL_TRIANGLE_TRIANGULATE_H
 #include <igl/igl_inline.h>
 #include <string>
 #include <Eigen/Core>

include/igl/viewer/OpenGL_shader.h

@@ -6,8 +6,8 @@
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef IGL_OPENGL_SHADER_H
-#define IGL_OPENGL_SHADER_H
+#ifndef IGL_VIEWER_OPENGL_SHADER_H
+#define IGL_VIEWER_OPENGL_SHADER_H
 
 #include <igl/igl_inline.h>
 #include <string>

include/igl/viewer/OpenGL_state.h

@@ -5,9 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef IGL_OPENGL_STATE_H
-#define IGL_OPENGL_STATE_H
+#ifndef IGL_VIEWER_OPENGL_STATE_H
+#define IGL_VIEWER_OPENGL_STATE_H
 
 // Coverts mesh data inside a igl::viewer::ViewerData class in an OpenGL compatible format
 // The class includes a shader and the opengl calls to plot the data

include/igl/viewer/TextRenderer.h

@@ -5,13 +5,12 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
+#ifndef IGL_VIEWER_TEXT_RENDERER_H
+#define IGL_VIEWER_TEXT_RENDERER_H
 
 /* This class extends the font rendering code in AntTweakBar
    so that it can be used to render text at arbitrary 3D positions */
 
-#ifndef IGL_TEXT_RENDERER_H
-#define IGL_TEXT_RENDERER_H
-
 #include <igl/igl_inline.h>
 #include <igl/viewer/OpenGL_shader.h>
 #include <TwOpenGLCore.h>

include/igl/viewer/Viewer.h

@@ -5,9 +5,9 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
+#ifndef IGL_VIEWER_VIEWER_H
+#define IGL_VIEWER_VIEWER_H
 
-#ifndef IGL_VIEWER_H
-#define IGL_VIEWER_H
 #ifndef IGL_OPENGL_4
 #define IGL_OPENGL_4
 #endif

include/igl/viewer/ViewerCore.h

@@ -5,9 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef IGL_VIEWER_CORE_H
-#define IGL_VIEWER_CORE_H
+#ifndef IGL_VIEWER_VIEWER_CORE_H
+#define IGL_VIEWER_VIEWER_CORE_H
 
 #include <igl/viewer/TextRenderer.h>
 #include <igl/viewer/ViewerData.h>

include/igl/viewer/ViewerData.h

@@ -5,9 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef IGL_VIEWER_DATA_H
-#define IGL_VIEWER_DATA_H
+#ifndef IGL_VIEWER_VIEWER_DATA_H
+#define IGL_VIEWER_VIEWER_DATA_H
 
 #include <cstdint>
 #include <vector>

include/igl/viewer/ViewerPlugin.h

@@ -5,15 +5,14 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
+#ifndef IGL_VIEWER_VIEWER_PLUGIN_H
+#define IGL_VIEWER_VIEWER_PLUGIN_H
 
 // TODO:
 // * create plugins/skeleton.h
 // * pass time in draw function
 // * remove Preview3D from comments
 // * clean comments
-
-#ifndef IGL_VIEWER_PLUGIN_H
-#define IGL_VIEWER_PLUGIN_H
 #include <string>
 #include <igl/igl_inline.h>
 #include <vector>

include/igl/xml/ReAntTweakBarXMLSerialization.h

@@ -5,8 +5,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License 
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can 
 // obtain one at http://mozilla.org/MPL/2.0/.
-#ifndef IGL_REANTTWEAKBAR_XML_SERIALIZATION_H
-#define IGL_REANTTWEAKBAR_XML_SERIALIZATION_H
+#ifndef IGL_XML_REANTTWEAKBAR_XML_SERIALIZATION_H
+#define IGL_XML_REANTTWEAKBAR_XML_SERIALIZATION_H
 #include "../igl_inline.h"
 #include "serialize_xml.h"
 

include/igl/xml/serialize_xml.h

@@ -4,6 +4,8 @@
 // This Source Code Form is subject to the terms of the Mozilla Public License
 // v. 2.0. If a copy of the MPL was not distributed with this file, You can
 // obtain one at http://mozilla.org/MPL/2.0/.
+#ifndef IGL_XML_SERIALIZABLE_XML_H
+#define IGL_XML_SERIALIZABLE_XML_H
 // -----------------------------------------------------------------------------
 // Functions to save and load a serialization of fundamental c++ data types to
 // and from a xml file. STL containers, Eigen matrix types and nested data
@@ -13,9 +15,6 @@
 // See also: serialize.h
 // -----------------------------------------------------------------------------
 
-#ifndef IGL_SERIALIZABLE_XML_H
-#define IGL_SERIALIZABLE_XML_H
-
 #include "../igl_inline.h"
 
 #include <type_traits>