diff --git a/bacnet-stack/ports/at91sam7s/irq.c b/bacnet-stack/ports/at91sam7s/irq.c
index ba19c1d6..907e0d7b 100644
--- a/bacnet-stack/ports/at91sam7s/irq.c
+++ b/bacnet-stack/ports/at91sam7s/irq.c
@@ -1,30 +1,30 @@
-// The following functions must be written in ARM mode
-// these functions are called directly by an exception vector
+/* The following functions must be written in ARM mode */
+/* these functions are called directly by an exception vector */
 
-//------------------------------------------------------------------------------
-//         Internal functions
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-/// Default spurious interrupt handler. Infinite loop.
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
+/*         Internal functions */
+/*------------------------------------------------------------------------------ */
+/*------------------------------------------------------------------------------ */
+/* Default spurious interrupt handler. Infinite loop. */
+/*------------------------------------------------------------------------------ */
 void AT91F_Spurious_handler(
     void)
 {
     while (1);
 }
 
-//------------------------------------------------------------------------------
-/// Default handler for fast interrupt requests. Infinite loop.
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
+/* Default handler for fast interrupt requests. Infinite loop. */
+/*------------------------------------------------------------------------------ */
 void AT91F_Default_FIQ_handler(
     void)
 {
     while (1);
 }
 
-//------------------------------------------------------------------------------
-/// Default handler for standard interrupt requests. Infinite loop.
-//------------------------------------------------------------------------------
+/*------------------------------------------------------------------------------ */
+/* Default handler for standard interrupt requests. Infinite loop. */
+/*------------------------------------------------------------------------------ */
 void AT91F_Default_IRQ_handler(
     void)
 {
diff --git a/bacnet-stack/src/ucix.c b/bacnet-stack/src/ucix.c
index 6623cde4..26a9b2ec 100644
--- a/bacnet-stack/src/ucix.c
+++ b/bacnet-stack/src/ucix.c
@@ -23,7 +23,7 @@
 #include <uci_config.h>
 #include <uci.h>
 #include "ucix.h"
-//#include "log.h"
+/*#include "log.h" */
 
 static struct uci_ptr ptr;
 
@@ -46,7 +46,7 @@ struct uci_context *ucix_init(
     const char *config_file)
 {
     struct uci_context *ctx = uci_alloc_context();
-//      uci_add_history_path(ctx, "/var/state");
+/*      uci_add_history_path(ctx, "/var/state"); */
     uci_add_delta_path(ctx, "/var/state");
     if (uci_load(ctx, config_file, NULL) != UCI_OK) {
         fprintf(stderr, "%s/%s is missing or corrupt\n", ctx->savedir,