diff --git a/include/Mw/MachDep.h b/include/Mw/MachDep.h
index 99245fb..2658b04 100644
--- a/include/Mw/MachDep.h
+++ b/include/Mw/MachDep.h
@@ -62,12 +62,14 @@
 #include <dlfcn.h>
 #endif
 
-#if defined(__HAIKU__) && defined(__cplusplus)
+#ifdef __HAIKU__
+#ifdef __cplusplus
 #include <Window.h>
 #include <View.h>
 #include <Screen.h>
 #include <Application.h>
 #include <Locker.h>
+#endif
 #include <OS.h>
 #endif
 
diff --git a/pl/utils.pl b/pl/utils.pl
index 3073a9e..70750cb 100644
--- a/pl/utils.pl
+++ b/pl/utils.pl
@@ -54,7 +54,7 @@ sub set_shared_flag {
 sub new_object {
     my @l = glob($_[0]);
     foreach my $e (@l) {
-        $e =~ s/\.(cxx|c|m)$/$object_suffix/;
+        $e =~ s/\.(cc|c|m)$/$object_suffix/;
         push(@library_targets, $e);
     }
 }