diff --git a/src/ce/tireal.hpp b/src/ce/include/c++/tireal.hpp
similarity index 100%
rename from src/ce/tireal.hpp
rename to src/ce/include/c++/tireal.hpp
diff --git a/src/ce/include/ti/real b/src/ce/include/ti/c++/real
similarity index 100%
rename from src/ce/include/ti/real
rename to src/ce/include/ti/c++/real
diff --git a/src/ce/makefile b/src/ce/makefile
index 027e08396..4d439c9e2 100644
--- a/src/ce/makefile
+++ b/src/ce/makefile
@@ -19,7 +19,10 @@ include $(CURDIR)/../common.mk
 WILDCARD_SRC = $(wildcard *.src)
 WILDCARD_H = $(wildcard include/*.h)
 WILDCARD_HW_H = $(wildcard include/sys/*.h)
-WILDCARD_TI_H = $(wildcard include/ti/*.h) include/ti/real
+WILDCARD_TI_H = $(wildcard include/ti/*.h)
+
+WILDCARD_CXX_H = $(wildcard include/c++/*)
+WILDCARD_CXX_TI_H = $(wildcard include/ti/c++/*)
 
 all:
 
@@ -28,9 +31,13 @@ install: $(addprefix install-,$(TARGETS))
 	$(Q)$(call MKDIR,$(INSTALL_TI_H))
 	$(Q)$(call MKDIR,$(INSTALL_HW_H))
 	$(Q)$(call MKDIR,$(INSTALL_CE))
+	$(Q)$(call MKDIR,$(INSTALL_CXX_H))
+	$(Q)$(call MKDIR,$(INSTALL_CXX_TI_H))
 	$(Q)$(call COPY,$(foreach file,$(call NATIVEPATH,$(WILDCARD_H)),$(call QUOTE_ARG,$(file))),$(INSTALL_H))
 	$(Q)$(call COPY,$(foreach file,$(call NATIVEPATH,$(WILDCARD_HW_H)),$(call QUOTE_ARG,$(file))),$(INSTALL_HW_H))
 	$(Q)$(call COPY,$(foreach file,$(call NATIVEPATH,$(WILDCARD_TI_H)),$(call QUOTE_ARG,$(file))),$(INSTALL_TI_H))
+	$(Q)$(call COPY,$(foreach file,$(call NATIVEPATH,$(WILDCARD_CXX_H)),$(call QUOTE_ARG,$(file))),$(INSTALL_CXX_H))
+	$(Q)$(call COPY,$(foreach file,$(call NATIVEPATH,$(WILDCARD_CXX_TI_H)),$(call QUOTE_ARG,$(file))),$(INSTALL_CXX_TI_H))
 	$(Q)$(call COPY,$(WILDCARD_SRC),$(INSTALL_CE))
 
 clean:
diff --git a/src/common.mk b/src/common.mk
index 0fac61bbe..36028c7c7 100644
--- a/src/common.mk
+++ b/src/common.mk
@@ -90,8 +90,10 @@ INSTALL_LIBCXX := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/lib/libcxx))
 INSTALL_CE := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/lib/ce))
 INSTALL_BIN := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/bin))
 INSTALL_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include))
-INSTALL_CXX_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include/c++))
 INSTALL_TI_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include/ti))
 INSTALL_HW_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include/sys))
+INSTALL_CXX_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include/c++))
+INSTALL_CXX_TI_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include/c++/ti))
+INSTALL_CXX_HW_H := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/include/c++/sys))
 INSTALL_META := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)/meta))
 INSTALL_DIR := $(call QUOTE_ARG,$(call NATIVEPATH,$(INSTALL_DIR)))