diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 7c7a277..77f15d9 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1578,7 +1578,7 @@ ovsdb_jsonrpc_monitor_cond_change(struct ovsdb_jsonrpc_session *s,
     struct json *update_json;
 
     update_json = ovsdb_monitor_get_update(m->dbmon, false, true,
-                                    &m->unflushed, m->condition, m->version);
+                                    m->condition, m->version, &m->unflushed);
     if (update_json) {
         struct jsonrpc_msg *msg;
         struct json *p;
@@ -1653,7 +1653,7 @@ ovsdb_jsonrpc_monitor_compose_update(struct ovsdb_jsonrpc_monitor *m,
     }
 
     return ovsdb_monitor_get_update(m->dbmon, initial, false,
-                                    &m->unflushed, m->condition, m->version);
+                                    m->condition, m->version, &m->unflushed);
 }
 
 static bool
diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c
index dd06e26..bf130ad 100644
--- a/ovsdb/monitor.c
+++ b/ovsdb/monitor.c
@@ -158,14 +158,14 @@ typedef struct json *
      const void *,
      bool initial, unsigned long int *changed);
 
-static void ovsdb_monitor_destroy(struct ovsdb_monitor *dbmon);
+static void ovsdb_monitor_destroy(struct ovsdb_monitor *);
 static struct ovsdb_monitor_changes * ovsdb_monitor_table_add_changes(
-    struct ovsdb_monitor_table *mt, uint64_t next_txn);
+    struct ovsdb_monitor_table *, uint64_t next_txn);
 static struct ovsdb_monitor_changes *ovsdb_monitor_table_find_changes(
-    struct ovsdb_monitor_table *mt, uint64_t unflushed);
+    struct ovsdb_monitor_table *, uint64_t unflushed);
 static void ovsdb_monitor_changes_destroy(
-                                  struct ovsdb_monitor_changes *changes);
-static void ovsdb_monitor_table_track_changes(struct ovsdb_monitor_table *mt,
+                                  struct ovsdb_monitor_changes *);
+static void ovsdb_monitor_table_track_changes(struct ovsdb_monitor_table *,
                                   uint64_t unflushed);
 
 static uint32_t
@@ -1103,9 +1103,9 @@ struct json *
 ovsdb_monitor_get_update(
              struct ovsdb_monitor *dbmon,
              bool initial, bool cond_updated,
-             uint64_t *unflushed_,
              struct ovsdb_monitor_session_condition *condition,
-             enum ovsdb_monitor_version version)
+             enum ovsdb_monitor_version version,
+             uint64_t *unflushed_)
 {
     struct ovsdb_monitor_json_cache_node *cache_node = NULL;
     struct shash_node *node;
diff --git a/ovsdb/monitor.h b/ovsdb/monitor.h
index eb3ff27..9bc0613 100644
--- a/ovsdb/monitor.h
+++ b/ovsdb/monitor.h
@@ -44,73 +44,73 @@ enum ovsdb_monitor_version {
       OVSDB_MONITOR_VERSION_MAX
 };
 
-struct ovsdb_monitor *ovsdb_monitor_create(struct ovsdb *db,
-                       struct ovsdb_jsonrpc_monitor *jsonrpc_monitor);
+struct ovsdb_monitor *ovsdb_monitor_create(struct ovsdb *,
+                       struct ovsdb_jsonrpc_monitor *);
 void ovsdb_monitors_remove(struct ovsdb *);
 void ovsdb_monitors_commit(struct ovsdb *, const struct ovsdb_txn *);
 
 void ovsdb_monitor_prereplace_db(struct ovsdb *);
 
-struct ovsdb_monitor *ovsdb_monitor_add(struct ovsdb_monitor *dbmon);
+struct ovsdb_monitor *ovsdb_monitor_add(struct ovsdb_monitor *);
 
-void ovsdb_monitor_add_jsonrpc_monitor(struct ovsdb_monitor *dbmon,
-                       struct ovsdb_jsonrpc_monitor *jsonrpc_monitor);
+void ovsdb_monitor_add_jsonrpc_monitor(struct ovsdb_monitor *,
+                       struct ovsdb_jsonrpc_monitor *);
 
-void ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *dbmon,
-                               struct ovsdb_jsonrpc_monitor *jsonrpc_monitor,
+void ovsdb_monitor_remove_jsonrpc_monitor(struct ovsdb_monitor *,
+                               struct ovsdb_jsonrpc_monitor *,
                                uint64_t unflushed);
 
-void ovsdb_monitor_add_table(struct ovsdb_monitor *m,
-                             const struct ovsdb_table *table);
+void ovsdb_monitor_add_table(struct ovsdb_monitor *,
+                             const struct ovsdb_table *);
 
-const char * ovsdb_monitor_add_column(struct ovsdb_monitor *dbmon,
-                                      const struct ovsdb_table *table,
-                                      const struct ovsdb_column *column,
-                                      enum ovsdb_monitor_selection select,
+const char * ovsdb_monitor_add_column(struct ovsdb_monitor *,
+                                      const struct ovsdb_table *,
+                                      const struct ovsdb_column *,
+                                      enum ovsdb_monitor_selection,
                                       bool monitored);
 bool
-ovsdb_monitor_table_exists(struct ovsdb_monitor *m,
-                           const struct ovsdb_table *table);
+ovsdb_monitor_table_exists(struct ovsdb_monitor *,
+                           const struct ovsdb_table *);
 
-struct json *ovsdb_monitor_get_update(struct ovsdb_monitor *dbmon,
+struct json *ovsdb_monitor_get_update(struct ovsdb_monitor *,
                                       bool initial,
                                       bool cond_updated,
-                                      uint64_t *unflushed_transaction,
-                                      struct ovsdb_monitor_session_condition *condition,
-                                      enum ovsdb_monitor_version version);
+                                      struct ovsdb_monitor_session_condition *,
+                                      enum ovsdb_monitor_version,
+                                      uint64_t *unflushed_transaction);
 
-void ovsdb_monitor_table_add_select(struct ovsdb_monitor *dbmon,
-                                    const struct ovsdb_table *table,
-                                    enum ovsdb_monitor_selection select);
+void ovsdb_monitor_table_add_select(struct ovsdb_monitor *,
+                                    const struct ovsdb_table *,
+                                    enum ovsdb_monitor_selection);
 
-bool ovsdb_monitor_needs_flush(struct ovsdb_monitor *dbmon,
+bool ovsdb_monitor_needs_flush(struct ovsdb_monitor *,
                                uint64_t next_transaction);
 
-void ovsdb_monitor_get_initial(const struct ovsdb_monitor *dbmon);
+void ovsdb_monitor_get_initial(const struct ovsdb_monitor *);
 
-void ovsdb_monitor_get_memory_usage(struct simap *usage);
+void ovsdb_monitor_get_memory_usage(struct simap *);
 
 struct ovsdb_monitor_session_condition *
 ovsdb_monitor_session_condition_create(void);
 
 void
 ovsdb_monitor_session_condition_destroy(
-                          struct ovsdb_monitor_session_condition *condition);
+                          struct ovsdb_monitor_session_condition *);
 struct ovsdb_error *
 ovsdb_monitor_table_condition_create(
-                          struct ovsdb_monitor_session_condition *condition,
-                          const struct ovsdb_table *table,
+                          struct ovsdb_monitor_session_condition *,
+                          const struct ovsdb_table *,
                           const struct json *json_cnd);
 
 void
-ovsdb_monitor_condition_bind(struct ovsdb_monitor *dbmon,
-                             struct ovsdb_monitor_session_condition *cond);
+ovsdb_monitor_condition_bind(struct ovsdb_monitor *,
+                             struct ovsdb_monitor_session_condition *);
 
 struct ovsdb_error *
 ovsdb_monitor_table_condition_update(
-                           struct ovsdb_monitor *dbmon,
-                           struct ovsdb_monitor_session_condition *condition,
-                           const struct ovsdb_table *table,
+                           struct ovsdb_monitor *,
+                           struct ovsdb_monitor_session_condition *,
+                           const struct ovsdb_table *,
                            const struct json *cond_json);
 
 #endif
