-#ifndef RS_ENTITY_H
-#define RS_ENTITY_H
+#ifndef __ENTITY_H__
+#define __ENTITY_H__
#include <QtCore>
#include "rs.h"
-#include "rs_layer.h"
-#include "rs_math.h"
-#include "rs_pen.h"
-#include "rs_undoable.h"
+#include "layer.h"
+#include "mathextra.h"
+#include "pen.h"
+#include "undoable.h"
#include "vector.h"
#include "vectorsolutions.h"
QMultiHash<QString, QString *> varList;
};
-#endif
+#endif // __ENTITY_H__