Make C++ support compile again.

lib/libc/new.cpp

@@ -22,7 +22,7 @@
  */
 #include <new.h>
 #include <debug.h>
-#include <kernel/heap.h>
+#include <lib/heap.h>
 
 void *operator new(size_t s)
 {

lib/libc/rules.mk

@@ -19,13 +19,13 @@ ifneq ($(WITH_CUSTOM_MALLOC),true)
 MODULE_SRCS += $(LOCAL_DIR)/malloc.c
 endif
 
-include $(LOCAL_DIR)/string/rules.mk
-
 ifeq ($(WITH_CPP_SUPPORT),true)
 MODULE_SRCS += \
-	$(LOCAL_DIR)/new.c \
+	$(LOCAL_DIR)/new.cpp \
 	$(LOCAL_DIR)/atexit.c \
 	$(LOCAL_DIR)/pure_virtual.cpp
 endif
 
+include $(LOCAL_DIR)/string/rules.mk
+
 include make/module.mk