diff --git a/src/include/sys/_types.h b/src/include/sys/_types.h
index 85a8322..c5156c0 100644
--- a/src/include/sys/_types.h
+++ b/src/include/sys/_types.h
@@ -76,8 +76,10 @@
  * character set plus one extra value (WEOF), and must be at least 16 bits.
  */
 typedef	int		__ct_rune_t;
+#ifndef __HMM
 typedef __ct_rune_t     __wchar_t;
 typedef	__ct_rune_t	__rune_t;
+#endif
 typedef	__ct_rune_t	__wint_t;
 
 /*
diff --git a/src/include/sys/types.h b/src/include/sys/types.h
index 6180110..d556767 100644
--- a/src/include/sys/types.h
+++ b/src/include/sys/types.h
@@ -21,8 +21,8 @@
 
 **************************************************************************************/
 
-#ifndef _TYPES_H
-#define _TYPES_H
+#ifndef TYPES_H
+#define TYPES_H
 
 #include <wchar.h>
 
diff --git a/src/lib/libcpp/Makefile b/src/lib/libcpp/Makefile
index 5aa87df..93723b7 100644
--- a/src/lib/libcpp/Makefile
+++ b/src/lib/libcpp/Makefile
@@ -17,7 +17,7 @@
 .cpp.o:
 	$(CXX) ${CFLAGS} -Wall -DNOBOOL -fno-exceptions -g -c $(INCLUDE) -o $@ $<
 .cc.o:
-	$(CXX) ${CFLAGS} -Wall -DNOBOOL -fno-builtin -fno-rtti -fno-exceptions -fomit-frame-pointer -O $(INCLUDE) -c -o $@ $<
+	$(CXX) ${CFLAGS} -Wall -DNOBOOL -D__HMM -nostdinc -fno-builtin -fno-rtti -fno-exceptions -fomit-frame-pointer -O $(INCLUDE) -c -o $@ $<
 .cc.s:
 	$(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O $(INCLUDE) -S -o $@ $<
 .c.o:
diff --git a/src/lib/libcpp/libcpp.cc b/src/lib/libcpp/libcpp.cc
index 836cde0..1132e8b 100644
--- a/src/lib/libcpp/libcpp.cc
+++ b/src/lib/libcpp/libcpp.cc
@@ -1,5 +1,4 @@
-extern "C" 
-{	
+extern "C" {	
 #include <stdlib.h>
 /* Don't Touch Mark */
 void __pure_virtual() { while(1); }