diff --git a/src/add-ons/input_server/methods/canna/canna/cannabuild.h b/src/add-ons/input_server/methods/canna/canna/cannabuild.h
index aa5f21d690..1d61388880 100644
--- a/src/add-ons/input_server/methods/canna/canna/cannabuild.h
+++ b/src/add-ons/input_server/methods/canna/canna/cannabuild.h
@@ -1,10 +1,12 @@
-#pragma once
 //////////////////////////////////////////////////////
 // Header file for emport / import gloval symbols.
 // Valid for BeOS Releas 3 or later.
 // 1998.5.4 by T.Murai
 //
 
+#ifndef CANNABUILD_H
+#define CANNABUILD_H
+
 //#define _BUILDING_CANNALIB 
 
 #ifdef _BUILDING_CANNALIB 
@@ -12,3 +14,5 @@
 #else 
 #define canna_export __declspec(dllimport) 
 #endif
+
+#endif // CANNABUILD_H
diff --git a/src/add-ons/input_server/methods/canna/lib/Jamfile b/src/add-ons/input_server/methods/canna/lib/Jamfile
index 76437e3349..4b4006d5e3 100644
--- a/src/add-ons/input_server/methods/canna/lib/Jamfile
+++ b/src/add-ons/input_server/methods/canna/lib/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src add-ons input_server methods canna lib ;
 
-SubDirCcFlags -x c++ -ansi -trigraphs -funsigned-char -funsigned-bitfields -Wall -Wno-multichar -Wno-ctor-dtor-privacy -pedantic -Wno-long-long -Woverloaded-virtual -D_BUILDING_CANNALIB -D_WCHAR_T ;
+SubDirCcFlags -x c++ -ansi -trigraphs -funsigned-char -funsigned-bitfields -w -Wno-multichar -Wno-ctor-dtor-privacy -pedantic -Wno-long-long -Woverloaded-virtual -D_BUILDING_CANNALIB -D_WCHAR_T ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) canna ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) rk ] ;
diff --git a/src/add-ons/input_server/methods/canna/rk/Jamfile b/src/add-ons/input_server/methods/canna/rk/Jamfile
index 0221ea9997..c85654a30e 100644
--- a/src/add-ons/input_server/methods/canna/rk/Jamfile
+++ b/src/add-ons/input_server/methods/canna/rk/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src add-ons input_server methods canna rk ;
 
-SubDirCcFlags -x c++ -ansi -trigraphs -funsigned-char -funsigned-bitfields -Wall -Wno-multichar -Wno-ctor-dtor-privacy -pedantic -Wno-long-long -Woverloaded-virtual -D_BUILDING_CANNALIB -D_WCHAR_T ;
+SubDirCcFlags -x c++ -ansi -trigraphs -funsigned-char -funsigned-bitfields -w -Wno-multichar -Wno-ctor-dtor-privacy -pedantic -Wno-long-long -Woverloaded-virtual -D_BUILDING_CANNALIB -D_WCHAR_T ;
 
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) canna ] ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) lib ] ;