Index: src/array.h
==================================================================
--- src/array.h
+++ src/array.h
@@ -22,12 +22,12 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CFWARRAY_H__
-#define __CFWARRAY_H__
+#ifndef __COREFW_ARRAY_H__
+#define __COREFW_ARRAY_H__
 
 #include "class.h"
 
 typedef struct CFWArray CFWArray;
 extern CFWClass *cfw_array;

Index: src/class.h
==================================================================
--- src/class.h
+++ src/class.h
@@ -22,12 +22,12 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CFWCLASS_H__
-#define __CFWCLASS_H__
+#ifndef __COREFW_CLASS_H__
+#define __COREFW_CLASS_H__
 
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdarg.h>
 

Index: src/corefw.h
==================================================================
--- src/corefw.h
+++ src/corefw.h
@@ -1,9 +1,9 @@
-#ifndef __COREFW_H__
-#define __COREFW_H__
+#ifndef __COREFW_COREFW_H__
+#define __COREFW_COREFW_H__
 
 #include "class.h"
 #include "object.h"
 #include "string.h"
 #include "array.h"
 
 #endif

Index: src/object.h
==================================================================
--- src/object.h
+++ src/object.h
@@ -22,12 +22,12 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CFWOBJECT_H__
-#define __CFWOBJECT_H__
+#ifndef __COREFW_OBJECT_H__
+#define __COREFW_OBJECT_H__
 
 #include "class.h"
 
 typedef struct CFWObject {
 	CFWClass *cls;

Index: src/range.h
==================================================================
--- src/range.h
+++ src/range.h
@@ -22,12 +22,12 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CFWRANGE_H__
-#define __CFW_RANGE_H__
+#ifndef __COREFW_RANGE_H__
+#define __COREFW_RANGE_H__
 
 typedef struct cfw_range_t {
 	size_t start;
 	size_t length;
 } cfw_range_t;

Index: src/string.h
==================================================================
--- src/string.h
+++ src/string.h
@@ -22,12 +22,12 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __CFWSTRING_H__
-#define __CFWSTRING_H__
+#ifndef __COREFW_STRING_H__
+#define __COREFW_STRING_H__
 
 #include "class.h"
 
 typedef struct CFWString CFWString;
 extern CFWClass *cfw_string;